texi2html-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Texi2html-cvs] texi2html/Tests ccvs_res/cvs_1.html formatting_...


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html/Tests ccvs_res/cvs_1.html formatting_...
Date: Sat, 08 Apr 2006 23:02:10 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Branch:         
Changes by:     Patrice Dumas <address@hidden>  06/04/08 23:02:08

Modified files:
        Tests/ccvs_res : cvs_1.html 
        Tests/formatting_res: clean.html exotic_formatting.html 
                              formatting.html fr_formatting.html 
                              icons_fr_formatting.html 
                              to_utf8_formatting.html 
                              weird_quotes_formatting.html 
        Tests/nodes_texinfo_res: Conventions.html 
                                 Debugging-with-Info.html 
                                 Debugging-with-TeX.html First-Node.html 
                                 Info-Files.html Inserting.html 
                                 Texinfo-Mode-Printing.html kbd.html 
                                 key.html makeinfo-in-Emacs.html 
        Tests/texinfo_res: info-stnd_10.html info-stnd_3.html 
                           info-stnd_4.html info-stnd_5.html 
                           info-stnd_6.html info-stnd_7.html 
                           info-stnd_8.html texinfo_10.html 
                           texinfo_2.html texinfo_20.html 
                           texinfo_21.html texinfo_27.html 
                           texinfo_3.html texinfo_7.html 
        Tests/viper_monolithic_res: viper.html 
        Tests/viper_res: viper_2.html viper_3.html viper_4.html 
                         viper_8.html 
        Tests/xemacs_frame_res: xemacs.html xemacs_10.html 
                                xemacs_11.html xemacs_12.html 
                                xemacs_13.html xemacs_14.html 
                                xemacs_15.html xemacs_16.html 
                                xemacs_17.html xemacs_18.html 
                                xemacs_19.html xemacs_20.html 
                                xemacs_21.html xemacs_22.html 
                                xemacs_23.html xemacs_24.html 
                                xemacs_25.html xemacs_26.html 
                                xemacs_27.html xemacs_28.html 
                                xemacs_29.html xemacs_30.html 
                                xemacs_31.html xemacs_33.html 
                                xemacs_34.html xemacs_35.html 
                                xemacs_43.html xemacs_47.html 
                                xemacs_5.html xemacs_6.html 
                                xemacs_7.html xemacs_9.html 
                                xemacs_toc.html 
        Tests/xemacs_res: xemacs.html xemacs_10.html xemacs_11.html 
                          xemacs_12.html xemacs_13.html xemacs_14.html 
                          xemacs_15.html xemacs_16.html xemacs_17.html 
                          xemacs_18.html xemacs_19.html xemacs_20.html 
                          xemacs_21.html xemacs_22.html xemacs_23.html 
                          xemacs_24.html xemacs_25.html xemacs_26.html 
                          xemacs_27.html xemacs_28.html xemacs_29.html 
                          xemacs_30.html xemacs_31.html xemacs_33.html 
                          xemacs_34.html xemacs_35.html xemacs_43.html 
                          xemacs_47.html xemacs_5.html xemacs_6.html 
                          xemacs_7.html xemacs_9.html xemacs_toc.html 

Log message:
        Format @key more in line with what is done in texinfo, and makes
        more sense.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/ccvs_res/cvs_1.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/clean.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/exotic_formatting.html.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/formatting.html.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/fr_formatting.html.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/icons_fr_formatting.html.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/to_utf8_formatting.html.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/formatting_res/weird_quotes_formatting.html.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/Conventions.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/Debugging-with-Info.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/Debugging-with-TeX.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/First-Node.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/Info-Files.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/Inserting.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/Texinfo-Mode-Printing.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/kbd.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/key.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/nodes_texinfo_res/makeinfo-in-Emacs.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_10.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_3.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_4.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_5.html.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_6.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_7.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/info-stnd_8.html.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_10.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_2.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_20.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_21.html.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_27.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_3.html.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/texinfo_res/texinfo_7.html.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/viper_monolithic_res/viper.html.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/viper_res/viper_2.html.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/viper_res/viper_3.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/viper_res/viper_4.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/viper_res/viper_8.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_10.html.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_11.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_12.html.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_13.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_14.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_15.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_16.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_17.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_18.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_19.html.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_20.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_21.html.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_22.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_23.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_24.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_25.html.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_26.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_27.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_28.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_29.html.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_30.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_31.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_33.html.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_34.html.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_35.html.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_43.html.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_47.html.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_5.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_6.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_7.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_9.html.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_frame_res/xemacs_toc.html.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_10.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_11.html.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_12.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_13.html.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_14.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_15.html.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_16.html.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_17.html.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_18.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_19.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_20.html.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_21.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_22.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_23.html.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_24.html.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_25.html.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_26.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_27.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_28.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_29.html.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_30.html.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_31.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_33.html.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_34.html.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_35.html.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_43.html.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_47.html.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_5.html.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_6.html.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_7.html.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_9.html.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html/Tests/xemacs_res/xemacs_toc.html.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: texi2html/Tests/ccvs_res/cvs_1.html
diff -u texi2html/Tests/ccvs_res/cvs_1.html:1.26 
texi2html/Tests/ccvs_res/cvs_1.html:1.27
--- texi2html/Tests/ccvs_res/cvs_1.html:1.26    Sat Apr  8 22:40:16 2006
+++ texi2html/Tests/ccvs_res/cvs_1.html Sat Apr  8 23:02:07 2006
@@ -567,7 +567,7 @@
 before deleting any files or making any note in the
 history file.
 </p>
-<p>You decide to play it safe and answer <kbd>n <kbd>RET</kbd></kbd>
+<p>You decide to play it safe and answer <kbd>n &lt;RET&gt;</kbd>
 when <code>release</code> asks for confirmation.
 </p>
 <hr size="6">
Index: texi2html/Tests/formatting_res/clean.html
diff -u texi2html/Tests/formatting_res/clean.html:1.20 
texi2html/Tests/formatting_res/clean.html:1.21
--- texi2html/Tests/formatting_res/clean.html:1.20      Sat Apr  8 22:40:16 2006
+++ texi2html/Tests/formatting_res/clean.html   Sat Apr  8 23:02:07 2006
@@ -523,7 +523,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -951,7 +951,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1379,7 +1379,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/formatting_res/exotic_formatting.html
diff -u texi2html/Tests/formatting_res/exotic_formatting.html:1.54 
texi2html/Tests/formatting_res/exotic_formatting.html:1.55
--- texi2html/Tests/formatting_res/exotic_formatting.html:1.54  Sat Apr  8 
22:40:16 2006
+++ texi2html/Tests/formatting_res/exotic_formatting.html       Sat Apr  8 
23:02:07 2006
@@ -591,7 +591,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1278,7 +1278,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/formatting_res/formatting.html
diff -u texi2html/Tests/formatting_res/formatting.html:1.54 
texi2html/Tests/formatting_res/formatting.html:1.55
--- texi2html/Tests/formatting_res/formatting.html:1.54 Sat Apr  8 22:40:16 2006
+++ texi2html/Tests/formatting_res/formatting.html      Sat Apr  8 23:02:07 2006
@@ -591,7 +591,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1143,7 +1143,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/formatting_res/fr_formatting.html
diff -u texi2html/Tests/formatting_res/fr_formatting.html:1.47 
texi2html/Tests/formatting_res/fr_formatting.html:1.48
--- texi2html/Tests/formatting_res/fr_formatting.html:1.47      Sat Apr  8 
22:40:16 2006
+++ texi2html/Tests/formatting_res/fr_formatting.html   Sat Apr  8 23:02:07 2006
@@ -591,7 +591,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1143,7 +1143,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/formatting_res/icons_fr_formatting.html
diff -u texi2html/Tests/formatting_res/icons_fr_formatting.html:1.9 
texi2html/Tests/formatting_res/icons_fr_formatting.html:1.10
--- texi2html/Tests/formatting_res/icons_fr_formatting.html:1.9 Sat Apr  8 
22:40:16 2006
+++ texi2html/Tests/formatting_res/icons_fr_formatting.html     Sat Apr  8 
23:02:07 2006
@@ -591,7 +591,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1143,7 +1143,7 @@
 <code>@file{--a}</code> &lsquo;<tt>--a</tt>&rsquo;
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/formatting_res/to_utf8_formatting.html
diff -u texi2html/Tests/formatting_res/to_utf8_formatting.html:1.4 
texi2html/Tests/formatting_res/to_utf8_formatting.html:1.5
--- texi2html/Tests/formatting_res/to_utf8_formatting.html:1.4  Sat Apr  8 
22:40:16 2006
+++ texi2html/Tests/formatting_res/to_utf8_formatting.html      Sat Apr  8 
23:02:08 2006
@@ -591,7 +591,7 @@
 <code>@file{--a}</code> `<tt>--a</tt>'
 <code>@i{--a}</code> <i>–a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>–a</kbd>
+<code>@key{--a}</code> &lt;–a&gt;
 <code>@math{--a}</code> <em>–a</em>
 <code>@option{--a}</code> `<samp>--a</samp>'
 <code>@r{--a}</code> <span class="roman">–a</span>
@@ -1143,7 +1143,7 @@
 <code>@file{--a}</code> `<tt>--a</tt>'
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> `<samp>--a</samp>'
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/formatting_res/weird_quotes_formatting.html
diff -u texi2html/Tests/formatting_res/weird_quotes_formatting.html:1.2 
texi2html/Tests/formatting_res/weird_quotes_formatting.html:1.3
--- texi2html/Tests/formatting_res/weird_quotes_formatting.html:1.2     Sat Apr 
 8 22:40:16 2006
+++ texi2html/Tests/formatting_res/weird_quotes_formatting.html Sat Apr  8 
23:02:08 2006
@@ -591,7 +591,7 @@
 <code>@file{--a}</code> @<tt>--a</tt>'&lsquo;
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>&ndash;a</kbd>
+<code>@key{--a}</code> &lt;&ndash;a&gt;
 <code>@math{--a}</code> <em>&ndash;a</em>
 <code>@option{--a}</code> @<samp>--a</samp>'&lsquo;
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1143,7 +1143,7 @@
 <code>@file{--a}</code> @<tt>--a</tt>'&lsquo;
 <code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> &lt;--a&gt;
 <code>@math{--a}</code> <em>--a</em>
 <code>@option{--a}</code> @<samp>--a</samp>'&lsquo;
 <code>@r{--a}</code> <span class="roman">--a</span>
Index: texi2html/Tests/nodes_texinfo_res/Conventions.html
diff -u texi2html/Tests/nodes_texinfo_res/Conventions.html:1.23 
texi2html/Tests/nodes_texinfo_res/Conventions.html:1.24
--- texi2html/Tests/nodes_texinfo_res/Conventions.html:1.23     Sat Apr  8 
22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/Conventions.html  Sat Apr  8 23:02:08 2006
@@ -135,7 +135,7 @@
 differently in the output, for example, in indented text.
 </p>
 <p>To avoid this problem, Texinfo mode causes GNU Emacs to insert multiple
-spaces when you press the <kbd>TAB</kbd> key.
+spaces when you press the &lt;TAB&gt; key.
 </p>
 <p>Also, you can run <code>untabify</code> in Emacs to convert tabs in a region
 to multiple spaces.
Index: texi2html/Tests/nodes_texinfo_res/Debugging-with-Info.html
diff -u texi2html/Tests/nodes_texinfo_res/Debugging-with-Info.html:1.21 
texi2html/Tests/nodes_texinfo_res/Debugging-with-Info.html:1.22
--- texi2html/Tests/nodes_texinfo_res/Debugging-with-Info.html:1.21     Sat Apr 
 8 22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/Debugging-with-Info.html  Sat Apr  8 
23:02:08 2006
@@ -151,16 +151,16 @@
 </pre></td></tr></table>
 
 <p>Incidentally, if you are reading this node in Info and type <kbd>f
-<kbd>RET</kbd></kbd> (<code>Info-follow-reference</code>), you will generate 
an error
+&lt;RET&gt;</kbd> (<code>Info-follow-reference</code>), you will generate an 
error
 message that says:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">No such node: 
&quot;Catching Mistakes) The only way &hellip;
 </pre></td></tr></table>
 
 <p>This is because Info perceives the example of the error as the first
-cross reference in this node and if you type a <kbd>RET</kbd> immediately
+cross reference in this node and if you type a &lt;RET&gt; immediately
 after typing the Info <kbd>f</kbd> command, Info will attempt to go to the
-referenced node.  If you type <kbd>f catch <kbd>TAB</kbd> 
<kbd>RET</kbd></kbd>, Info
+referenced node.  If you type <kbd>f catch &lt;TAB&gt; &lt;RET&gt;</kbd>, Info
 will complete the node name of the correctly written example and take
 you to the `Catching Mistakes' node.  (If you try this, you can return
 from the `Catching Mistakes' node by typing <kbd>l</kbd>
Index: texi2html/Tests/nodes_texinfo_res/Debugging-with-TeX.html
diff -u texi2html/Tests/nodes_texinfo_res/Debugging-with-TeX.html:1.22 
texi2html/Tests/nodes_texinfo_res/Debugging-with-TeX.html:1.23
--- texi2html/Tests/nodes_texinfo_res/Debugging-with-TeX.html:1.22      Sat Apr 
 8 22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/Debugging-with-TeX.html   Sat Apr  8 
23:02:08 2006
@@ -136,11 +136,11 @@
 <ol>
 <li>
 You can tell TeX to continue running and ignore just this error by
-typing <kbd>RET</kbd> at the &lsquo;<samp>?</samp>&rsquo; prompt.
+typing &lt;RET&gt; at the &lsquo;<samp>?</samp>&rsquo; prompt.
 
 </li><li>
 You can tell TeX to continue running and to ignore all errors as best
-it can by typing <kbd>r <kbd>RET</kbd></kbd> at the 
&lsquo;<samp>?</samp>&rsquo; prompt.
+it can by typing <kbd>r &lt;RET&gt;</kbd> at the &lsquo;<samp>?</samp>&rsquo; 
prompt.
 
 <p>This is often the best thing to do.  However, beware: the one error
 may produce a cascade of additional error messages as its consequences
@@ -149,7 +149,7 @@
 <kbd>C-c C-c</kbd>, if you are running a shell inside Emacs).
 </p>
 </li><li>
-You can tell TeX to stop this run by typing <kbd>x <kbd>RET</kbd></kbd>
+You can tell TeX to stop this run by typing <kbd>x &lt;RET&gt;</kbd>
 at the &lsquo;<samp>?</samp>&rsquo; prompt.
 </li></ol>
 
@@ -188,7 +188,7 @@
 *
 </pre></td></tr></table>
 
-<p>In this case, simply type <kbd>\end <kbd>RET</kbd></kbd> after the 
asterisk.  Then
+<p>In this case, simply type <kbd>\end &lt;RET&gt;</kbd> after the asterisk.  
Then
 write the header lines in the Texinfo file and run the TeX command
 again. (Note the use of the backslash, &lsquo;<samp>\</samp>&rsquo;.  TeX uses 
&lsquo;<samp>\</samp>&rsquo;
 instead of &lsquo;<samp>@</samp>&rsquo;; and in this circumstance, you are 
working
Index: texi2html/Tests/nodes_texinfo_res/First-Node.html
diff -u texi2html/Tests/nodes_texinfo_res/First-Node.html:1.21 
texi2html/Tests/nodes_texinfo_res/First-Node.html:1.22
--- texi2html/Tests/nodes_texinfo_res/First-Node.html:1.21      Sat Apr  8 
22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/First-Node.html   Sat Apr  8 23:02:08 2006
@@ -104,7 +104,7 @@
 <a name="IDX108"></a>
 On the other hand, do not define the `Previous' node of the Top node to
 be &lsquo;<samp>(dir)</samp>&rsquo;, as it causes confusing behavior for 
users: if you are
-in the Top node and hits <kbd>DEL</kbd> to go backwards, you wind up in the
+in the Top node and hits &lt;DEL&gt; to go backwards, you wind up in the
 middle of the some other entry in the &lsquo;<tt>dir</tt>&rsquo; file, which 
has nothing
 to do with what you were reading.
 
Index: texi2html/Tests/nodes_texinfo_res/Info-Files.html
diff -u texi2html/Tests/nodes_texinfo_res/Info-Files.html:1.20 
texi2html/Tests/nodes_texinfo_res/Info-Files.html:1.21
--- texi2html/Tests/nodes_texinfo_res/Info-Files.html:1.20      Sat Apr  8 
22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/Info-Files.html   Sat Apr  8 23:02:08 2006
@@ -146,7 +146,7 @@
 the command line (see <a href="../info/index.html#Top">(info)Top</a> section 
`Top' in <cite>Info</cite>).
 </p>
 <p>If you want to read through an Info file in sequence, as if it were a
-printed manual, you can hit <kbd>SPC</kbd> repeatedly, or you get the whole
+printed manual, you can hit &lt;SPC&gt; repeatedly, or you get the whole
 file with the advanced Info command <kbd>g *</kbd>.  (See <a 
href="../info/Expert.html#Expert">Advanced Info commands: (info)Expert</a>.)
 </p>
 <p>The &lsquo;<tt>dir</tt>&rsquo; file in the &lsquo;<tt>info</tt>&rsquo; 
directory serves as the
Index: texi2html/Tests/nodes_texinfo_res/Inserting.html
diff -u texi2html/Tests/nodes_texinfo_res/Inserting.html:1.22 
texi2html/Tests/nodes_texinfo_res/Inserting.html:1.23
--- texi2html/Tests/nodes_texinfo_res/Inserting.html:1.22       Sat Apr  8 
22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/Inserting.html    Sat Apr  8 23:02:08 2006
@@ -152,8 +152,8 @@
 <dt>  <kbd>C-c C-c t</kbd></dt>
 <dt> <kbd>M-x address@hidden</kbd></dt>
 <dd><a name="IDX40"></a>
-<p>Insert <code>@table</code> followed by a <kbd>SPC</kbd>
-and leave the cursor after the <kbd>SPC</kbd>.
+<p>Insert <code>@table</code> followed by a &lt;SPC&gt;
+and leave the cursor after the &lt;SPC&gt;.
 </p>
 </dd>
 <dt>  <kbd>C-c C-c v</kbd></dt>
Index: texi2html/Tests/nodes_texinfo_res/Texinfo-Mode-Printing.html
diff -u texi2html/Tests/nodes_texinfo_res/Texinfo-Mode-Printing.html:1.21 
texi2html/Tests/nodes_texinfo_res/Texinfo-Mode-Printing.html:1.22
--- texi2html/Tests/nodes_texinfo_res/Texinfo-Mode-Printing.html:1.21   Sat Apr 
 8 22:40:17 2006
+++ texi2html/Tests/nodes_texinfo_res/Texinfo-Mode-Printing.html        Sat Apr 
 8 23:02:08 2006
@@ -132,7 +132,7 @@
 <dt> <kbd>C-c C-t C-x</kbd></dt>
 <dt> <kbd>M-x texinfo-quit-job</kbd></dt>
 <dd><p>Quit a TeX formatting job that has stopped because of an error by
-sending an <kbd>x</kbd> to it.  When you do this, TeX preserves a record
+sending an &lt;x&gt; to it.  When you do this, TeX preserves a record
 of what it did in a &lsquo;<tt>.log</tt>&rsquo; file.
 </p>
 </dd>
Index: texi2html/Tests/nodes_texinfo_res/kbd.html
diff -u texi2html/Tests/nodes_texinfo_res/kbd.html:1.22 
texi2html/Tests/nodes_texinfo_res/kbd.html:1.23
--- texi2html/Tests/nodes_texinfo_res/kbd.html:1.22     Sat Apr  8 22:40:18 2006
+++ texi2html/Tests/nodes_texinfo_res/kbd.html  Sat Apr  8 23:02:08 2006
@@ -125,12 +125,12 @@
 <p>You can embed another @-command inside the braces of an <code>@kbd</code>
 command.  Here, for example, is the way to describe a command that
 would be described more verbosely as &ldquo;press an 
&lsquo;<samp>r</samp>&rsquo; and then
-press the <kbd>RET</kbd> key&rdquo;:
+press the &lt;RET&gt; key&rdquo;:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@kbd{r @key{RET}}
 </pre></td></tr></table>
 
-<p>This produces: <kbd>r <kbd>RET</kbd></kbd>
+<p>This produces: <kbd>r &lt;RET&gt;</kbd>
 </p>
 <p>You also use the <code>@kbd</code> command if you are spelling out the 
letters
 you type; for example:
@@ -142,7 +142,7 @@
 <p>This produces:
 </p>
 <blockquote><p>To give the <code>logout</code> command,
-type the characters <kbd>l o g o u t <kbd>RET</kbd></kbd>.
+type the characters <kbd>l o g o u t &lt;RET&gt;</kbd>.
 </p></blockquote>
 
 <p>(Also, this example shows that you can add spaces for clarity.  If you
Index: texi2html/Tests/nodes_texinfo_res/key.html
diff -u texi2html/Tests/nodes_texinfo_res/key.html:1.21 
texi2html/Tests/nodes_texinfo_res/key.html:1.22
--- texi2html/Tests/nodes_texinfo_res/key.html:1.21     Sat Apr  8 22:40:18 2006
+++ texi2html/Tests/nodes_texinfo_res/key.html  Sat Apr  8 23:02:08 2006
@@ -91,7 +91,7 @@
 <code>@kbd</code> command when the sequence of characters to be typed
 includes one or more keys that are described by name.
 </p>
-<p>For example, to produce <kbd>C-x <kbd>ESC</kbd></kbd> you would type:
+<p>For example, to produce <kbd>C-x &lt;ESC&gt;</kbd> you would type:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@kbd{C-x @key{ESC}}
 </pre></td></tr></table>
@@ -144,7 +144,7 @@
 alone; do not use the <code>@key</code> command; but when you are referring
 to the modifier key in isolation, use the <code>@key</code> command.  For
 example, write &lsquo;<samp>@kbd{Meta-a}</samp>&rsquo; to produce 
<kbd>Meta-a</kbd> and
-&lsquo;<samp>@key{META}</samp>&rsquo; to produce <kbd>META</kbd>.
+&lsquo;<samp>@key{META}</samp>&rsquo; to produce &lt;META&gt;.
 </p>
 
 <hr size="1">
Index: texi2html/Tests/nodes_texinfo_res/makeinfo-in-Emacs.html
diff -u texi2html/Tests/nodes_texinfo_res/makeinfo-in-Emacs.html:1.22 
texi2html/Tests/nodes_texinfo_res/makeinfo-in-Emacs.html:1.23
--- texi2html/Tests/nodes_texinfo_res/makeinfo-in-Emacs.html:1.22       Sat Apr 
 8 22:40:18 2006
+++ texi2html/Tests/nodes_texinfo_res/makeinfo-in-Emacs.html    Sat Apr  8 
23:02:08 2006
@@ -103,7 +103,7 @@
 <p>When you invoke either <code>makeinfo-region</code> or
 <code>makeinfo-buffer</code>, Emacs prompts for a file name, offering the
 name of the visited file as the default.  You can edit the default
-file name in the minibuffer if you wish, before pressing <kbd>RET</kbd> to
+file name in the minibuffer if you wish, before pressing &lt;RET&gt; to
 start the <code>makeinfo</code> process.
 </p>
 <p>The Emacs <code>makeinfo-region</code> and <code>makeinfo-buffer</code> 
commands
Index: texi2html/Tests/texinfo_res/info-stnd_10.html
diff -u texi2html/Tests/texinfo_res/info-stnd_10.html:1.25 
texi2html/Tests/texinfo_res/info-stnd_10.html:1.26
--- texi2html/Tests/texinfo_res/info-stnd_10.html:1.25  Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_10.html       Sat Apr  8 23:02:08 2006
@@ -110,9 +110,9 @@
 a key sequence which can be typed in order to invoke that command.
 </p>
 </dd>
-<dt> <kbd>C-h</kbd> (<code>get-help-window</code>)</dt>
-<dt> <kbd>?</kbd></dt>
-<dt> <kbd>F1</kbd> (on DOS/Windows only)</dt>
+<dt> &lt;C-h&gt; (<code>get-help-window</code>)</dt>
+<dt> &lt;?&gt;</dt>
+<dt> &lt;F1&gt; (on DOS/Windows only)</dt>
 <dt> h, vi-like operation</dt>
 <dd><a name="IDX311"></a>
 <a name="IDX312"></a>
@@ -124,8 +124,8 @@
 the most concise information about GNU Info available.
 </p>
 </dd>
-<dt> <kbd>h</kbd> (<code>get-info-help-node</code>)</dt>
-<dt> <kbd>M-h</kbd>, vi-like operation</dt>
+<dt> &lt;h&gt; (<code>get-info-help-node</code>)</dt>
+<dt> &lt;M-h&gt;, vi-like operation</dt>
 <dd><a name="IDX316"></a>
 <a name="IDX317"></a>
 <a name="IDX318"></a>
@@ -139,7 +139,7 @@
 <p>Here are the commands for creating a numeric argument:
 </p>
 <dl compact="compact">
-<dt> <kbd>C-u</kbd> (<code>universal-argument</code>)</dt>
+<dt> &lt;C-u&gt; (<code>universal-argument</code>)</dt>
 <dd><a name="IDX319"></a>
 <a name="IDX320"></a>
 <a name="IDX321"></a>
@@ -151,12 +151,12 @@
 <kbd>C-u 1 2 0</kbd> sets the argument to 120.
 </p>
 </dd>
-<dt> <kbd>M-1</kbd> (<code>add-digit-to-numeric-arg</code>)</dt>
-<dt> <kbd>1</kbd>, vi-like operation</dt>
-<dt> <kbd>M-2</kbd> &hellip; <kbd>M-9</kbd></dt>
-<dt> <kbd>2</kbd> &hellip; <kbd>9</kbd>, vi-like operation</dt>
-<dt> <kbd>M-0</kbd></dt>
-<dt> <kbd>0</kbd>, vi-like operation</dt>
+<dt> &lt;M-1&gt; (<code>add-digit-to-numeric-arg</code>)</dt>
+<dt> &lt;1&gt;, vi-like operation</dt>
+<dt> &lt;M-2&gt; &hellip; &lt;M-9&gt;</dt>
+<dt> &lt;2&gt; &hellip; &lt;9&gt;, vi-like operation</dt>
+<dt> &lt;M-0&gt;</dt>
+<dt> &lt;0&gt;, vi-like operation</dt>
 <dd><a name="IDX322"></a>
 <a name="IDX323"></a>
 <a name="IDX324"></a>
@@ -174,8 +174,8 @@
 </pre></td></tr></table>
 
 </dd>
-<dt> <kbd>M&ndash;</kbd> (<code>add-digit-to-numeric-arg</code></dt>
-<dt> <kbd>-</kbd></dt>
+<dt> &lt;M&ndash;&gt; (<code>add-digit-to-numeric-arg</code></dt>
+<dt> &lt;-&gt;</dt>
 <dd><a name="IDX325"></a>
 <a name="IDX326"></a>
 <a name="IDX327"></a>
@@ -197,8 +197,8 @@
 to cancel reading input in the echo area.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-g</kbd> (<code>abort-key</code>)</dt>
-<dt> <kbd>C-u</kbd>, vi-like operation</dt>
+<dt> &lt;C-g&gt; (<code>abort-key</code>)</dt>
+<dt> &lt;C-u&gt;, vi-like operation</dt>
 <dd><a name="IDX330"></a>
 <a name="IDX331"></a>
 <a name="IDX332"></a>
@@ -213,7 +213,7 @@
 or &lsquo;<samp>ZZ</samp>&rsquo;.
 </p>
 <dl compact="compact">
-<dt> <kbd>q</kbd> (<code>quit</code>)</dt>
+<dt> &lt;q&gt; (<code>quit</code>)</dt>
 <dt> <kbd>C-x C-c</kbd></dt>
 <dt> <kbd>:q</kbd>, vi-like operation</dt>
 <dt> <kbd>ZZ</kbd>, vi-like operation</dt>
@@ -247,7 +247,7 @@
 be associated with the current node that you are viewing:
 </p>
 <dl compact="compact">
-<dt> <kbd>ESC C-f</kbd> (<code>show-footnotes</code>)</dt>
+<dt> &lt;ESC C-f&gt; (<code>show-footnotes</code>)</dt>
 <dd><a name="IDX342"></a>
 <a name="IDX343"></a>
 <a name="IDX344"></a>
Index: texi2html/Tests/texinfo_res/info-stnd_3.html
diff -u texi2html/Tests/texinfo_res/info-stnd_3.html:1.20 
texi2html/Tests/texinfo_res/info-stnd_3.html:1.21
--- texi2html/Tests/texinfo_res/info-stnd_3.html:1.20   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_3.html        Sat Apr  8 23:02:08 2006
@@ -103,74 +103,74 @@
 <em>up</em> 4 lines.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-n</kbd> (<code>next-line</code>)</dt>
-<dt> <kbd>DOWN</kbd> (an arrow key)</dt>
+<dt> &lt;C-n&gt; (<code>next-line</code>)</dt>
+<dt> &lt;DOWN&gt; (an arrow key)</dt>
 <dd><a name="IDX30"></a>
 <a name="IDX31"></a>
 <a name="IDX32"></a>
 <p>Move the cursor down to the next line.
 </p>
 </dd>
-<dt> <kbd>C-p</kbd> (<code>prev-line</code>)</dt>
-<dt> <kbd>UP</kbd> (an arrow key)</dt>
+<dt> &lt;C-p&gt; (<code>prev-line</code>)</dt>
+<dt> &lt;UP&gt; (an arrow key)</dt>
 <dd><a name="IDX33"></a>
 <a name="IDX34"></a>
 <a name="IDX35"></a>
 <p>Move the cursor up to the previous line.
 </p>
 </dd>
-<dt> <kbd>C-a</kbd> (<code>beginning-of-line</code>)</dt>
-<dt> <kbd>Home</kbd> (on DOS/Windows only)</dt>
+<dt> &lt;C-a&gt; (<code>beginning-of-line</code>)</dt>
+<dt> &lt;Home&gt; (on DOS/Windows only)</dt>
 <dd><a name="IDX36"></a>
 <a name="IDX37"></a>
 <a name="IDX38"></a>
 <p>Move the cursor to the start of the current line.
 </p>
 </dd>
-<dt> <kbd>C-e</kbd> (<code>end-of-line</code>)</dt>
-<dt> <kbd>End</kbd> (on DOS/Windows only)</dt>
+<dt> &lt;C-e&gt; (<code>end-of-line</code>)</dt>
+<dt> &lt;End&gt; (on DOS/Windows only)</dt>
 <dd><a name="IDX39"></a>
 <a name="IDX40"></a>
 <a name="IDX41"></a>
 <p>Move the cursor to the end of the current line.
 </p>
 </dd>
-<dt> <kbd>C-f</kbd> (<code>forward-char</code>)</dt>
-<dt> <kbd>RIGHT</kbd> (an arrow key)</dt>
+<dt> &lt;C-f&gt; (<code>forward-char</code>)</dt>
+<dt> &lt;RIGHT&gt; (an arrow key)</dt>
 <dd><a name="IDX42"></a>
 <a name="IDX43"></a>
 <a name="IDX44"></a>
 <p>Move the cursor forward a character.
 </p>
 </dd>
-<dt> <kbd>C-b</kbd> (<code>backward-char</code>)</dt>
-<dt> <kbd>LEFT</kbd> (an arrow key)</dt>
+<dt> &lt;C-b&gt; (<code>backward-char</code>)</dt>
+<dt> &lt;LEFT&gt; (an arrow key)</dt>
 <dd><a name="IDX45"></a>
 <a name="IDX46"></a>
 <a name="IDX47"></a>
 <p>Move the cursor backward a character.
 </p>
 </dd>
-<dt> <kbd>M-f</kbd> (<code>forward-word</code>)</dt>
-<dt> <kbd>C-<kbd>RIGHT</kbd></kbd> (on DOS/Windows only)</dt>
+<dt> &lt;M-f&gt; (<code>forward-word</code>)</dt>
+<dt> <kbd>C-&lt;RIGHT&gt;</kbd> (on DOS/Windows only)</dt>
 <dd><a name="IDX48"></a>
 <a name="IDX49"></a>
 <a name="IDX50"></a>
 <p>Move the cursor forward a word.
 </p>
 </dd>
-<dt> <kbd>M-b</kbd> (<code>backward-word</code>)</dt>
-<dt> <kbd>C-<kbd>LEFT</kbd></kbd> (on DOS/Windows only)</dt>
+<dt> &lt;M-b&gt; (<code>backward-word</code>)</dt>
+<dt> <kbd>C-&lt;LEFT&gt;</kbd> (on DOS/Windows only)</dt>
 <dd><a name="IDX51"></a>
 <a name="IDX52"></a>
 <a name="IDX53"></a>
 <p>Move the cursor backward a word.
 </p>
 </dd>
-<dt> <kbd>M-&lt;</kbd> (<code>beginning-of-node</code>)</dt>
-<dt> <kbd>C-<kbd>Home</kbd></kbd> (on DOS/Windows only)</dt>
-<dt> <kbd>b</kbd></dt>
-<dt> <kbd>M-b</kbd>, vi-like operation</dt>
+<dt> &lt;M-&lt;&gt; (<code>beginning-of-node</code>)</dt>
+<dt> &lt;C-&lt;Home&gt;&gt; (on DOS/Windows only)</dt>
+<dt> &lt;b&gt;</dt>
+<dt> &lt;M-b&gt;, vi-like operation</dt>
 <dd><a name="IDX54"></a>
 <a name="IDX55"></a>
 <a name="IDX56"></a>
@@ -179,9 +179,9 @@
 <p>Move the cursor to the start of the current node.
 </p>
 </dd>
-<dt> <kbd>M-&gt;</kbd> (<code>end-of-node</code>)</dt>
-<dt> <kbd>C-<kbd>End</kbd></kbd> (on DOS/Windows only)</dt>
-<dt> <kbd>e</kbd></dt>
+<dt> &lt;M-&gt;&gt; (<code>end-of-node</code>)</dt>
+<dt> &lt;C-&lt;End&gt;&gt; (on DOS/Windows only)</dt>
+<dt> &lt;e&gt;</dt>
 <dd><a name="IDX59"></a>
 <a name="IDX60"></a>
 <a name="IDX61"></a>
@@ -189,7 +189,7 @@
 <p>Move the cursor to the end of the current node.
 </p>
 </dd>
-<dt> <kbd>M-r</kbd> (<code>move-to-window-line</code>)</dt>
+<dt> &lt;M-r&gt; (<code>move-to-window-line</code>)</dt>
 <dd><a name="IDX63"></a>
 <a name="IDX64"></a>
 <p>Move the cursor to a specific line of the window.  Without a numeric
Index: texi2html/Tests/texinfo_res/info-stnd_4.html
diff -u texi2html/Tests/texinfo_res/info-stnd_4.html:1.23 
texi2html/Tests/texinfo_res/info-stnd_4.html:1.24
--- texi2html/Tests/texinfo_res/info-stnd_4.html:1.23   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_4.html        Sat Apr  8 23:02:08 2006
@@ -91,7 +91,7 @@
 with &ldquo;vi-like operation&rdquo;.
 </p>
 <dl compact="compact">
-<dt> <kbd>SPC</kbd> (<code>scroll-forward</code>)</dt>
+<dt> &lt;SPC&gt; (<code>scroll-forward</code>)</dt>
 <dd><a name="IDX65"></a>
 <a name="IDX66"></a>
 <p>Shift the text in this window up.  That is, show more of the node which
@@ -99,63 +99,63 @@
 show that many more lines at the bottom of the window; a numeric
 argument of 4 would shift all of the text in the window up 4 lines
 (discarding the top 4 lines), and show you four new lines at the bottom
-of the window.  Without a numeric argument, <kbd>SPC</kbd> takes the bottom
+of the window.  Without a numeric argument, &lt;SPC&gt; takes the bottom
 two lines of the window and places them at the top of the window,
 redisplaying almost a completely new screenful of lines.  If you are at
-the end of a node, <kbd>SPC</kbd> takes you to the &ldquo;next&rdquo; node, so 
that you can
-read an entire manual from start to finish by repeating <kbd>SPC</kbd>.
+the end of a node, &lt;SPC&gt; takes you to the &ldquo;next&rdquo; node, so 
that you can
+read an entire manual from start to finish by repeating &lt;SPC&gt;.
 </p>
 <p>The default scroll size is one screen-full, but it can be changed by
 invoking the (<code>scroll-forward-page-only-set-window</code>) command,
 &lsquo;<samp>z</samp>&rsquo; under &lsquo;<samp>--vi-keys</samp>&rsquo;, with 
a numeric argument.
 </p>
 </dd>
-<dt> <kbd>NEXT</kbd> (an arrow key) 
(<code>scroll-forward-page-only</code>)</dt>
-<dt> <kbd>C-v</kbd></dt>
-<dt> <kbd>C-f</kbd>, vi-like operation</dt>
-<dt> <kbd>f</kbd>, vi-like operation</dt>
-<dt> <kbd>M-SPC</kbd>, vi-like operation</dt>
+<dt> &lt;NEXT&gt; (an arrow key) (<code>scroll-forward-page-only</code>)</dt>
+<dt> &lt;C-v&gt;</dt>
+<dt> &lt;C-f&gt;, vi-like operation</dt>
+<dt> &lt;f&gt;, vi-like operation</dt>
+<dt> &lt;M-SPC&gt;, vi-like operation</dt>
 <dd><a name="IDX67"></a>
 <a name="IDX68"></a>
 <a name="IDX69"></a>
 <a name="IDX70"></a>
 <a name="IDX71"></a>
 <a name="IDX72"></a>
-<p>Shift the text in this window up.  This is identical to the <kbd>SPC</kbd>
+<p>Shift the text in this window up.  This is identical to the &lt;SPC&gt;
 operation above, except that it never scrolls beyond the end of the
 current node.
 </p>
 <a name="IDX73"></a>
-<p>The <kbd>NEXT</kbd> key is known as the <kbd>PageDown</kbd> key on some
+<p>The &lt;NEXT&gt; key is known as the &lt;PageDown&gt; key on some
 keyboards.
 </p>
 </dd>
-<dt> <kbd>z</kbd> (<code>scroll-forward-page-only-set-window</code>, vi-like 
operation)</dt>
+<dt> &lt;z&gt; (<code>scroll-forward-page-only-set-window</code>, vi-like 
operation)</dt>
 <dd><a name="IDX74"></a>
 <a name="IDX75"></a>
-<p>Scroll forward, like with <kbd>NEXT</kbd>, but if a numeric argument is
+<p>Scroll forward, like with &lt;NEXT&gt;, but if a numeric argument is
 specified, it becomes the default scroll size for subsequent
 <code>scroll-forward</code> and <code>scroll-backward</code> commands and their
 ilk.
 </p>
 </dd>
-<dt> <kbd>DEL</kbd> (<code>scroll-backward</code>)</dt>
+<dt> &lt;DEL&gt; (<code>scroll-backward</code>)</dt>
 <dd><a name="IDX76"></a>
 <a name="IDX77"></a>
 <p>Shift the text in this window down.  The inverse of
 <code>scroll-forward</code>.
-If you are at the start of a node, <kbd>DEL</kbd> takes you to the
+If you are at the start of a node, &lt;DEL&gt; takes you to the
 &ldquo;previous&rdquo; node, so that you can read an entire manual from finish 
to
-start by repeating <kbd>DEL</kbd>.  The default scroll size can be changed by
+start by repeating &lt;DEL&gt;.  The default scroll size can be changed by
 invoking the (<code>scroll-backward-page-only-set-window</code>) command,
 &lsquo;<samp>w</samp>&rsquo; under &lsquo;<samp>--vi-keys</samp>&rsquo;, with 
a numeric argument.
 </p>
 </dd>
-<dt> <kbd>PREVIOUS</kbd> (arrow key) 
(<code>scroll-backward-page-only</code>)</dt>
-<dt> <kbd>PRIOR</kbd> (arrow key)</dt>
-<dt> <kbd>M-v</kbd></dt>
-<dt> <kbd>b</kbd>, vi-like operation</dt>
-<dt> <kbd>C-b</kbd>, vi-like operation</dt>
+<dt> &lt;PREVIOUS&gt; (arrow key) (<code>scroll-backward-page-only</code>)</dt>
+<dt> &lt;PRIOR&gt; (arrow key)</dt>
+<dt> &lt;M-v&gt;</dt>
+<dt> &lt;b&gt;, vi-like operation</dt>
+<dt> &lt;C-b&gt;, vi-like operation</dt>
 <dd><a name="IDX78"></a>
 <a name="IDX79"></a>
 <a name="IDX80"></a>
@@ -168,19 +168,19 @@
 &lsquo;<samp>--vi-keys</samp>&rsquo;, with a numeric argument.
 </p>
 </dd>
-<dt> <kbd>w</kbd> (<code>scroll-backward-page-only-set-window</code>, vi-like 
operation)</dt>
+<dt> &lt;w&gt; (<code>scroll-backward-page-only-set-window</code>, vi-like 
operation)</dt>
 <dd><a name="IDX83"></a>
 <a name="IDX84"></a>
-<p>Scroll backward, like with <kbd>PREVIOUS</kbd>, but if a numeric argument is
+<p>Scroll backward, like with &lt;PREVIOUS&gt;, but if a numeric argument is
 specified, it becomes the default scroll size for subsequent
 <code>scroll-forward</code> and <code>scroll-backward</code> commands.
 </p>
 </dd>
-<dt> <kbd>C-n</kbd> (<code>down-line</code>, vi-like operation)</dt>
-<dt> <kbd>C-e</kbd>, vi-like operation</dt>
-<dt> <kbd>RET</kbd>, vi-like operation</dt>
-<dt> <kbd>LFD</kbd>, vi-like operation</dt>
-<dt> <kbd>DOWN</kbd>, vi-like operation</dt>
+<dt> &lt;C-n&gt; (<code>down-line</code>, vi-like operation)</dt>
+<dt> &lt;C-e&gt;, vi-like operation</dt>
+<dt> &lt;RET&gt;, vi-like operation</dt>
+<dt> &lt;LFD&gt;, vi-like operation</dt>
+<dt> &lt;DOWN&gt;, vi-like operation</dt>
 <dd><a name="IDX85"></a>
 <a name="IDX86"></a>
 <a name="IDX87"></a>
@@ -191,12 +191,12 @@
 that many lines.
 </p>
 </dd>
-<dt> <kbd>C-p</kbd> (<code>up-line</code>, vi-like operation)</dt>
-<dt> <kbd>UP</kbd>, vi-like operation</dt>
-<dt> <kbd>y</kbd>, vi-like operation</dt>
-<dt> <kbd>k</kbd>, vi-like operation</dt>
-<dt> <kbd>C-k</kbd>, vi-like operation</dt>
-<dt> <kbd>C-y</kbd>, vi-like operation</dt>
+<dt> &lt;C-p&gt; (<code>up-line</code>, vi-like operation)</dt>
+<dt> &lt;UP&gt;, vi-like operation</dt>
+<dt> &lt;y&gt;, vi-like operation</dt>
+<dt> &lt;k&gt;, vi-like operation</dt>
+<dt> &lt;C-k&gt;, vi-like operation</dt>
+<dt> &lt;C-y&gt;, vi-like operation</dt>
 <dd><a name="IDX91"></a>
 <a name="IDX92"></a>
 <a name="IDX93"></a>
@@ -208,8 +208,8 @@
 many lines.
 </p>
 </dd>
-<dt> <kbd>d</kbd> (<code>scroll-half-screen-down</code>, vi-like 
operation)</dt>
-<dt> <kbd>C-d</kbd>, vi-like operation</dt>
+<dt> &lt;d&gt; (<code>scroll-half-screen-down</code>, vi-like operation)</dt>
+<dt> &lt;C-d&gt;, vi-like operation</dt>
 <dd><a name="IDX98"></a>
 <a name="IDX99"></a>
 <a name="IDX100"></a>
@@ -219,8 +219,8 @@
 commands.
 </p>
 </dd>
-<dt> <kbd>u</kbd> (<code>scroll-half-screen-up</code>, vi-like operation)</dt>
-<dt> <kbd>C-u</kbd>, vi-like operation</dt>
+<dt> &lt;u&gt; (<code>scroll-half-screen-up</code>, vi-like operation)</dt>
+<dt> &lt;C-u&gt;, vi-like operation</dt>
 <dd><a name="IDX101"></a>
 <a name="IDX102"></a>
 <a name="IDX103"></a>
@@ -234,7 +234,7 @@
 <a name="IDX104"></a>
 <p>The <code>scroll-forward</code> and <code>scroll-backward</code> commands 
can also
 move forward and backward through the node structure of the file.  If
-you press <kbd>SPC</kbd> while viewing the end of a node, or <kbd>DEL</kbd> 
while
+you press &lt;SPC&gt; while viewing the end of a node, or &lt;DEL&gt; while
 viewing the beginning of a node, what happens is controlled by the
 variable <code>scroll-behavior</code>.  See section <a 
href="info-stnd_11.html#SEC16"><code>scroll-behavior</code></a>, for more 
information.
 </p>
@@ -242,18 +242,18 @@
 commands never scroll beyond the current node.
 </p>
 <a name="IDX105"></a>
-<p>The <kbd>PREVIOUS</kbd> key is the <kbd>PageUp</kbd> key on many keyboards. 
 Emacs
-refers to it by the name <kbd>PRIOR</kbd>.  When you use <kbd>PRIOR</kbd> or
-<kbd>PageUp</kbd> to scroll, Info never scrolls beyond the beginning of the
+<p>The &lt;PREVIOUS&gt; key is the &lt;PageUp&gt; key on many keyboards.  Emacs
+refers to it by the name &lt;PRIOR&gt;.  When you use &lt;PRIOR&gt; or
+&lt;PageUp&gt; to scroll, Info never scrolls beyond the beginning of the
 current node.
 </p>
 <a name="IDX106"></a>
-<p>If your keyboard lacks the <kbd>DEL</kbd> key, look for a key called
-<kbd>BS</kbd>, or &lsquo;<samp>BackSpace</samp>&rsquo;, sometimes designated 
with an arrow which
+<p>If your keyboard lacks the &lt;DEL&gt; key, look for a key called
+&lt;BS&gt;, or &lsquo;<samp>BackSpace</samp>&rsquo;, sometimes designated with 
an arrow which
 points to the left, which should perform the same function.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-l</kbd> (<code>redraw-display</code>)</dt>
+<dt> &lt;C-l&gt; (<code>redraw-display</code>)</dt>
 <dd><a name="IDX107"></a>
 <a name="IDX108"></a>
 <p>Redraw the display from scratch, or shift the line containing the cursor
@@ -263,7 +263,7 @@
 it is on the <var>n</var>th line of the window.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>w</kbd></kbd> (<code>toggle-wrap</code>)</dt>
+<dt> <kbd>C-x &lt;w&gt;</kbd> (<code>toggle-wrap</code>)</dt>
 <dd><a name="IDX109"></a>
 <a name="IDX110"></a>
 <p>Toggles the state of line wrapping in the current window.  Normally,
Index: texi2html/Tests/texinfo_res/info-stnd_5.html
diff -u texi2html/Tests/texinfo_res/info-stnd_5.html:1.24 
texi2html/Tests/texinfo_res/info-stnd_5.html:1.25
--- texi2html/Tests/texinfo_res/info-stnd_5.html:1.24   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_5.html        Sat Apr  8 23:02:08 2006
@@ -95,9 +95,9 @@
 when you use the following commands:
 </p>
 <dl compact="compact">
-<dt> <kbd>n</kbd> (<code>next-node</code>)</dt>
-<dt> <kbd>C-<kbd>NEXT</kbd></kbd> (on DOS/Windows only)</dt>
-<dt> <kbd>C-x <kbd>n</kbd></kbd>, vi-like operation</dt>
+<dt> &lt;n&gt; (<code>next-node</code>)</dt>
+<dt> <kbd>C-&lt;NEXT&gt;</kbd> (on DOS/Windows only)</dt>
+<dt> <kbd>C-x &lt;n&gt;</kbd>, vi-like operation</dt>
 <dd><a name="IDX111"></a>
 <a name="IDX112"></a>
 <a name="IDX113"></a>
@@ -105,25 +105,25 @@
 <p>Select the `Next' node.
 </p>
 <a name="IDX115"></a>
-<p>The <kbd>NEXT</kbd> key is known as the <kbd>PgDn</kbd> key on some
+<p>The &lt;NEXT&gt; key is known as the &lt;PgDn&gt; key on some
 keyboards.
 </p>
 </dd>
-<dt> <kbd>p</kbd> (<code>prev-node</code>)</dt>
-<dt> <kbd>C-<kbd>PREVIOUS</kbd></kbd> (on DOS/Windows only)</dt>
+<dt> &lt;p&gt; (<code>prev-node</code>)</dt>
+<dt> <kbd>C-&lt;PREVIOUS&gt;</kbd> (on DOS/Windows only)</dt>
 <dd><a name="IDX116"></a>
 <a name="IDX117"></a>
 <a name="IDX118"></a>
 <p>Select the `Prev' node.
 </p>
 <a name="IDX119"></a>
-<p>The <kbd>PREVIOUS</kbd> key is known as the <kbd>PgUp</kbd> key on some
+<p>The &lt;PREVIOUS&gt; key is known as the &lt;PgUp&gt; key on some
 keyboards.
 </p>
 </dd>
-<dt> <kbd>u</kbd> (<code>up-node</code>)</dt>
-<dt> <kbd>C-<kbd>UP</kbd></kbd> (an arrow key on DOS/Windows only)</dt>
-<dt> <kbd>C-x <kbd>u</kbd></kbd>, vi-like operation</dt>
+<dt> &lt;u&gt; (<code>up-node</code>)</dt>
+<dt> <kbd>C-&lt;UP&gt;</kbd> (an arrow key on DOS/Windows only)</dt>
+<dt> <kbd>C-x &lt;u&gt;</kbd>, vi-like operation</dt>
 <dd><a name="IDX120"></a>
 <a name="IDX121"></a>
 <a name="IDX122"></a>
@@ -144,9 +144,9 @@
 entire history of that window is discarded.
 </p>
 <dl compact="compact">
-<dt> <kbd>l</kbd> (<code>history-node</code>)</dt>
-<dt> <kbd>C-<kbd>CENTER</kbd></kbd> (on DOS/Windows only)</dt>
-<dt> <kbd>'</kbd>, vi-like operation</dt>
+<dt> &lt;l&gt; (<code>history-node</code>)</dt>
+<dt> &lt;C-&lt;CENTER&gt;&gt; (on DOS/Windows only)</dt>
+<dt> &lt;'&gt;, vi-like operation</dt>
 <dd><a name="IDX124"></a>
 <a name="IDX125"></a>
 <a name="IDX126"></a>
@@ -160,16 +160,16 @@
 selected nodes; they are &lsquo;<samp>t</samp>&rsquo; and 
&lsquo;<samp>d</samp>&rsquo;.
 </p>
 <dl compact="compact">
-<dt> <kbd>t</kbd> (<code>top-node</code>)</dt>
-<dt> <kbd>M-t</kbd>, vi-like operation</dt>
+<dt> &lt;t&gt; (<code>top-node</code>)</dt>
+<dt> &lt;M-t&gt;, vi-like operation</dt>
 <dd><a name="IDX128"></a>
 <a name="IDX129"></a>
 <a name="IDX130"></a>
 <p>Select the node &lsquo;<samp>Top</samp>&rsquo; in the current Info file.
 </p>
 </dd>
-<dt> <kbd>d</kbd> (<code>dir-node</code>)</dt>
-<dt> <kbd>M-d</kbd>, vi-like operation</dt>
+<dt> &lt;d&gt; (<code>dir-node</code>)</dt>
+<dt> &lt;M-d&gt;, vi-like operation</dt>
 <dd><a name="IDX131"></a>
 <a name="IDX132"></a>
 <a name="IDX133"></a>
@@ -181,8 +181,8 @@
 of a different node in the current window:
 </p>
 <dl compact="compact">
-<dt> <kbd>&lt;</kbd> (<code>first-node</code>)</dt>
-<dt> <kbd>g</kbd>, vi-like operation</dt>
+<dt> &lt;&lt;&gt; (<code>first-node</code>)</dt>
+<dt> &lt;g&gt;, vi-like operation</dt>
 <dd><a name="IDX134"></a>
 <a name="IDX135"></a>
 <a name="IDX136"></a>
@@ -192,8 +192,8 @@
 argument of zero is the same as the argument of 1.
 </p>
 </dd>
-<dt> <kbd>&gt;</kbd> (<code>last-node</code>)</dt>
-<dt> <kbd>G</kbd>, vi-like operation</dt>
+<dt> &lt;&gt;&gt; (<code>last-node</code>)</dt>
+<dt> &lt;G&gt;, vi-like operation</dt>
 <dd><a name="IDX137"></a>
 <a name="IDX138"></a>
 <a name="IDX139"></a>
@@ -203,7 +203,7 @@
 node.
 </p>
 </dd>
-<dt> <kbd>]</kbd> (<code>global-next-node</code>)</dt>
+<dt> &lt;]&gt; (<code>global-next-node</code>)</dt>
 <dd><a name="IDX140"></a>
 <a name="IDX141"></a>
 <p>Move forward or down through node structure.  If the node that you are
@@ -213,7 +213,7 @@
 &lsquo;<samp>Up</samp>&rsquo; node of this node.
 </p>
 </dd>
-<dt> <kbd>[</kbd> (<code>global-prev-node</code>)</dt>
+<dt> &lt;[&gt; (<code>global-prev-node</code>)</dt>
 <dd><a name="IDX142"></a>
 <a name="IDX143"></a>
 <p>Move backward or up through node structure.  If the node that you are
@@ -225,14 +225,14 @@
 
 <p>You can get the same behavior as <code>global-next-node</code> and
 <code>global-prev-node</code> while simply scrolling through the file with
-<kbd>SPC</kbd> and <kbd>DEL</kbd>; See section <a 
href="info-stnd_11.html#SEC16"><code>scroll-behavior</code></a>, for
+&lt;SPC&gt; and &lt;DEL&gt;; See section <a 
href="info-stnd_11.html#SEC16"><code>scroll-behavior</code></a>, for
 more information.
 </p>
 <dl compact="compact">
 <dd><p><a name="goto_002dnode"></a>
 </p></dd>
-<dt> <kbd>g</kbd> (<code>goto-node</code>)</dt>
-<dt> <kbd>C-x <kbd>g</kbd></kbd>, vi-like operation</dt>
+<dt> &lt;g&gt; (<code>goto-node</code>)</dt>
+<dt> <kbd>C-x &lt;g&gt;</kbd>, vi-like operation</dt>
 <dd><a name="IDX144"></a>
 <a name="IDX145"></a>
 <a name="IDX146"></a>
@@ -250,8 +250,8 @@
 </p>
 <p><a name="goto_002dinvocation"></a>
 </p></dd>
-<dt> <kbd>O</kbd> (<code>goto-invocation</code></dt>
-<dt> <kbd>I</kbd></dt>
+<dt> &lt;O&gt; (<code>goto-invocation</code></dt>
+<dt> &lt;I&gt;</dt>
 <dd><a name="IDX147"></a>
 <a name="IDX148"></a>
 <a name="IDX149"></a>
@@ -268,13 +268,13 @@
 in another Info file, you need to visit that file before invoking
 &lsquo;<samp>I</samp>&rsquo;.  For example, if you are reading the Emacs 
manual and want to
 see the command-line options of the <code>makeinfo</code> program, type <kbd>g
-(texinfo) <kbd>RET</kbd></kbd> and then <kbd>I makeinfo <kbd>RET</kbd></kbd>.  
If you don't
+(texinfo) &lt;RET&gt;</kbd> and then <kbd>I makeinfo &lt;RET&gt;</kbd>.  If 
you don't
 know what Info file documents the command, or if invoking 
&lsquo;<samp>I</samp>&rsquo;
 doesn't display the right node, go to the &lsquo;<samp>(dir)</samp>&rsquo; 
node (using the
 &lsquo;<samp>d</samp>&rsquo; command) and invoke &lsquo;<samp>I</samp>&rsquo; 
from there.
 </p>
 </dd>
-<dt> <kbd>G</kbd> (<code>menu-sequence</code>)</dt>
+<dt> &lt;G&gt; (<code>menu-sequence</code>)</dt>
 <dd><a name="IDX151"></a>
 <a name="IDX152"></a>
 <a name="IDX153"></a>
@@ -290,7 +290,7 @@
 &lsquo;<samp>(dir)</samp>&rsquo; node.  This has the same effect as if you 
typed the menu
 item sequence on Info's command line, see <a 
href="info-stnd_2.html#command_002dline-menu-items">Info command-line arguments 
processing</a>.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example"> <kbd>G 
Texinfo,Overview,Reporting Bugs <kbd>RET</kbd></kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example"> <kbd>G 
Texinfo,Overview,Reporting Bugs &lt;RET&gt;</kbd>
 </pre></td></tr></table>
 
 <p>displays the node &lsquo;<samp>Reporting Bugs</samp>&rsquo; in the Texinfo 
manual.  (You
@@ -302,7 +302,7 @@
 entry it did find and reports an error.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>k</kbd></kbd> (<code>kill-node</code>)</dt>
+<dt> <kbd>C-x &lt;k&gt;</kbd> (<code>kill-node</code>)</dt>
 <dd><a name="IDX154"></a>
 <a name="IDX155"></a>
 <p>Kill a node.  The node name is prompted for in the echo area, with a
@@ -331,7 +331,7 @@
 Info commands within it.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>b</kbd></kbd> (<code>select-visited-node</code>)</dt>
+<dt> <kbd>C-x &lt;b&gt;</kbd> (<code>select-visited-node</code>)</dt>
 <dd><a name="IDX160"></a>
 <a name="IDX161"></a>
 <p>Select a node which has been previously visited in a visible window.
Index: texi2html/Tests/texinfo_res/info-stnd_6.html
diff -u texi2html/Tests/texinfo_res/info-stnd_6.html:1.23 
texi2html/Tests/texinfo_res/info-stnd_6.html:1.24
--- texi2html/Tests/texinfo_res/info-stnd_6.html:1.23   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_6.html        Sat Apr  8 23:02:08 2006
@@ -86,8 +86,8 @@
 areas within an Info file which discuss a particular topic.
 </p>
 <dl compact="compact">
-<dt> <kbd>s</kbd> (<code>search</code>)</dt>
-<dt> <kbd>/</kbd></dt>
+<dt> &lt;s&gt; (<code>search</code>)</dt>
+<dt> &lt;/&gt;</dt>
 <dd><a name="IDX162"></a>
 <a name="IDX163"></a>
 <a name="IDX164"></a>
@@ -98,7 +98,7 @@
 string.  Negative arguments search backwards.
 </p>
 </dd>
-<dt> <kbd>?</kbd> (<code>search-backward</code>, vi-like operation)</dt>
+<dt> &lt;?&gt; (<code>search-backward</code>, vi-like operation)</dt>
 <dd><a name="IDX165"></a>
 <a name="IDX166"></a>
 <p>Read a string in the echo area and search backward through the Info file
@@ -108,7 +108,7 @@
 occurrence of the string.  Negative arguments search forward.
 </p>
 </dd>
-<dt> <kbd>S</kbd> (<code>search-case-sensitively</code></dt>
+<dt> &lt;S&gt; (<code>search-case-sensitively</code></dt>
 <dd><a name="IDX167"></a>
 <a name="IDX168"></a>
 <a name="IDX169"></a>
@@ -119,8 +119,8 @@
 arguments search backwards.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>n</kbd></kbd> (<code>search-next</code>)</dt>
-<dt> <kbd>n</kbd>, vi-like operation</dt>
+<dt> <kbd>C-x &lt;n&gt;</kbd> (<code>search-next</code>)</dt>
+<dt> &lt;n&gt;, vi-like operation</dt>
 <dd><a name="IDX171"></a>
 <a name="IDX172"></a>
 <a name="IDX173"></a>
@@ -130,8 +130,8 @@
 argument of <var>N</var>, search for <var>N</var>th next occurrence.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>N</kbd></kbd> (<code>search-previous</code>)</dt>
-<dt> <kbd>N</kbd>, vi-like operation</dt>
+<dt> <kbd>C-x &lt;N&gt;</kbd> (<code>search-previous</code>)</dt>
+<dt> &lt;N&gt;, vi-like operation</dt>
 <dd><a name="IDX175"></a>
 <a name="IDX176"></a>
 <a name="IDX177"></a>
@@ -140,7 +140,7 @@
 numeric argument of <var>N</var>, search for <var>N</var>th previous 
occurrence.
 </p>
 </dd>
-<dt> <kbd>C-s</kbd> (<code>isearch-forward</code>)</dt>
+<dt> &lt;C-s&gt; (<code>isearch-forward</code>)</dt>
 <dd><a name="IDX178"></a>
 <a name="IDX179"></a>
 <a name="IDX180"></a>
@@ -149,7 +149,7 @@
 case-sensitive; otherwise Info ignores the letter case.
 </p>
 </dd>
-<dt> <kbd>C-r</kbd> (<code>isearch-backward</code>)</dt>
+<dt> &lt;C-r&gt; (<code>isearch-backward</code>)</dt>
 <dd><a name="IDX181"></a>
 <a name="IDX182"></a>
 <p>Interactively search backward through the Info file for a string as
@@ -157,7 +157,7 @@
 is case-sensitive; otherwise Info ignores the letter case.
 </p>
 </dd>
-<dt> <kbd>i</kbd> (<code>index-search</code>)</dt>
+<dt> &lt;i&gt; (<code>index-search</code>)</dt>
 <dd><a name="IDX183"></a>
 <a name="IDX184"></a>
 <a name="IDX185"></a>
@@ -166,7 +166,7 @@
 where the found index entry points to.
 </p>
 </dd>
-<dt> <kbd>,</kbd> (<code>next-index-match</code>)</dt>
+<dt> &lt;,&gt; (<code>next-index-match</code>)</dt>
 <dd><a name="IDX187"></a>
 <a name="IDX188"></a>
 <p>Move to the node containing the next matching index item from the last
@@ -186,7 +186,7 @@
 occurrence of that string.  If the string is found, the node containing
 it is selected, and the cursor is left positioned at the start of the
 found string.  Subsequent &lsquo;<samp>s</samp>&rsquo; commands show you the 
default search
-string within &lsquo;<samp>[</samp>&rsquo; and &lsquo;<samp>]</samp>&rsquo;; 
pressing <kbd>RET</kbd> instead of
+string within &lsquo;<samp>[</samp>&rsquo; and &lsquo;<samp>]</samp>&rsquo;; 
pressing &lt;RET&gt; instead of
 typing a new string will use the default search string.  Under
 &lsquo;<samp>--vi-keys</samp>&rsquo; (see <a 
href="info-stnd_2.html#g_t_002d_002dvi_002dkeys">&ndash;vi-keys</a>), using the 
&lsquo;<samp>n</samp>&rsquo; or &lsquo;<samp>N</samp>&rsquo;
 commands is a faster way of searching for the same string.
Index: texi2html/Tests/texinfo_res/info-stnd_7.html
diff -u texi2html/Tests/texinfo_res/info-stnd_7.html:1.25 
texi2html/Tests/texinfo_res/info-stnd_7.html:1.26
--- texi2html/Tests/texinfo_res/info-stnd_7.html:1.25   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_7.html        Sat Apr  8 23:02:08 2006
@@ -181,10 +181,10 @@
 <p>The following table lists the Info commands which operate on menu items.
 </p>
 <dl compact="compact">
-<dt> <kbd>1</kbd> (<code>menu-digit</code>)</dt>
-<dt> <kbd>2</kbd> &hellip; <kbd>9</kbd></dt>
-<dt> <kbd>M-1</kbd>, vi-like operation</dt>
-<dt> <kbd>M-2</kbd> &hellip; <kbd>M-9</kbd>, vi-like operation</dt>
+<dt> &lt;1&gt; (<code>menu-digit</code>)</dt>
+<dt> &lt;2&gt; &hellip; &lt;9&gt;</dt>
+<dt> &lt;M-1&gt;, vi-like operation</dt>
+<dt> &lt;M-2&gt; &hellip; &lt;M-9&gt;, vi-like operation</dt>
 <dd><a name="IDX192"></a>
 <a name="IDX193"></a>
 <a name="IDX194"></a>
@@ -196,18 +196,18 @@
 <em>last</em> item in the node's menu.  When 
&lsquo;<samp>--vi-keys</samp>&rsquo; is in
 effect, digits set the numeric argument, so these commands are remapped
 to their &lsquo;<samp>M-</samp>&rsquo; varieties.  For example, to select the 
last menu
-item, press <kbd>M-0</kbd>.
+item, press &lt;M-0&gt;.
 </p>
 </dd>
-<dt> <kbd>0</kbd> (<code>last-menu-item</code>)</dt>
-<dt> <kbd>M-0</kbd>, vi-like operation</dt>
+<dt> &lt;0&gt; (<code>last-menu-item</code>)</dt>
+<dt> &lt;M-0&gt;, vi-like operation</dt>
 <dd><a name="IDX197"></a>
 <a name="IDX198"></a>
 <a name="IDX199"></a>
 <p>Select the last item in the current node's menu.
 </p>
 </dd>
-<dt> <kbd>m</kbd> (<code>menu-item</code>)</dt>
+<dt> &lt;m&gt; (<code>menu-item</code>)</dt>
 <dd><a name="IDX200"></a>
 <a name="IDX201"></a>
 <p>Reads the name of a menu item in the echo area and selects its node.
@@ -223,10 +223,10 @@
 <p>This table lists the Info commands which operate on cross references.
 </p>
 <dl compact="compact">
-<dt> <kbd>f</kbd> (<code>xref-item</code>)</dt>
-<dt> <kbd>r</kbd></dt>
-<dt> <kbd>M-f</kbd>, vi-like operation</dt>
-<dt> <kbd>C-x <kbd>r</kbd></kbd>, vi-like operation</dt>
+<dt> &lt;f&gt; (<code>xref-item</code>)</dt>
+<dt> &lt;r&gt;</dt>
+<dt> &lt;M-f&gt;, vi-like operation</dt>
+<dt> <kbd>C-x &lt;r&gt;</kbd>, vi-like operation</dt>
 <dd><a name="IDX203"></a>
 <a name="IDX204"></a>
 <a name="IDX205"></a>
@@ -241,16 +241,16 @@
 <p>Finally, the next few commands operate on menu or note references alike:
 </p>
 <dl compact="compact">
-<dt> <kbd>TAB</kbd> (<code>move-to-next-xref</code>)</dt>
+<dt> &lt;TAB&gt; (<code>move-to-next-xref</code>)</dt>
 <dd><a name="IDX208"></a>
 <a name="IDX209"></a>
 <p>Move the cursor to the start of the next nearest menu item or note
-reference in this node.  You can then use <kbd>RET</kbd>
+reference in this node.  You can then use &lt;RET&gt;
 (<code>select-reference-this-line</code>) to select the menu or note reference.
 </p>
 </dd>
-<dt> <kbd>M-TAB</kbd> (<code>move-to-prev-xref</code>)</dt>
-<dt> <kbd>Shift-<kbd>TAB</kbd></kbd> (on DOS/Windows only)</dt>
+<dt> &lt;M-TAB&gt; (<code>move-to-prev-xref</code>)</dt>
+<dt> &lt;Shift-&lt;TAB&gt;&gt; (on DOS/Windows only)</dt>
 <dd><a name="IDX210"></a>
 <a name="IDX211"></a>
 <p>Move the cursor the start of the nearest previous menu item or note
@@ -258,12 +258,12 @@
 </p>
 <a name="IDX212"></a>
 <a name="IDX213"></a>
-<p>On DOS/Windows only, the <kbd>Shift-<kbd>TAB</kbd></kbd> key is an alias for
-<kbd>M-<kbd>TAB</kbd></kbd>.  This key is sometimes called 
&lsquo;<samp>BackTab</samp>&rsquo;.
+<p>On DOS/Windows only, the <kbd>Shift-&lt;TAB&gt;</kbd> key is an alias for
+<kbd>M-&lt;TAB&gt;</kbd>.  This key is sometimes called 
&lsquo;<samp>BackTab</samp>&rsquo;.
 </p>
 </dd>
-<dt> <kbd>RET</kbd> (<code>select-reference-this-line</code>)</dt>
-<dt> <kbd>M-g</kbd>, vi-like operation</dt>
+<dt> &lt;RET&gt; (<code>select-reference-this-line</code>)</dt>
+<dt> &lt;M-g&gt;, vi-like operation</dt>
 <dd><a name="IDX214"></a>
 <a name="IDX215"></a>
 <a name="IDX216"></a>
Index: texi2html/Tests/texinfo_res/info-stnd_8.html
diff -u texi2html/Tests/texinfo_res/info-stnd_8.html:1.24 
texi2html/Tests/texinfo_res/info-stnd_8.html:1.25
--- texi2html/Tests/texinfo_res/info-stnd_8.html:1.24   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/info-stnd_8.html        Sat Apr  8 23:02:08 2006
@@ -190,7 +190,7 @@
 window (see section <a 
href="info-stnd_5.html#SEC5"><code>history-node</code></a>).
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x <kbd>o</kbd></kbd> (<code>next-window</code>)</dt>
+<dt> <kbd>C-x &lt;o&gt;</kbd> (<code>next-window</code>)</dt>
 <dd><a name="IDX217"></a>
 <a name="IDX218"></a>
 <a name="IDX219"></a>
@@ -209,7 +209,7 @@
 &lsquo;<samp>C-x o</samp>&rsquo; with a negative argument.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>2</kbd></kbd> (<code>split-window</code>)</dt>
+<dt> <kbd>C-x &lt;2&gt;</kbd> (<code>split-window</code>)</dt>
 <dd><a name="IDX221"></a>
 <a name="IDX222"></a>
 <a name="IDX223"></a>
@@ -221,7 +221,7 @@
 information.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>0</kbd></kbd> (<code>delete-window</code>)</dt>
+<dt> <kbd>C-x &lt;0&gt;</kbd> (<code>delete-window</code>)</dt>
 <dd><a name="IDX224"></a>
 <a name="IDX225"></a>
 <a name="IDX226"></a>
@@ -230,13 +230,13 @@
 some of them.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>1</kbd></kbd> (<code>keep-one-window</code>)</dt>
+<dt> <kbd>C-x &lt;1&gt;</kbd> (<code>keep-one-window</code>)</dt>
 <dd><a name="IDX227"></a>
 <a name="IDX228"></a>
 <p>Delete all of the windows excepting the current one.
 </p>
 </dd>
-<dt> <kbd>ESC <kbd>C-v</kbd></kbd> (<code>scroll-other-window</code>)</dt>
+<dt> <kbd>ESC &lt;C-v&gt;</kbd> (<code>scroll-other-window</code>)</dt>
 <dd><a name="IDX229"></a>
 <a name="IDX230"></a>
 <p>Scroll the other window, in the same fashion that 
&lsquo;<samp>C-v</samp>&rsquo; might
@@ -244,7 +244,7 @@
 &quot;other&quot; window backward.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>^</kbd></kbd> (<code>grow-window</code>)</dt>
+<dt> <kbd>C-x &lt;^&gt;</kbd> (<code>grow-window</code>)</dt>
 <dd><a name="IDX231"></a>
 <a name="IDX232"></a>
 <p>Grow (or shrink) the current window.  Given a numeric argument, grow
@@ -252,7 +252,7 @@
 shrink the window instead.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>t</kbd></kbd> (<code>tile-windows</code>)</dt>
+<dt> <kbd>C-x &lt;t&gt;</kbd> (<code>tile-windows</code>)</dt>
 <dd><a name="IDX233"></a>
 <a name="IDX234"></a>
 <a name="IDX235"></a>
@@ -295,9 +295,9 @@
 read in the echo area:
 </p>
 <dl compact="compact">
-<dt> <kbd>C-f</kbd> (<code>echo-area-forward</code>)</dt>
-<dt> <kbd>RIGHT</kbd> (an arrow key)</dt>
-<dt> <kbd>M-h</kbd>, vi-like operation</dt>
+<dt> &lt;C-f&gt; (<code>echo-area-forward</code>)</dt>
+<dt> &lt;RIGHT&gt; (an arrow key)</dt>
+<dt> &lt;M-h&gt;, vi-like operation</dt>
 <dd><a name="IDX236"></a>
 <a name="IDX237"></a>
 <a name="IDX238"></a>
@@ -305,9 +305,9 @@
 <p>Move forward a character.
 </p>
 </dd>
-<dt> <kbd>C-b</kbd> (<code>echo-area-backward</code>)</dt>
-<dt> <kbd>LEFT</kbd> (an arrow key)</dt>
-<dt> <kbd>M-l</kbd>, vi-like operation</dt>
+<dt> &lt;C-b&gt; (<code>echo-area-backward</code>)</dt>
+<dt> &lt;LEFT&gt; (an arrow key)</dt>
+<dt> &lt;M-l&gt;, vi-like operation</dt>
 <dd><a name="IDX240"></a>
 <a name="IDX241"></a>
 <a name="IDX242"></a>
@@ -315,64 +315,64 @@
 <p>Move backward a character.
 </p>
 </dd>
-<dt> <kbd>C-a</kbd> (<code>echo-area-beg-of-line</code>)</dt>
-<dt> <kbd>M-0</kbd>, vi-like operation</dt>
+<dt> &lt;C-a&gt; (<code>echo-area-beg-of-line</code>)</dt>
+<dt> &lt;M-0&gt;, vi-like operation</dt>
 <dd><a name="IDX244"></a>
 <a name="IDX245"></a>
 <a name="IDX246"></a>
 <p>Move to the start of the input line.
 </p>
 </dd>
-<dt> <kbd>C-e</kbd> (<code>echo-area-end-of-line</code>)</dt>
-<dt> <kbd>M-$</kbd>, vi-like operation</dt>
+<dt> &lt;C-e&gt; (<code>echo-area-end-of-line</code>)</dt>
+<dt> &lt;M-$&gt;, vi-like operation</dt>
 <dd><a name="IDX247"></a>
 <a name="IDX248"></a>
 <a name="IDX249"></a>
 <p>Move to the end of the input line.
 </p>
 </dd>
-<dt> <kbd>M-f</kbd> (<code>echo-area-forward-word</code>)</dt>
-<dt> <kbd>C-<kbd>RIGHT</kbd></kbd> (DOS/Windows only)</dt>
-<dt> <kbd>M-w</kbd>, vi-like operation</dt>
+<dt> &lt;M-f&gt; (<code>echo-area-forward-word</code>)</dt>
+<dt> &lt;C-&lt;RIGHT&gt;&gt; (DOS/Windows only)</dt>
+<dt> &lt;M-w&gt;, vi-like operation</dt>
 <dd><a name="IDX250"></a>
 <a name="IDX251"></a>
 <a name="IDX252"></a>
 <p>Move forward a word.
 </p>
 <a name="IDX253"></a>
-<p>On DOS/Windows, <kbd>C-<kbd>RIGHT</kbd></kbd> moves forward by words.
+<p>On DOS/Windows, <kbd>C-&lt;RIGHT&gt;</kbd> moves forward by words.
 </p>
 </dd>
-<dt> <kbd>M-b</kbd> (<code>echo-area-backward-word</code>)</dt>
-<dt> <kbd>C-<kbd>LEFT</kbd></kbd> (DOS/Windows only)</dt>
+<dt> &lt;M-b&gt; (<code>echo-area-backward-word</code>)</dt>
+<dt> &lt;C-&lt;LEFT&gt;&gt; (DOS/Windows only)</dt>
 <dd><a name="IDX254"></a>
 <a name="IDX255"></a>
 <p>Move backward a word.
 </p>
 <a name="IDX256"></a>
-<p>On DOS/Windows, <kbd>C-<kbd>LEFT</kbd></kbd> moves backward by words.
+<p>On DOS/Windows, <kbd>C-&lt;LEFT&gt;</kbd> moves backward by words.
 </p>
 </dd>
-<dt> <kbd>C-d</kbd> (<code>echo-area-delete</code>)</dt>
-<dt> <kbd>M-x</kbd>, vi-like operation</dt>
+<dt> &lt;C-d&gt; (<code>echo-area-delete</code>)</dt>
+<dt> &lt;M-x&gt;, vi-like operation</dt>
 <dd><a name="IDX257"></a>
 <a name="IDX258"></a>
 <a name="IDX259"></a>
 <p>Delete the character under the cursor.
 </p>
 </dd>
-<dt> <kbd>DEL</kbd> (<code>echo-area-rubout</code>)</dt>
+<dt> &lt;DEL&gt; (<code>echo-area-rubout</code>)</dt>
 <dd><a name="IDX260"></a>
 <a name="IDX261"></a>
 <p>Delete the character behind the cursor.
 </p>
-<p>On some keyboards, this key is designated <kbd>BS</kbd>, for
-&lsquo;<samp>BackSpace</samp>&rsquo;.  Those keyboards will usually bind 
<kbd>DEL</kbd> in the
+<p>On some keyboards, this key is designated &lt;BS&gt;, for
+&lsquo;<samp>BackSpace</samp>&rsquo;.  Those keyboards will usually bind 
&lt;DEL&gt; in the
 echo area to <code>echo-area-delete</code>.
 </p>
 </dd>
-<dt> <kbd>C-g</kbd> (<code>echo-area-abort</code>)</dt>
-<dt> <kbd>C-u</kbd>, vi-like operation</dt>
+<dt> &lt;C-g&gt; (<code>echo-area-abort</code>)</dt>
+<dt> &lt;C-u&gt;, vi-like operation</dt>
 <dd><a name="IDX262"></a>
 <a name="IDX263"></a>
 <a name="IDX264"></a>
@@ -381,14 +381,14 @@
 completion.  If the input line is empty, it aborts the calling function.
 </p>
 </dd>
-<dt> <kbd>RET</kbd> (<code>echo-area-newline</code>)</dt>
+<dt> &lt;RET&gt; (<code>echo-area-newline</code>)</dt>
 <dd><a name="IDX265"></a>
 <a name="IDX266"></a>
 <p>Accept (or forces completion of) the current input line.
 </p>
 </dd>
-<dt> <kbd>C-q</kbd> (<code>echo-area-quoted-insert</code>)</dt>
-<dt> <kbd>C-v</kbd>, vi-like operation</dt>
+<dt> &lt;C-q&gt; (<code>echo-area-quoted-insert</code>)</dt>
+<dt> &lt;C-v&gt;, vi-like operation</dt>
 <dd><a name="IDX267"></a>
 <a name="IDX268"></a>
 <a name="IDX269"></a>
@@ -405,8 +405,8 @@
 for terminals which support Latin scripts.
 </p>
 </dd>
-<dt> <kbd>M-TAB</kbd> (<code>echo-area-tab-insert</code>)</dt>
-<dt> <kbd>Shift-<kbd>TAB</kbd></kbd> (on DOS/Windows only)</dt>
+<dt> &lt;M-TAB&gt; (<code>echo-area-tab-insert</code>)</dt>
+<dt> &lt;Shift-&lt;TAB&gt;&gt; (on DOS/Windows only)</dt>
 <dd><a name="IDX272"></a>
 <a name="IDX273"></a>
 <a name="IDX274"></a>
@@ -414,11 +414,11 @@
 </p>
 <a name="IDX275"></a>
 <a name="IDX276"></a>
-<p>On DOS/Windows only, the <kbd>Shift-<kbd>TAB</kbd></kbd> key is an alias for
-<kbd>M-<kbd>TAB</kbd></kbd>.  This key is sometimes called 
&lsquo;<samp>BackTab</samp>&rsquo;.
+<p>On DOS/Windows only, the <kbd>Shift-&lt;TAB&gt;</kbd> key is an alias for
+<kbd>M-&lt;TAB&gt;</kbd>.  This key is sometimes called 
&lsquo;<samp>BackTab</samp>&rsquo;.
 </p>
 </dd>
-<dt> <kbd>C-t</kbd> (<code>echo-area-transpose-chars</code>)</dt>
+<dt> &lt;C-t&gt; (<code>echo-area-transpose-chars</code>)</dt>
 <dd><a name="IDX277"></a>
 <a name="IDX278"></a>
 <p>Transpose the characters at the cursor.
@@ -430,45 +430,45 @@
 yanking, see <a href="../emacs/Killing.html#Killing">(emacs)Killing</a> 
section `Killing and Deleting' in <cite>the GNU Emacs Manual</cite>
 </p>
 <dl compact="compact">
-<dt> <kbd>M-d</kbd> (<code>echo-area-kill-word</code>)</dt>
-<dt> <kbd>M-X</kbd>, vi-like operation</dt>
+<dt> &lt;M-d&gt; (<code>echo-area-kill-word</code>)</dt>
+<dt> &lt;M-X&gt;, vi-like operation</dt>
 <dd><a name="IDX279"></a>
 <a name="IDX280"></a>
 <a name="IDX281"></a>
 <p>Kill the word following the cursor.
 </p>
 </dd>
-<dt> <kbd>M-DEL</kbd> (<code>echo-area-backward-kill-word</code>)</dt>
-<dt> <kbd>M-<kbd>BS</kbd></kbd></dt>
+<dt> &lt;M-DEL&gt; (<code>echo-area-backward-kill-word</code>)</dt>
+<dt> &lt;M-&lt;BS&gt;&gt;</dt>
 <dd><a name="IDX282"></a>
 <a name="IDX283"></a>
 <p>Kill the word preceding the cursor.
 </p>
 <a name="IDX284"></a>
 <p>On some keyboards, the <code>Backspace</code> key is used instead of
-<code>DEL</code>, so <code>M-<kbd>Backspace</kbd></code> has the same effect as
-<code>M-<kbd>DEL</kbd></code>.
+<code>DEL</code>, so <code>M-&lt;Backspace&gt;</code> has the same effect as
+<code>M-&lt;DEL&gt;</code>.
 </p>
 </dd>
-<dt> <kbd>C-k</kbd> (<code>echo-area-kill-line</code>)</dt>
+<dt> &lt;C-k&gt; (<code>echo-area-kill-line</code>)</dt>
 <dd><a name="IDX285"></a>
 <a name="IDX286"></a>
 <p>Kill the text from the cursor to the end of the line.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd> 
(<code>echo-area-backward-kill-line</code>)</dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd> 
(<code>echo-area-backward-kill-line</code>)</dt>
 <dd><a name="IDX287"></a>
 <a name="IDX288"></a>
 <p>Kill the text from the cursor to the beginning of the line.
 </p>
 </dd>
-<dt> <kbd>C-y</kbd> (<code>echo-area-yank</code>)</dt>
+<dt> &lt;C-y&gt; (<code>echo-area-yank</code>)</dt>
 <dd><a name="IDX289"></a>
 <a name="IDX290"></a>
 <p>Yank back the contents of the last kill.
 </p>
 </dd>
-<dt> <kbd>M-y</kbd> (<code>echo-area-yank-pop</code>)</dt>
+<dt> &lt;M-y&gt; (<code>echo-area-yank-pop</code>)</dt>
 <dd><a name="IDX291"></a>
 <a name="IDX292"></a>
 <p>Yank back a previous kill, removing the last yanked text first.
@@ -488,15 +488,15 @@
 <p>The following commands are available when completing in the echo area:
 </p>
 <dl compact="compact">
-<dt> <kbd>TAB</kbd> (<code>echo-area-complete</code>)</dt>
-<dt> <kbd>SPC</kbd></dt>
+<dt> &lt;TAB&gt; (<code>echo-area-complete</code>)</dt>
+<dt> &lt;SPC&gt;</dt>
 <dd><a name="IDX294"></a>
 <a name="IDX295"></a>
 <a name="IDX296"></a>
 <p>Insert as much of a completion as is possible.
 </p>
 </dd>
-<dt> <kbd>?</kbd> (<code>echo-area-possible-completions</code>)</dt>
+<dt> &lt;?&gt; (<code>echo-area-possible-completions</code>)</dt>
 <dd><a name="IDX297"></a>
 <a name="IDX298"></a>
 <p>Display a window containing a list of the possible completions of what
@@ -517,15 +517,15 @@
 forget
 </pre></td></tr></table>
 
-<p>i.e., all of the choices which begin with &lsquo;<samp>f</samp>&rsquo;.  
Pressing <kbd>SPC</kbd>
-or <kbd>TAB</kbd> would result in &lsquo;<samp>fo</samp>&rsquo; appearing in 
the echo area, since
+<p>i.e., all of the choices which begin with &lsquo;<samp>f</samp>&rsquo;.  
Pressing &lt;SPC&gt;
+or &lt;TAB&gt; would result in &lsquo;<samp>fo</samp>&rsquo; appearing in the 
echo area, since
 all of the choices which begin with &lsquo;<samp>f</samp>&rsquo; continue with 
&lsquo;<samp>o</samp>&rsquo;.
 Now, typing &lsquo;<samp>l</samp>&rsquo; followed by 
&lsquo;<samp>TAB</samp>&rsquo; results in &lsquo;<samp>foliate</samp>&rsquo;
 appearing in the echo area, since that is the only choice which begins
 with &lsquo;<samp>fol</samp>&rsquo;.
 </p>
 </dd>
-<dt> <kbd>ESC C-v</kbd> (<code>echo-area-scroll-completions-window</code>)</dt>
+<dt> &lt;ESC C-v&gt; (<code>echo-area-scroll-completions-window</code>)</dt>
 <dd><a name="IDX299"></a>
 <a name="IDX300"></a>
 <p>Scroll the completions window, if that is visible, or the &quot;other&quot;
Index: texi2html/Tests/texinfo_res/texinfo_10.html
diff -u texi2html/Tests/texinfo_res/texinfo_10.html:1.29 
texi2html/Tests/texinfo_res/texinfo_10.html:1.30
--- texi2html/Tests/texinfo_res/texinfo_10.html:1.29    Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_10.html Sat Apr  8 23:02:08 2006
@@ -417,12 +417,12 @@
 <p>You can embed another @-command inside the braces of an <code>@kbd</code>
 command.  Here, for example, is the way to describe a command that
 would be described more verbosely as &ldquo;press an 
&lsquo;<samp>r</samp>&rsquo; and then
-press the <kbd>RET</kbd> key&rdquo;:
+press the &lt;RET&gt; key&rdquo;:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@kbd{r @key{RET}}
 </pre></td></tr></table>
 
-<p>This produces: <kbd>r <kbd>RET</kbd></kbd>
+<p>This produces: <kbd>r &lt;RET&gt;</kbd>
 </p>
 <p>You also use the <code>@kbd</code> command if you are spelling out the 
letters
 you type; for example:
@@ -434,7 +434,7 @@
 <p>This produces:
 </p>
 <blockquote><p>To give the <code>logout</code> command,
-type the characters <kbd>l o g o u t <kbd>RET</kbd></kbd>.
+type the characters <kbd>l o g o u t &lt;RET&gt;</kbd>.
 </p></blockquote>
 
 <p>(Also, this example shows that you can add spaces for clarity.  If you
@@ -473,7 +473,7 @@
 <code>@kbd</code> command when the sequence of characters to be typed
 includes one or more keys that are described by name.
 </p>
-<p>For example, to produce <kbd>C-x <kbd>ESC</kbd></kbd> you would type:
+<p>For example, to produce <kbd>C-x &lt;ESC&gt;</kbd> you would type:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@kbd{C-x @key{ESC}}
 </pre></td></tr></table>
@@ -526,7 +526,7 @@
 alone; do not use the <code>@key</code> command; but when you are referring
 to the modifier key in isolation, use the <code>@key</code> command.  For
 example, write &lsquo;<samp>@kbd{Meta-a}</samp>&rsquo; to produce 
<kbd>Meta-a</kbd> and
-&lsquo;<samp>@key{META}</samp>&rsquo; to produce <kbd>META</kbd>.
+&lsquo;<samp>@key{META}</samp>&rsquo; to produce &lt;META&gt;.
 </p>
 
 <hr size="6">
Index: texi2html/Tests/texinfo_res/texinfo_2.html
diff -u texi2html/Tests/texinfo_res/texinfo_2.html:1.29 
texi2html/Tests/texinfo_res/texinfo_2.html:1.30
--- texi2html/Tests/texinfo_res/texinfo_2.html:1.29     Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_2.html  Sat Apr  8 23:02:08 2006
@@ -356,7 +356,7 @@
 the command line (see <a href="../info/index.html#Top">(info)Top</a> section 
`Top' in <cite>Info</cite>).
 </p>
 <p>If you want to read through an Info file in sequence, as if it were a
-printed manual, you can hit <kbd>SPC</kbd> repeatedly, or you get the whole
+printed manual, you can hit &lt;SPC&gt; repeatedly, or you get the whole
 file with the advanced Info command <kbd>g *</kbd>.  (See <a 
href="../info/Expert.html#Expert">Advanced Info commands: (info)Expert</a>.)
 </p>
 <p>The &lsquo;<tt>dir</tt>&rsquo; file in the &lsquo;<tt>info</tt>&rsquo; 
directory serves as the
@@ -613,7 +613,7 @@
 differently in the output, for example, in indented text.
 </p>
 <p>To avoid this problem, Texinfo mode causes GNU Emacs to insert multiple
-spaces when you press the <kbd>TAB</kbd> key.
+spaces when you press the &lt;TAB&gt; key.
 </p>
 <p>Also, you can run <code>untabify</code> in Emacs to convert tabs in a region
 to multiple spaces.
Index: texi2html/Tests/texinfo_res/texinfo_20.html
diff -u texi2html/Tests/texinfo_res/texinfo_20.html:1.29 
texi2html/Tests/texinfo_res/texinfo_20.html:1.30
--- texi2html/Tests/texinfo_res/texinfo_20.html:1.29    Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_20.html Sat Apr  8 23:02:08 2006
@@ -538,7 +538,7 @@
 <dt> <kbd>C-c C-t C-x</kbd></dt>
 <dt> <kbd>M-x texinfo-quit-job</kbd></dt>
 <dd><p>Quit a TeX formatting job that has stopped because of an error by
-sending an <kbd>x</kbd> to it.  When you do this, TeX preserves a record
+sending an &lt;x&gt; to it.  When you do this, TeX preserves a record
 of what it did in a &lsquo;<tt>.log</tt>&rsquo; file.
 </p>
 </dd>
Index: texi2html/Tests/texinfo_res/texinfo_21.html
diff -u texi2html/Tests/texinfo_res/texinfo_21.html:1.28 
texi2html/Tests/texinfo_res/texinfo_21.html:1.29
--- texi2html/Tests/texinfo_res/texinfo_21.html:1.28    Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_21.html Sat Apr  8 23:02:08 2006
@@ -652,7 +652,7 @@
 <p>When you invoke either <code>makeinfo-region</code> or
 <code>makeinfo-buffer</code>, Emacs prompts for a file name, offering the
 name of the visited file as the default.  You can edit the default
-file name in the minibuffer if you wish, before pressing <kbd>RET</kbd> to
+file name in the minibuffer if you wish, before pressing &lt;RET&gt; to
 start the <code>makeinfo</code> process.
 </p>
 <p>The Emacs <code>makeinfo-region</code> and <code>makeinfo-buffer</code> 
commands
Index: texi2html/Tests/texinfo_res/texinfo_27.html
diff -u texi2html/Tests/texinfo_res/texinfo_27.html:1.29 
texi2html/Tests/texinfo_res/texinfo_27.html:1.30
--- texi2html/Tests/texinfo_res/texinfo_27.html:1.29    Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_27.html Sat Apr  8 23:02:08 2006
@@ -220,16 +220,16 @@
 </pre></td></tr></table>
 
 <p>Incidentally, if you are reading this node in Info and type <kbd>f
-<kbd>RET</kbd></kbd> (<code>Info-follow-reference</code>), you will generate 
an error
+&lt;RET&gt;</kbd> (<code>Info-follow-reference</code>), you will generate an 
error
 message that says:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">No such node: 
&quot;Catching Mistakes) The only way &hellip;
 </pre></td></tr></table>
 
 <p>This is because Info perceives the example of the error as the first
-cross reference in this node and if you type a <kbd>RET</kbd> immediately
+cross reference in this node and if you type a &lt;RET&gt; immediately
 after typing the Info <kbd>f</kbd> command, Info will attempt to go to the
-referenced node.  If you type <kbd>f catch <kbd>TAB</kbd> 
<kbd>RET</kbd></kbd>, Info
+referenced node.  If you type <kbd>f catch &lt;TAB&gt; &lt;RET&gt;</kbd>, Info
 will complete the node name of the correctly written example and take
 you to the `Catching Mistakes' node.  (If you try this, you can return
 from the `Catching Mistakes' node by typing <kbd>l</kbd>
@@ -312,11 +312,11 @@
 <ol>
 <li>
 You can tell TeX to continue running and ignore just this error by
-typing <kbd>RET</kbd> at the &lsquo;<samp>?</samp>&rsquo; prompt.
+typing &lt;RET&gt; at the &lsquo;<samp>?</samp>&rsquo; prompt.
 
 </li><li>
 You can tell TeX to continue running and to ignore all errors as best
-it can by typing <kbd>r <kbd>RET</kbd></kbd> at the 
&lsquo;<samp>?</samp>&rsquo; prompt.
+it can by typing <kbd>r &lt;RET&gt;</kbd> at the &lsquo;<samp>?</samp>&rsquo; 
prompt.
 
 <p>This is often the best thing to do.  However, beware: the one error
 may produce a cascade of additional error messages as its consequences
@@ -325,7 +325,7 @@
 <kbd>C-c C-c</kbd>, if you are running a shell inside Emacs).
 </p>
 </li><li>
-You can tell TeX to stop this run by typing <kbd>x <kbd>RET</kbd></kbd>
+You can tell TeX to stop this run by typing <kbd>x &lt;RET&gt;</kbd>
 at the &lsquo;<samp>?</samp>&rsquo; prompt.
 </li></ol>
 
@@ -364,7 +364,7 @@
 *
 </pre></td></tr></table>
 
-<p>In this case, simply type <kbd>\end <kbd>RET</kbd></kbd> after the 
asterisk.  Then
+<p>In this case, simply type <kbd>\end &lt;RET&gt;</kbd> after the asterisk.  
Then
 write the header lines in the Texinfo file and run the TeX command
 again. (Note the use of the backslash, &lsquo;<samp>\</samp>&rsquo;.  TeX uses 
&lsquo;<samp>\</samp>&rsquo;
 instead of &lsquo;<samp>@</samp>&rsquo;; and in this circumstance, you are 
working
Index: texi2html/Tests/texinfo_res/texinfo_3.html
diff -u texi2html/Tests/texinfo_res/texinfo_3.html:1.30 
texi2html/Tests/texinfo_res/texinfo_3.html:1.31
--- texi2html/Tests/texinfo_res/texinfo_3.html:1.30     Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_3.html  Sat Apr  8 23:02:08 2006
@@ -299,8 +299,8 @@
 <dt>  <kbd>C-c C-c t</kbd></dt>
 <dt> <kbd>M-x address@hidden</kbd></dt>
 <dd><a name="IDX40"></a>
-<p>Insert <code>@table</code> followed by a <kbd>SPC</kbd>
-and leave the cursor after the <kbd>SPC</kbd>.
+<p>Insert <code>@table</code> followed by a &lt;SPC&gt;
+and leave the cursor after the &lt;SPC&gt;.
 </p>
 </dd>
 <dt>  <kbd>C-c C-c v</kbd></dt>
Index: texi2html/Tests/texinfo_res/texinfo_7.html
diff -u texi2html/Tests/texinfo_res/texinfo_7.html:1.28 
texi2html/Tests/texinfo_res/texinfo_7.html:1.29
--- texi2html/Tests/texinfo_res/texinfo_7.html:1.28     Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/texinfo_res/texinfo_7.html  Sat Apr  8 23:02:08 2006
@@ -632,7 +632,7 @@
 <a name="IDX108"></a>
 On the other hand, do not define the `Previous' node of the Top node to
 be &lsquo;<samp>(dir)</samp>&rsquo;, as it causes confusing behavior for 
users: if you are
-in the Top node and hits <kbd>DEL</kbd> to go backwards, you wind up in the
+in the Top node and hits &lt;DEL&gt; to go backwards, you wind up in the
 middle of the some other entry in the &lsquo;<tt>dir</tt>&rsquo; file, which 
has nothing
 to do with what you were reading.
 
Index: texi2html/Tests/viper_monolithic_res/viper.html
diff -u texi2html/Tests/viper_monolithic_res/viper.html:1.35 
texi2html/Tests/viper_monolithic_res/viper.html:1.36
--- texi2html/Tests/viper_monolithic_res/viper.html:1.35        Sat Apr  8 
22:40:19 2006
+++ texi2html/Tests/viper_monolithic_res/viper.html     Sat Apr  8 23:02:08 2006
@@ -346,8 +346,8 @@
 usually located on each side of the Space bar; it is used in a manner
 similar to the Control key, e.g., <kbd>M-x</kbd> means typing <kbd>x</kbd> 
while
 holding the Meta key down.  For keyboards that do not have a Meta key,
-<kbd>ESC</kbd> is used as Meta.  Thus <kbd>M-x</kbd> is typed as 
<kbd><kbd>ESC</kbd>
-x</kbd>.  Viper uses <kbd>ESC</kbd> to switch from Insert state to Vi state.  
Therefore
+&lt;ESC&gt; is used as Meta.  Thus <kbd>M-x</kbd> is typed as <kbd>&lt;ESC&gt;
+x</kbd>.  Viper uses &lt;ESC&gt; to switch from Insert state to Vi state.  
Therefore
 Viper defines <kbd>C-\</kbd> as its Meta key in Vi state.  See section <a 
href="#SEC8">Vi State</a>, for
 more info.
 </p>
@@ -470,7 +470,7 @@
 &hellip;, will take you to Insert state.  All Vi commands may
 be used in this mode.  Most Ex commands can also be used.
 For a full list of Ex commands supported by Viper, type
-<kbd>:</kbd> and then <kbd>TAB</kbd>.  To get help on any issue, including the 
Ex
+<kbd>:</kbd> and then &lt;TAB&gt;.  To get help on any issue, including the Ex
 commands, type <kbd>:help</kbd>.  This will invoke Viper Info
 (if it is installed).  Then typing <kbd>i</kbd> will prompt you for a topic to
 search in the index.  Note: to search for Ex commands in the index, you
@@ -485,7 +485,7 @@
 </p>
 </dd>
 <dt> &lsquo;<samp>Insert state</samp>&rsquo;</dt>
-<dd><p>Insert state is the Vi insertion mode.  <kbd>ESC</kbd> will take you 
back to
+<dd><p>Insert state is the Vi insertion mode.  &lt;ESC&gt; will take you back 
to
 Vi state.  Insert state editing can be done, including auto-indentation.  By
 default, Viper disables Emacs key bindings in Insert state.
 </p>
@@ -495,7 +495,7 @@
 boundary of a replacement region (usually designated via a 
&lsquo;<samp>$</samp>&rsquo; sign),
 it will automatically change to Insert state.  You do not have to worry
 about it.  The key bindings remain practically the same as in Insert
-state.  If you type <kbd>ESC</kbd>, Viper will switch to Vi command mode, 
terminating the
+state.  If you type &lt;ESC&gt;, Viper will switch to Vi command mode, 
terminating the
 replacement state.
 </p></dd>
 </dl>
@@ -658,15 +658,15 @@
 <dd><a name="IDX21"></a>
 <a name="IDX22"></a>
 
-<p>Viper uses <kbd>ESC</kbd> as a switch between Insert and Vi states.  Emacs 
uses
-<kbd>ESC</kbd> for Meta.  The Meta key is very important in Emacs since many
+<p>Viper uses &lt;ESC&gt; as a switch between Insert and Vi states.  Emacs uses
+&lt;ESC&gt; for Meta.  The Meta key is very important in Emacs since many
 functions are accessible only via that key as <kbd>M-x function-name</kbd>.
 Therefore, we need to simulate it somehow.  In Viper's Vi, Insert, and
 Replace states, the meta key is set to be <kbd>C-\</kbd>.  Thus, to get
 <kbd>M-x</kbd>, you should type <kbd>C-\ x</kbd> (if the keyboard has no Meta 
key,
 which is rare these days).
 This works both in the Vi command state and in the Insert and Replace
-states.  In Vi command state, you can also use <kbd>\ <kbd>ESC</kbd></kbd> as 
the
+states.  In Vi command state, you can also use <kbd>\ &lt;ESC&gt;</kbd> as the
 meta key.
 </p>
 <p>Note: Emacs binds <kbd>C-\</kbd> to a function that offers to change the
@@ -740,7 +740,7 @@
 windows).
 </p>
 <p>When applicable, Ex commands support file completion and history.  This
-means that by typing a partial file name and then <kbd>TAB</kbd>, Emacs will 
try
+means that by typing a partial file name and then &lt;TAB&gt;, Emacs will try
 to complete the name or it will offer a menu of possible completions.
 This works similarly to Tcsh and extends the behavior of Csh.  While Emacs
 is waiting for a file name, you can type <kbd>M-p</kbd> to get the previous 
file
@@ -748,13 +748,13 @@
 browse through the file history.
 </p>
 <p>Like file names, partially typed Ex commands can be completed by typing
-<kbd>TAB</kbd>, and Viper keeps the history of Ex commands.  After typing
+&lt;TAB&gt;, and Viper keeps the history of Ex commands.  After typing
 <kbd>:</kbd>, you can browse through the previously entered Ex commands by
 typing <kbd>M-p</kbd> and <kbd>M-n</kbd>.  Viper tries to rationalize when it 
puts Ex
 commands on the history list.  For instance, if you typed <kbd>:w! foo</kbd>,
 only <kbd>:w!</kbd> will be placed on the history list.  This is because the
 last history element is the default that can be invoked simply by typing
-<kbd>: <kbd>RET</kbd></kbd>.  If <kbd>:w! foo</kbd> were placed on the list, 
it would be all to
+<kbd>: &lt;RET&gt;</kbd>.  If <kbd>:w! foo</kbd> were placed on the list, it 
would be all to
 easy to override valuable data in another file.  Reconstructing the full
 command, <kbd>:w! foo</kbd>, from the history is still not that hard, since 
Viper
 has a separate history for file names.  By typing <kbd>: M-p</kbd>, you will 
get
@@ -878,8 +878,8 @@
 <kbd>cw</kbd>, etc., or by typing <kbd>R</kbd>.  In Replace state, Viper puts 
&lt;R&gt; in
 the mode line to let you know which state is in effect.  If Replace state is
 entered through <kbd>R</kbd>, Viper stays in that state until the user hits
-<kbd>ESC</kbd>.  If this state is entered via the other replacement commands,
-then Replace state is in effect until you hit <kbd>ESC</kbd> or until you cross
+&lt;ESC&gt;.  If this state is entered via the other replacement commands,
+then Replace state is in effect until you hit &lt;ESC&gt; or until you cross
 the rightmost boundary of the replacement region.  In the latter case, Viper
 changes its state from Replace to Insert (which you will notice by the
 change in the mode line).
@@ -892,7 +892,7 @@
 the need to enable text selection and region-setting with the mouse.)
 </p>
 <p>The issue then arises as to what to do when the user
-hits the <kbd>ESC</kbd> key.  In Vi, this would cause the text between cursor 
and
+hits the &lt;ESC&gt; key.  In Vi, this would cause the text between cursor and
 the end of the replacement region to be deleted.  But what if, as is
 possible in Viper, the cursor is not inside the replacement region?
 </p>
@@ -939,7 +939,7 @@
 <dt> <kbd>C-v</kbd></dt>
 <dd><p>Quote the following character
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>Execute command
 </p></dd>
 <dt> <kbd>C-g and C-]</kbd></dt>
@@ -1012,8 +1012,8 @@
 last <kbd>!</kbd> command whichever file it was issued from.
 Typing <kbd>.</kbd> will repeat the last command from any file, and
 searches will repeat the last search.  Ex commands can be repeated by typing
-<kbd>: <kbd>RET</kbd></kbd>.
-Note: in some rare cases, that <kbd>: <kbd>RET</kbd></kbd> may do something 
dangerous.
+<kbd>: &lt;RET&gt;</kbd>.
+Note: in some rare cases, that <kbd>: &lt;RET&gt;</kbd> may do something 
dangerous.
 However, usually its effect can be undone by typing <kbd>u</kbd>.
 </p></dd>
 <dt> &lsquo;<samp>Registers</samp>&rsquo;</dt>
@@ -1043,7 +1043,7 @@
 current directory).
 This directory is inserted in the Minibuffer once you type space after
 <kbd>:e, r</kbd>, etc.  Viper also supports completion of file names and Ex
-commands (<kbd>TAB</kbd>), and it keeps track of
+commands (&lt;TAB&gt;), and it keeps track of
 command and file history (<kbd>M-p</kbd>, <kbd>M-n</kbd>).
 Absolute filenames are required less
 often in Viper.
@@ -1327,8 +1327,8 @@
 <dt> <kbd>M-r and M-s</kbd></dt>
 <dd><p>To search backward and forward through the history.
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
-<dd><p>Type <kbd>RET</kbd> to accept a default (which is displayed in the 
prompt).
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
+<dd><p>Type &lt;RET&gt; to accept a default (which is displayed in the prompt).
 </p></dd>
 </dl>
 
@@ -1427,7 +1427,7 @@
 <h2 class="section"> 2.5 Completion </h2>
 
 
-<p>Completion is done when you type <kbd>TAB</kbd>.  The Emacs completer does 
not
+<p>Completion is done when you type &lt;TAB&gt;.  The Emacs completer does not
 grok wildcards in file names.  Once you type a wildcard, the completer will
 no longer work for that file name.  Remember that Emacs interprets a file name
 of the form <kbd>/foo//bar</kbd> as <kbd>/bar</kbd> and <kbd>/foo/~/bar</kbd> 
as
@@ -1547,7 +1547,7 @@
 will search further back in the buffer, so that one could get
 &lsquo;<samp>Abbrevs</samp>&rsquo; by repeating the
 keystroke, which appears earlier in the text.  Emacs binds this to
-<kbd><kbd>ESC</kbd> /</kbd>, so you will have to find a key and bind the 
function
+<kbd>&lt;ESC&gt; /</kbd>, so you will have to find a key and bind the function
 <code>dabbrev-expand</code> to that key.
 Facilities like this make Vi's <kbd>:ab</kbd> command obsolete.
 </p>
@@ -1574,7 +1574,7 @@
 
 
 <p>Viper can be set free from the line&ndash;limited movements in Vi, such as 
<kbd>l</kbd>
-refusing to move beyond the line, <kbd>ESC</kbd> moving one character back,
+refusing to move beyond the line, &lt;ESC&gt; moving one character back,
 etc.  These derive from Ex, which is a line editor.  If your 
&lsquo;<tt>.viper</tt>&rsquo;
 contains
 </p>
@@ -1670,15 +1670,15 @@
 <p>These two keys invoke many important Emacs functions.  For example, if you
 hit <kbd>C-x</kbd> followed by <kbd>2</kbd>, then the current window will be 
split
 into 2.  Except for novice users, <kbd>C-c</kbd> is also set to execute an 
Emacs
-command from the current major mode.  <kbd>ESC</kbd> will do the same, if you
-configure <kbd>ESC</kbd> as Meta by setting <code>viper-no-multiple-ESC</code> 
to nil
+command from the current major mode.  &lt;ESC&gt; will do the same, if you
+configure &lt;ESC&gt; as Meta by setting <code>viper-no-multiple-ESC</code> to 
nil
 in &lsquo;<tt>.viper</tt>&rsquo;.  See section <a 
href="#SEC25">Customization</a>.  <kbd>C-\</kbd> in Insert, Replace, or Vi
 states will make Emacs think <kbd>Meta</kbd> has been hit.
 </p></dd>
 <dt> <kbd>\</kbd></dt>
 <dd><a name="IDX64"></a>
 <p>Escape to Emacs to execute a single Emacs command.  For instance,
-<kbd>\ <kbd>ESC</kbd></kbd> will act like a Meta key.
+<kbd>\ &lt;ESC&gt;</kbd> will act like a Meta key.
 </p></dd>
 <dt> <kbd>Q</kbd></dt>
 <dd><a name="IDX65"></a>
@@ -2067,25 +2067,25 @@
 <code>t</code> and <code>nil</code> represent &ldquo;true&rdquo; and 
&ldquo;false&rdquo; in Lisp).
 </p>
 <p>Viper supports both the abbreviated Vi variable names and their full
-names.  Variable completion is done on full names only.  <kbd>TAB</kbd> and
-<kbd>SPC</kbd> complete
+names.  Variable completion is done on full names only.  &lt;TAB&gt; and
+&lt;SPC&gt; complete
 variable names.  Typing `=' will complete the name and then will prompt for
-a value, if applicable.  For instance, <kbd>:se au <kbd>SPC</kbd></kbd> will 
complete the
-command to <kbd>:set autoindent</kbd>; <kbd>:se ta <kbd>SPC</kbd></kbd> will 
complete the command
+a value, if applicable.  For instance, <kbd>:se au &lt;SPC&gt;</kbd> will 
complete the
+command to <kbd>:set autoindent</kbd>; <kbd>:se ta &lt;SPC&gt;</kbd> will 
complete the command
 and prompt further like this: <kbd>:set tabstop = </kbd>.
-However, typing <kbd>:se ts <kbd>SPC</kbd></kbd> will produce a &ldquo;No 
match&rdquo; message
+However, typing <kbd>:se ts &lt;SPC&gt;</kbd> will produce a &ldquo;No 
match&rdquo; message
 because <kbd>ts</kbd> is an abbreviation for <kbd>tabstop</kbd> and Viper 
supports
-completion on full names only.  However, you can still hit <kbd>RET</kbd>
+completion on full names only.  However, you can still hit &lt;RET&gt;
 or <kbd>=</kbd>, which will complete the command like this: <kbd>:set ts = 
</kbd> and
 Viper will be waiting for you to type a value for the tabstop variable.
-To get the full list of Vi variables, type <kbd>:se <kbd>SPC</kbd> 
<kbd>TAB</kbd></kbd>.
+To get the full list of Vi variables, type <kbd>:se &lt;SPC&gt; 
&lt;TAB&gt;</kbd>.
 </p>
 <dl compact="compact">
 <dt> <code>viper-auto-indent nil</code></dt>
 <dt> <code>:se ai (:se autoindent)</code></dt>
 <dt> <code>:se ai-g (:se autoindent-global)</code></dt>
 <dd><p>If <code>t</code>, enable auto indentation.
-by <kbd>RET</kbd>, <kbd>o</kbd> or <kbd>O</kbd> command.
+by &lt;RET&gt;, <kbd>o</kbd> or <kbd>O</kbd> command.
 </p>
 <p><code>viper-auto-indent</code> is a local variable.  To change the value 
globally, use
 <code>setq-default</code>.  It may be useful for certain major modes to have 
their
@@ -2098,7 +2098,7 @@
 </p></dd>
 <dt> <code>viper-electric-mode t</code></dt>
 <dd><p>If not <code>nil</code>, auto-indentation becomes electric, which means 
that
-<kbd>RET</kbd>, <kbd>O</kbd>, and <kbd>o</kbd> indent cursor according to the 
current
+&lt;RET&gt;, <kbd>O</kbd>, and <kbd>o</kbd> indent cursor according to the 
current
 major mode.  In the future, this variable may control additional electric
 features.
 </p>
@@ -2141,14 +2141,14 @@
 for all buffers where the tab is not yet set locally,
 including the new buffers.
 </p>
-<p>Note that typing <kbd>TAB</kbd> normally
+<p>Note that typing &lt;TAB&gt; normally
 doesn't insert the tab, since this key is usually bound to
 a text-formatting function, <code>indent-for-tab-command</code> (which 
facilitates
 programming and document writing).  Instead, the tab is inserted via the
 command <code>viper-insert-tab</code>, which is bound to <kbd>S-tab</kbd> 
(shift + tab).
 </p>
-<p>On some non-windowing terminals, Shift doesn't modify the <kbd>TAB</kbd> 
key, so
-<kbd>S-tab</kbd> behaves as if it were <kbd>TAB</kbd>.  In such a case, you 
will have
+<p>On some non-windowing terminals, Shift doesn't modify the &lt;TAB&gt; key, 
so
+<kbd>S-tab</kbd> behaves as if it were &lt;TAB&gt;.  In such a case, you will 
have
 to bind <code>viper-insert-tab</code> to some other convenient key.
 </p>
 </dd>
@@ -2181,18 +2181,18 @@
 the Minibuffer feels like plain Emacs.
 </p></dd>
 <dt> <code>viper-no-multiple-ESC t</code></dt>
-<dd><p>If you set this to <code>nil</code>, you can use <kbd>ESC</kbd> as Meta 
in Vi state.
+<dd><p>If you set this to <code>nil</code>, you can use &lt;ESC&gt; as Meta in 
Vi state.
 Normally, this is not necessary, since graphical displays have separate
 Meta keys (usually on each side of the space bar).  On a dumb terminal, Viper
 sets this variable to <code>twice</code>, which is almost like 
<code>nil</code>, except
-that double <kbd>ESC</kbd> beeps.  This, too, lets <kbd>ESC</kbd> to be used 
as a Meta.
+that double &lt;ESC&gt; beeps.  This, too, lets &lt;ESC&gt; to be used as a 
Meta.
 </p></dd>
 <dt> <code>viper-ESC-keyseq-timeout 200 on tty, 0 on windowing 
display</code></dt>
 <dd><p>Escape key sequences separated by this much delay (in milliseconds) are
-interpreted as command, ignoring the special meaning of <kbd>ESC</kbd> in
+interpreted as command, ignoring the special meaning of &lt;ESC&gt; in
 VI.  The default is suitable for most terminals.  However, if your terminal
 is extremely slow, you might want to increase this slightly.  You will know
-if your terminal is slow if the <kbd>ESC</kbd> key sequences emitted by the
+if your terminal is slow if the &lt;ESC&gt; key sequences emitted by the
 arrow keys are interpreted as separately typed characters (and thus the
 arrow keys won't work).  Making this value too large will slow you down, so
 exercise restraint.
@@ -2225,8 +2225,8 @@
 </p></dd>
 <dt> <code>viper-ex-style-editing t</code></dt>
 <dd><p>Set this to <code>nil</code>, if you want
-<kbd>C-h</kbd> and <kbd>DEL</kbd> to not stop
-at the beginning of a line in Insert state, <kbd>X</kbd> and <kbd>x</kbd> to 
delete
+<kbd>C-h</kbd> and &lt;DEL&gt; to not stop
+at the beginning of a line in Insert state, &lt;X&gt; and &lt;x&gt; to delete
 characters across lines in Vi command state, etc.
 </p></dd>
 <dt> <code>viper-ESC-moves-cursor-back t</code></dt>
@@ -2315,7 +2315,7 @@
 Set it to <code>t</code> and see if you like it better.
 </p></dd>
 <dt> <code>viper-delete-backwards-in-replace nil</code></dt>
-<dd><p>If not <code>nil</code>, <kbd>DEL</kbd> key will delete characters 
while moving the cursor
+<dd><p>If not <code>nil</code>, &lt;DEL&gt; key will delete characters while 
moving the cursor
 backwards.  If <code>nil</code>, the cursor will move backwards without 
deleting
 anything.
 </p></dd>
@@ -2679,7 +2679,7 @@
 </p>
 <p>On rare occasions, local keys may be added by mistake.  Usually this is done
 indirectly, by invoking a major mode that adds local keys (e.g.,
-<code>shell-mode</code> redefines <kbd>RET</kbd>).  In such a case, exiting 
the wrong
+<code>shell-mode</code> redefines &lt;RET&gt;).  In such a case, exiting the 
wrong
 major mode won't rid you from unwanted local keys, since these keys are
 local to Viper state and the current buffer, not to the major mode.
 In such situations, the remedy is to type <kbd>M-x viper-zap-local-keys</kbd>.
@@ -2733,33 +2733,33 @@
 typically do not bind such keys.  Instead, they use key sequences that start
 with <kbd>C-x</kbd> and <kbd>C-c</kbd>.  This is why it was so important for 
us to
 free up <kbd>C-x</kbd> and <kbd>C-c</kbd>.
-It is common for language-specific major modes to bind <kbd>TAB</kbd> and
+It is common for language-specific major modes to bind &lt;TAB&gt; and
 <kbd>C-j</kbd> (the line feed) keys to various formatting functions.  This is
 extremely useful, but may require some getting used to for a Vi user.  If you
 decide that this feature is not for you, you can re-bind these keys as
 explained earlier (see section <a href="#SEC25">Customization</a>).
 </p>
-<p>Binding for <kbd>TAB</kbd> is one of the most unusual aspects of Viper for 
many
-novice users.  In Emacs, <kbd>TAB</kbd> is used to format text and programs, 
and
-is extremely useful.  For instance, hitting <kbd>TAB</kbd> causes the current
+<p>Binding for &lt;TAB&gt; is one of the most unusual aspects of Viper for many
+novice users.  In Emacs, &lt;TAB&gt; is used to format text and programs, and
+is extremely useful.  For instance, hitting &lt;TAB&gt; causes the current
 line to be re-indented in accordance with the context.  In programming,
 this is very important, since improper automatic indentation would
 immediately alert the programmer to a possible error.  For instance, if a
 <kbd>)</kbd> or a <kbd>&quot;</kbd> is missing somewhere above the current
-line, <kbd>TAB</kbd> is likely to mis-indent the line.
+line, &lt;TAB&gt; is likely to mis-indent the line.
 </p>
 <p>For this reason, Viper doesn't change the standard Emacs binding of
-<kbd>TAB</kbd>, thereby sacrificing Vi compatibility
+&lt;TAB&gt;, thereby sacrificing Vi compatibility
 (except for users at level 1).  Instead, in Viper, the key
-<kbd>S-tab</kbd> (shift+ tab) is chosen to emulate Vi's <kbd>TAB</kbd>.
+<kbd>S-tab</kbd> (shift+ tab) is chosen to emulate Vi's &lt;TAB&gt;.
 </p>
 <p>We should note that on some non-windowing terminals, Shift doesn't modify
-the <kbd>TAB</kbd> key, so <kbd>S-tab</kbd> behaves as if it were 
<kbd>TAB</kbd>.  In such
+the &lt;TAB&gt; key, so <kbd>S-tab</kbd> behaves as if it were &lt;TAB&gt;.  
In such
 a case, you will have to bind <code>viper-insert-tab</code> to some other
 convenient key.
 </p>
 <p>Some packages, notably Dired, Gnus, Info, etc., attach special meaning to
-common keys like <kbd>SPC</kbd>, <kbd>x</kbd>, <kbd>d</kbd>, <kbd>v</kbd>, and 
others.  This
+common keys like &lt;SPC&gt;, <kbd>x</kbd>, <kbd>d</kbd>, <kbd>v</kbd>, and 
others.  This
 means that Vi command state is inappropriate for working with these
 packages.  Fortunately, these modes operate on read-only buffers and are
 designed not for editing files, but for special-purpose browsing, reading
@@ -2941,7 +2941,7 @@
 in the order listed and will check if the corresponding file exists.
 </p>
 <p>For instance, if completion stopped at `paper.' and the user typed
-<kbd>RET</kbd>,
+&lt;RET&gt;,
 then Viper will check if the files `paper.', `paper.tex', `paper.c', etc., 
exist.
 It will take the first such file.  If no file exists, Viper will give a chance
 to complete the file name by typing the appropriate suffix.  If `paper.' was
@@ -3037,7 +3037,7 @@
 <p>in the &lsquo;<tt>~/.viper</tt>&rsquo; file or through the customization 
widget, as
 described above.  However, in that case, the user will not have any
 indication of the current Viper state in the minibuffer.  (This is important
-if the user accidentally switches to another Viper state by typing 
<kbd>ESC</kbd> or
+if the user accidentally switches to another Viper state by typing &lt;ESC&gt; 
or
 <kbd>C-z</kbd>).
 </p></dd>
 <dt> <code>M-x viper-go-away</code></dt>
@@ -3297,7 +3297,7 @@
 not just to printable keys.  For instance, one can define a macro that will
 be invoked by hitting <kbd>f3</kbd> then <kbd>f2</kbd> function keys.  (The 
keys
 <kbd>delete</kbd> and <kbd>backspace</kbd> are excluded; also, a macro 
invocation
-sequence can't start with <kbd>ESC</kbd>.  Some other keys, such as 
<kbd>f1</kbd> and
+sequence can't start with &lt;ESC&gt;.  Some other keys, such as <kbd>f1</kbd> 
and
 <kbd>help</kbd>, can't be bound to macros under Emacs, since they
 are bound in <code>key-translation-map</code>, which overrides any other 
binding
 the user gives to keys.  In general, keys that have a binding in
@@ -3346,7 +3346,7 @@
 instance, holding Meta and Control and pressing <kbd>f4</kbd> is represented as
 <kbd>(control meta f4)</kbd>.
 If all members of a vectors are printable characters (or sequences, such as
-<kbd>\e</kbd>, <kbd>\t</kbd>, for <kbd>ESC</kbd> and <kbd>TAB</kbd>), then 
they can also be represented as
+<kbd>\e</kbd>, <kbd>\t</kbd>, for &lt;ESC&gt; and &lt;TAB&gt;), then they can 
also be represented as
 strings:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">(viper-record-kbd-macro 
&quot;aa&quot; 'vi-state  &quot;aaa\e&quot;  &quot;my-buffer&quot;)
@@ -3417,7 +3417,7 @@
 other function.  Emacs doesn't allow the user to do that, but Viper does
 this through its keyboard macro facility.  To do this, type <kbd>:map </kbd>
 first.  When you are asked to enter a macro name, hit f13 twice, followed by
-<kbd>RET</kbd> or <kbd>SPC</kbd>.
+&lt;RET&gt; or &lt;SPC&gt;.
 </p>
 <p>Emacs will now start the mapping process by actually executing
 Vi and Emacs commands, so that you could see what will happen each time the
@@ -3471,7 +3471,7 @@
 should hit the actual key <kbd>f6</kbd> if it is to be part of a macro
 name; you do <em>not</em> write <kbd>f 6</kbd>.  When entering keys, Viper
 displays them as strings or vectors (e.g., <code>&quot;abc&quot;</code> or 
<code>[f6
-f7 a]</code>).  The same holds for unmapping.  Hitting <kbd>TAB</kbd> while
+f7 a]</code>).  The same holds for unmapping.  Hitting &lt;TAB&gt; while
 typing a macro name in the <kbd>:unmap</kbd> or <kbd>:unmap!</kbd> command will
 cause name completion.  Completions are displayed as strings or
 vectors.  However, as before, you don't actually type 
&lsquo;<samp>&quot;</samp>&rsquo;,
@@ -5986,7 +5986,7 @@
 <tr><th><a name="SEC51_34">E</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="#IDX295"><code><kbd>e</kbd></code></a></td><td valign="top"><a 
href="#SEC34">4.2.1 Move Commands</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#IDX294"><code><kbd>E</kbd></code></a></td><td valign="top"><a 
href="#SEC34">4.2.1 Move Commands</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#SEC6"><code><kbd>ESC</kbd></code></a></td><td valign="top"><a 
href="#SEC6">1.3 States in Viper</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#SEC6"><code>&lt;ESC&gt;</code></a></td><td valign="top"><a 
href="#SEC6">1.3 States in Viper</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="SEC51_35">F</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="#IDX303"><code><kbd>F&lt;char&gt;</kbd></code></a></td><td 
valign="top"><a href="#SEC34">4.2.1 Move Commands</a></td></tr>
Index: texi2html/Tests/viper_res/viper_2.html
diff -u texi2html/Tests/viper_res/viper_2.html:1.27 
texi2html/Tests/viper_res/viper_2.html:1.28
--- texi2html/Tests/viper_res/viper_2.html:1.27 Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/viper_res/viper_2.html      Sat Apr  8 23:02:08 2006
@@ -219,8 +219,8 @@
 usually located on each side of the Space bar; it is used in a manner
 similar to the Control key, e.g., <kbd>M-x</kbd> means typing <kbd>x</kbd> 
while
 holding the Meta key down.  For keyboards that do not have a Meta key,
-<kbd>ESC</kbd> is used as Meta.  Thus <kbd>M-x</kbd> is typed as 
<kbd><kbd>ESC</kbd>
-x</kbd>.  Viper uses <kbd>ESC</kbd> to switch from Insert state to Vi state.  
Therefore
+&lt;ESC&gt; is used as Meta.  Thus <kbd>M-x</kbd> is typed as <kbd>&lt;ESC&gt;
+x</kbd>.  Viper uses &lt;ESC&gt; to switch from Insert state to Vi state.  
Therefore
 Viper defines <kbd>C-\</kbd> as its Meta key in Vi state.  See section <a 
href="#SEC8">Vi State</a>, for
 more info.
 </p>
@@ -343,7 +343,7 @@
 &hellip;, will take you to Insert state.  All Vi commands may
 be used in this mode.  Most Ex commands can also be used.
 For a full list of Ex commands supported by Viper, type
-<kbd>:</kbd> and then <kbd>TAB</kbd>.  To get help on any issue, including the 
Ex
+<kbd>:</kbd> and then &lt;TAB&gt;.  To get help on any issue, including the Ex
 commands, type <kbd>:help</kbd>.  This will invoke Viper Info
 (if it is installed).  Then typing <kbd>i</kbd> will prompt you for a topic to
 search in the index.  Note: to search for Ex commands in the index, you
@@ -358,7 +358,7 @@
 </p>
 </dd>
 <dt> &lsquo;<samp>Insert state</samp>&rsquo;</dt>
-<dd><p>Insert state is the Vi insertion mode.  <kbd>ESC</kbd> will take you 
back to
+<dd><p>Insert state is the Vi insertion mode.  &lt;ESC&gt; will take you back 
to
 Vi state.  Insert state editing can be done, including auto-indentation.  By
 default, Viper disables Emacs key bindings in Insert state.
 </p>
@@ -368,7 +368,7 @@
 boundary of a replacement region (usually designated via a 
&lsquo;<samp>$</samp>&rsquo; sign),
 it will automatically change to Insert state.  You do not have to worry
 about it.  The key bindings remain practically the same as in Insert
-state.  If you type <kbd>ESC</kbd>, Viper will switch to Vi command mode, 
terminating the
+state.  If you type &lt;ESC&gt;, Viper will switch to Vi command mode, 
terminating the
 replacement state.
 </p></dd>
 </dl>
@@ -531,15 +531,15 @@
 <dd><a name="IDX21"></a>
 <a name="IDX22"></a>
 
-<p>Viper uses <kbd>ESC</kbd> as a switch between Insert and Vi states.  Emacs 
uses
-<kbd>ESC</kbd> for Meta.  The Meta key is very important in Emacs since many
+<p>Viper uses &lt;ESC&gt; as a switch between Insert and Vi states.  Emacs uses
+&lt;ESC&gt; for Meta.  The Meta key is very important in Emacs since many
 functions are accessible only via that key as <kbd>M-x function-name</kbd>.
 Therefore, we need to simulate it somehow.  In Viper's Vi, Insert, and
 Replace states, the meta key is set to be <kbd>C-\</kbd>.  Thus, to get
 <kbd>M-x</kbd>, you should type <kbd>C-\ x</kbd> (if the keyboard has no Meta 
key,
 which is rare these days).
 This works both in the Vi command state and in the Insert and Replace
-states.  In Vi command state, you can also use <kbd>\ <kbd>ESC</kbd></kbd> as 
the
+states.  In Vi command state, you can also use <kbd>\ &lt;ESC&gt;</kbd> as the
 meta key.
 </p>
 <p>Note: Emacs binds <kbd>C-\</kbd> to a function that offers to change the
@@ -613,7 +613,7 @@
 windows).
 </p>
 <p>When applicable, Ex commands support file completion and history.  This
-means that by typing a partial file name and then <kbd>TAB</kbd>, Emacs will 
try
+means that by typing a partial file name and then &lt;TAB&gt;, Emacs will try
 to complete the name or it will offer a menu of possible completions.
 This works similarly to Tcsh and extends the behavior of Csh.  While Emacs
 is waiting for a file name, you can type <kbd>M-p</kbd> to get the previous 
file
@@ -621,13 +621,13 @@
 browse through the file history.
 </p>
 <p>Like file names, partially typed Ex commands can be completed by typing
-<kbd>TAB</kbd>, and Viper keeps the history of Ex commands.  After typing
+&lt;TAB&gt;, and Viper keeps the history of Ex commands.  After typing
 <kbd>:</kbd>, you can browse through the previously entered Ex commands by
 typing <kbd>M-p</kbd> and <kbd>M-n</kbd>.  Viper tries to rationalize when it 
puts Ex
 commands on the history list.  For instance, if you typed <kbd>:w! foo</kbd>,
 only <kbd>:w!</kbd> will be placed on the history list.  This is because the
 last history element is the default that can be invoked simply by typing
-<kbd>: <kbd>RET</kbd></kbd>.  If <kbd>:w! foo</kbd> were placed on the list, 
it would be all to
+<kbd>: &lt;RET&gt;</kbd>.  If <kbd>:w! foo</kbd> were placed on the list, it 
would be all to
 easy to override valuable data in another file.  Reconstructing the full
 command, <kbd>:w! foo</kbd>, from the history is still not that hard, since 
Viper
 has a separate history for file names.  By typing <kbd>: M-p</kbd>, you will 
get
@@ -751,8 +751,8 @@
 <kbd>cw</kbd>, etc., or by typing <kbd>R</kbd>.  In Replace state, Viper puts 
&lt;R&gt; in
 the mode line to let you know which state is in effect.  If Replace state is
 entered through <kbd>R</kbd>, Viper stays in that state until the user hits
-<kbd>ESC</kbd>.  If this state is entered via the other replacement commands,
-then Replace state is in effect until you hit <kbd>ESC</kbd> or until you cross
+&lt;ESC&gt;.  If this state is entered via the other replacement commands,
+then Replace state is in effect until you hit &lt;ESC&gt; or until you cross
 the rightmost boundary of the replacement region.  In the latter case, Viper
 changes its state from Replace to Insert (which you will notice by the
 change in the mode line).
@@ -765,7 +765,7 @@
 the need to enable text selection and region-setting with the mouse.)
 </p>
 <p>The issue then arises as to what to do when the user
-hits the <kbd>ESC</kbd> key.  In Vi, this would cause the text between cursor 
and
+hits the &lt;ESC&gt; key.  In Vi, this would cause the text between cursor and
 the end of the replacement region to be deleted.  But what if, as is
 possible in Viper, the cursor is not inside the replacement region?
 </p>
@@ -812,7 +812,7 @@
 <dt> <kbd>C-v</kbd></dt>
 <dd><p>Quote the following character
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>Execute command
 </p></dd>
 <dt> <kbd>C-g and C-]</kbd></dt>
@@ -885,8 +885,8 @@
 last <kbd>!</kbd> command whichever file it was issued from.
 Typing <kbd>.</kbd> will repeat the last command from any file, and
 searches will repeat the last search.  Ex commands can be repeated by typing
-<kbd>: <kbd>RET</kbd></kbd>.
-Note: in some rare cases, that <kbd>: <kbd>RET</kbd></kbd> may do something 
dangerous.
+<kbd>: &lt;RET&gt;</kbd>.
+Note: in some rare cases, that <kbd>: &lt;RET&gt;</kbd> may do something 
dangerous.
 However, usually its effect can be undone by typing <kbd>u</kbd>.
 </p></dd>
 <dt> &lsquo;<samp>Registers</samp>&rsquo;</dt>
@@ -916,7 +916,7 @@
 current directory).
 This directory is inserted in the Minibuffer once you type space after
 <kbd>:e, r</kbd>, etc.  Viper also supports completion of file names and Ex
-commands (<kbd>TAB</kbd>), and it keeps track of
+commands (&lt;TAB&gt;), and it keeps track of
 command and file history (<kbd>M-p</kbd>, <kbd>M-n</kbd>).
 Absolute filenames are required less
 often in Viper.
Index: texi2html/Tests/viper_res/viper_3.html
diff -u texi2html/Tests/viper_res/viper_3.html:1.26 
texi2html/Tests/viper_res/viper_3.html:1.27
--- texi2html/Tests/viper_res/viper_3.html:1.26 Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/viper_res/viper_3.html      Sat Apr  8 23:02:08 2006
@@ -264,8 +264,8 @@
 <dt> <kbd>M-r and M-s</kbd></dt>
 <dd><p>To search backward and forward through the history.
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
-<dd><p>Type <kbd>RET</kbd> to accept a default (which is displayed in the 
prompt).
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
+<dd><p>Type &lt;RET&gt; to accept a default (which is displayed in the prompt).
 </p></dd>
 </dl>
 
@@ -364,7 +364,7 @@
 <h2 class="section"> 2.5 Completion </h2>
 
 
-<p>Completion is done when you type <kbd>TAB</kbd>.  The Emacs completer does 
not
+<p>Completion is done when you type &lt;TAB&gt;.  The Emacs completer does not
 grok wildcards in file names.  Once you type a wildcard, the completer will
 no longer work for that file name.  Remember that Emacs interprets a file name
 of the form <kbd>/foo//bar</kbd> as <kbd>/bar</kbd> and <kbd>/foo/~/bar</kbd> 
as
@@ -484,7 +484,7 @@
 will search further back in the buffer, so that one could get
 &lsquo;<samp>Abbrevs</samp>&rsquo; by repeating the
 keystroke, which appears earlier in the text.  Emacs binds this to
-<kbd><kbd>ESC</kbd> /</kbd>, so you will have to find a key and bind the 
function
+<kbd>&lt;ESC&gt; /</kbd>, so you will have to find a key and bind the function
 <code>dabbrev-expand</code> to that key.
 Facilities like this make Vi's <kbd>:ab</kbd> command obsolete.
 </p>
@@ -511,7 +511,7 @@
 
 
 <p>Viper can be set free from the line&ndash;limited movements in Vi, such as 
<kbd>l</kbd>
-refusing to move beyond the line, <kbd>ESC</kbd> moving one character back,
+refusing to move beyond the line, &lt;ESC&gt; moving one character back,
 etc.  These derive from Ex, which is a line editor.  If your 
&lsquo;<tt>.viper</tt>&rsquo;
 contains
 </p>
@@ -607,15 +607,15 @@
 <p>These two keys invoke many important Emacs functions.  For example, if you
 hit <kbd>C-x</kbd> followed by <kbd>2</kbd>, then the current window will be 
split
 into 2.  Except for novice users, <kbd>C-c</kbd> is also set to execute an 
Emacs
-command from the current major mode.  <kbd>ESC</kbd> will do the same, if you
-configure <kbd>ESC</kbd> as Meta by setting <code>viper-no-multiple-ESC</code> 
to nil
+command from the current major mode.  &lt;ESC&gt; will do the same, if you
+configure &lt;ESC&gt; as Meta by setting <code>viper-no-multiple-ESC</code> to 
nil
 in &lsquo;<tt>.viper</tt>&rsquo;.  See section <a 
href="viper_4.html#SEC25">Customization</a>.  <kbd>C-\</kbd> in Insert, 
Replace, or Vi
 states will make Emacs think <kbd>Meta</kbd> has been hit.
 </p></dd>
 <dt> <kbd>\</kbd></dt>
 <dd><a name="IDX64"></a>
 <p>Escape to Emacs to execute a single Emacs command.  For instance,
-<kbd>\ <kbd>ESC</kbd></kbd> will act like a Meta key.
+<kbd>\ &lt;ESC&gt;</kbd> will act like a Meta key.
 </p></dd>
 <dt> <kbd>Q</kbd></dt>
 <dd><a name="IDX65"></a>
Index: texi2html/Tests/viper_res/viper_4.html
diff -u texi2html/Tests/viper_res/viper_4.html:1.26 
texi2html/Tests/viper_res/viper_4.html:1.27
--- texi2html/Tests/viper_res/viper_4.html:1.26 Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/viper_res/viper_4.html      Sat Apr  8 23:02:08 2006
@@ -136,25 +136,25 @@
 <code>t</code> and <code>nil</code> represent &ldquo;true&rdquo; and 
&ldquo;false&rdquo; in Lisp).
 </p>
 <p>Viper supports both the abbreviated Vi variable names and their full
-names.  Variable completion is done on full names only.  <kbd>TAB</kbd> and
-<kbd>SPC</kbd> complete
+names.  Variable completion is done on full names only.  &lt;TAB&gt; and
+&lt;SPC&gt; complete
 variable names.  Typing `=' will complete the name and then will prompt for
-a value, if applicable.  For instance, <kbd>:se au <kbd>SPC</kbd></kbd> will 
complete the
-command to <kbd>:set autoindent</kbd>; <kbd>:se ta <kbd>SPC</kbd></kbd> will 
complete the command
+a value, if applicable.  For instance, <kbd>:se au &lt;SPC&gt;</kbd> will 
complete the
+command to <kbd>:set autoindent</kbd>; <kbd>:se ta &lt;SPC&gt;</kbd> will 
complete the command
 and prompt further like this: <kbd>:set tabstop = </kbd>.
-However, typing <kbd>:se ts <kbd>SPC</kbd></kbd> will produce a &ldquo;No 
match&rdquo; message
+However, typing <kbd>:se ts &lt;SPC&gt;</kbd> will produce a &ldquo;No 
match&rdquo; message
 because <kbd>ts</kbd> is an abbreviation for <kbd>tabstop</kbd> and Viper 
supports
-completion on full names only.  However, you can still hit <kbd>RET</kbd>
+completion on full names only.  However, you can still hit &lt;RET&gt;
 or <kbd>=</kbd>, which will complete the command like this: <kbd>:set ts = 
</kbd> and
 Viper will be waiting for you to type a value for the tabstop variable.
-To get the full list of Vi variables, type <kbd>:se <kbd>SPC</kbd> 
<kbd>TAB</kbd></kbd>.
+To get the full list of Vi variables, type <kbd>:se &lt;SPC&gt; 
&lt;TAB&gt;</kbd>.
 </p>
 <dl compact="compact">
 <dt> <code>viper-auto-indent nil</code></dt>
 <dt> <code>:se ai (:se autoindent)</code></dt>
 <dt> <code>:se ai-g (:se autoindent-global)</code></dt>
 <dd><p>If <code>t</code>, enable auto indentation.
-by <kbd>RET</kbd>, <kbd>o</kbd> or <kbd>O</kbd> command.
+by &lt;RET&gt;, <kbd>o</kbd> or <kbd>O</kbd> command.
 </p>
 <p><code>viper-auto-indent</code> is a local variable.  To change the value 
globally, use
 <code>setq-default</code>.  It may be useful for certain major modes to have 
their
@@ -167,7 +167,7 @@
 </p></dd>
 <dt> <code>viper-electric-mode t</code></dt>
 <dd><p>If not <code>nil</code>, auto-indentation becomes electric, which means 
that
-<kbd>RET</kbd>, <kbd>O</kbd>, and <kbd>o</kbd> indent cursor according to the 
current
+&lt;RET&gt;, <kbd>O</kbd>, and <kbd>o</kbd> indent cursor according to the 
current
 major mode.  In the future, this variable may control additional electric
 features.
 </p>
@@ -210,14 +210,14 @@
 for all buffers where the tab is not yet set locally,
 including the new buffers.
 </p>
-<p>Note that typing <kbd>TAB</kbd> normally
+<p>Note that typing &lt;TAB&gt; normally
 doesn't insert the tab, since this key is usually bound to
 a text-formatting function, <code>indent-for-tab-command</code> (which 
facilitates
 programming and document writing).  Instead, the tab is inserted via the
 command <code>viper-insert-tab</code>, which is bound to <kbd>S-tab</kbd> 
(shift + tab).
 </p>
-<p>On some non-windowing terminals, Shift doesn't modify the <kbd>TAB</kbd> 
key, so
-<kbd>S-tab</kbd> behaves as if it were <kbd>TAB</kbd>.  In such a case, you 
will have
+<p>On some non-windowing terminals, Shift doesn't modify the &lt;TAB&gt; key, 
so
+<kbd>S-tab</kbd> behaves as if it were &lt;TAB&gt;.  In such a case, you will 
have
 to bind <code>viper-insert-tab</code> to some other convenient key.
 </p>
 </dd>
@@ -250,18 +250,18 @@
 the Minibuffer feels like plain Emacs.
 </p></dd>
 <dt> <code>viper-no-multiple-ESC t</code></dt>
-<dd><p>If you set this to <code>nil</code>, you can use <kbd>ESC</kbd> as Meta 
in Vi state.
+<dd><p>If you set this to <code>nil</code>, you can use &lt;ESC&gt; as Meta in 
Vi state.
 Normally, this is not necessary, since graphical displays have separate
 Meta keys (usually on each side of the space bar).  On a dumb terminal, Viper
 sets this variable to <code>twice</code>, which is almost like 
<code>nil</code>, except
-that double <kbd>ESC</kbd> beeps.  This, too, lets <kbd>ESC</kbd> to be used 
as a Meta.
+that double &lt;ESC&gt; beeps.  This, too, lets &lt;ESC&gt; to be used as a 
Meta.
 </p></dd>
 <dt> <code>viper-ESC-keyseq-timeout 200 on tty, 0 on windowing 
display</code></dt>
 <dd><p>Escape key sequences separated by this much delay (in milliseconds) are
-interpreted as command, ignoring the special meaning of <kbd>ESC</kbd> in
+interpreted as command, ignoring the special meaning of &lt;ESC&gt; in
 VI.  The default is suitable for most terminals.  However, if your terminal
 is extremely slow, you might want to increase this slightly.  You will know
-if your terminal is slow if the <kbd>ESC</kbd> key sequences emitted by the
+if your terminal is slow if the &lt;ESC&gt; key sequences emitted by the
 arrow keys are interpreted as separately typed characters (and thus the
 arrow keys won't work).  Making this value too large will slow you down, so
 exercise restraint.
@@ -294,8 +294,8 @@
 </p></dd>
 <dt> <code>viper-ex-style-editing t</code></dt>
 <dd><p>Set this to <code>nil</code>, if you want
-<kbd>C-h</kbd> and <kbd>DEL</kbd> to not stop
-at the beginning of a line in Insert state, <kbd>X</kbd> and <kbd>x</kbd> to 
delete
+<kbd>C-h</kbd> and &lt;DEL&gt; to not stop
+at the beginning of a line in Insert state, &lt;X&gt; and &lt;x&gt; to delete
 characters across lines in Vi command state, etc.
 </p></dd>
 <dt> <code>viper-ESC-moves-cursor-back t</code></dt>
@@ -384,7 +384,7 @@
 Set it to <code>t</code> and see if you like it better.
 </p></dd>
 <dt> <code>viper-delete-backwards-in-replace nil</code></dt>
-<dd><p>If not <code>nil</code>, <kbd>DEL</kbd> key will delete characters 
while moving the cursor
+<dd><p>If not <code>nil</code>, &lt;DEL&gt; key will delete characters while 
moving the cursor
 backwards.  If <code>nil</code>, the cursor will move backwards without 
deleting
 anything.
 </p></dd>
@@ -748,7 +748,7 @@
 </p>
 <p>On rare occasions, local keys may be added by mistake.  Usually this is done
 indirectly, by invoking a major mode that adds local keys (e.g.,
-<code>shell-mode</code> redefines <kbd>RET</kbd>).  In such a case, exiting 
the wrong
+<code>shell-mode</code> redefines &lt;RET&gt;).  In such a case, exiting the 
wrong
 major mode won't rid you from unwanted local keys, since these keys are
 local to Viper state and the current buffer, not to the major mode.
 In such situations, the remedy is to type <kbd>M-x viper-zap-local-keys</kbd>.
@@ -802,33 +802,33 @@
 typically do not bind such keys.  Instead, they use key sequences that start
 with <kbd>C-x</kbd> and <kbd>C-c</kbd>.  This is why it was so important for 
us to
 free up <kbd>C-x</kbd> and <kbd>C-c</kbd>.
-It is common for language-specific major modes to bind <kbd>TAB</kbd> and
+It is common for language-specific major modes to bind &lt;TAB&gt; and
 <kbd>C-j</kbd> (the line feed) keys to various formatting functions.  This is
 extremely useful, but may require some getting used to for a Vi user.  If you
 decide that this feature is not for you, you can re-bind these keys as
 explained earlier (see section <a href="#SEC25">Customization</a>).
 </p>
-<p>Binding for <kbd>TAB</kbd> is one of the most unusual aspects of Viper for 
many
-novice users.  In Emacs, <kbd>TAB</kbd> is used to format text and programs, 
and
-is extremely useful.  For instance, hitting <kbd>TAB</kbd> causes the current
+<p>Binding for &lt;TAB&gt; is one of the most unusual aspects of Viper for many
+novice users.  In Emacs, &lt;TAB&gt; is used to format text and programs, and
+is extremely useful.  For instance, hitting &lt;TAB&gt; causes the current
 line to be re-indented in accordance with the context.  In programming,
 this is very important, since improper automatic indentation would
 immediately alert the programmer to a possible error.  For instance, if a
 <kbd>)</kbd> or a <kbd>&quot;</kbd> is missing somewhere above the current
-line, <kbd>TAB</kbd> is likely to mis-indent the line.
+line, &lt;TAB&gt; is likely to mis-indent the line.
 </p>
 <p>For this reason, Viper doesn't change the standard Emacs binding of
-<kbd>TAB</kbd>, thereby sacrificing Vi compatibility
+&lt;TAB&gt;, thereby sacrificing Vi compatibility
 (except for users at level 1).  Instead, in Viper, the key
-<kbd>S-tab</kbd> (shift+ tab) is chosen to emulate Vi's <kbd>TAB</kbd>.
+<kbd>S-tab</kbd> (shift+ tab) is chosen to emulate Vi's &lt;TAB&gt;.
 </p>
 <p>We should note that on some non-windowing terminals, Shift doesn't modify
-the <kbd>TAB</kbd> key, so <kbd>S-tab</kbd> behaves as if it were 
<kbd>TAB</kbd>.  In such
+the &lt;TAB&gt; key, so <kbd>S-tab</kbd> behaves as if it were &lt;TAB&gt;.  
In such
 a case, you will have to bind <code>viper-insert-tab</code> to some other
 convenient key.
 </p>
 <p>Some packages, notably Dired, Gnus, Info, etc., attach special meaning to
-common keys like <kbd>SPC</kbd>, <kbd>x</kbd>, <kbd>d</kbd>, <kbd>v</kbd>, and 
others.  This
+common keys like &lt;SPC&gt;, <kbd>x</kbd>, <kbd>d</kbd>, <kbd>v</kbd>, and 
others.  This
 means that Vi command state is inappropriate for working with these
 packages.  Fortunately, these modes operate on read-only buffers and are
 designed not for editing files, but for special-purpose browsing, reading
@@ -1010,7 +1010,7 @@
 in the order listed and will check if the corresponding file exists.
 </p>
 <p>For instance, if completion stopped at `paper.' and the user typed
-<kbd>RET</kbd>,
+&lt;RET&gt;,
 then Viper will check if the files `paper.', `paper.tex', `paper.c', etc., 
exist.
 It will take the first such file.  If no file exists, Viper will give a chance
 to complete the file name by typing the appropriate suffix.  If `paper.' was
@@ -1106,7 +1106,7 @@
 <p>in the &lsquo;<tt>~/.viper</tt>&rsquo; file or through the customization 
widget, as
 described above.  However, in that case, the user will not have any
 indication of the current Viper state in the minibuffer.  (This is important
-if the user accidentally switches to another Viper state by typing 
<kbd>ESC</kbd> or
+if the user accidentally switches to another Viper state by typing &lt;ESC&gt; 
or
 <kbd>C-z</kbd>).
 </p></dd>
 <dt> <code>M-x viper-go-away</code></dt>
@@ -1366,7 +1366,7 @@
 not just to printable keys.  For instance, one can define a macro that will
 be invoked by hitting <kbd>f3</kbd> then <kbd>f2</kbd> function keys.  (The 
keys
 <kbd>delete</kbd> and <kbd>backspace</kbd> are excluded; also, a macro 
invocation
-sequence can't start with <kbd>ESC</kbd>.  Some other keys, such as 
<kbd>f1</kbd> and
+sequence can't start with &lt;ESC&gt;.  Some other keys, such as <kbd>f1</kbd> 
and
 <kbd>help</kbd>, can't be bound to macros under Emacs, since they
 are bound in <code>key-translation-map</code>, which overrides any other 
binding
 the user gives to keys.  In general, keys that have a binding in
@@ -1415,7 +1415,7 @@
 instance, holding Meta and Control and pressing <kbd>f4</kbd> is represented as
 <kbd>(control meta f4)</kbd>.
 If all members of a vectors are printable characters (or sequences, such as
-<kbd>\e</kbd>, <kbd>\t</kbd>, for <kbd>ESC</kbd> and <kbd>TAB</kbd>), then 
they can also be represented as
+<kbd>\e</kbd>, <kbd>\t</kbd>, for &lt;ESC&gt; and &lt;TAB&gt;), then they can 
also be represented as
 strings:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">(viper-record-kbd-macro 
&quot;aa&quot; 'vi-state  &quot;aaa\e&quot;  &quot;my-buffer&quot;)
@@ -1486,7 +1486,7 @@
 other function.  Emacs doesn't allow the user to do that, but Viper does
 this through its keyboard macro facility.  To do this, type <kbd>:map </kbd>
 first.  When you are asked to enter a macro name, hit f13 twice, followed by
-<kbd>RET</kbd> or <kbd>SPC</kbd>.
+&lt;RET&gt; or &lt;SPC&gt;.
 </p>
 <p>Emacs will now start the mapping process by actually executing
 Vi and Emacs commands, so that you could see what will happen each time the
@@ -1540,7 +1540,7 @@
 should hit the actual key <kbd>f6</kbd> if it is to be part of a macro
 name; you do <em>not</em> write <kbd>f 6</kbd>.  When entering keys, Viper
 displays them as strings or vectors (e.g., <code>&quot;abc&quot;</code> or 
<code>[f6
-f7 a]</code>).  The same holds for unmapping.  Hitting <kbd>TAB</kbd> while
+f7 a]</code>).  The same holds for unmapping.  Hitting &lt;TAB&gt; while
 typing a macro name in the <kbd>:unmap</kbd> or <kbd>:unmap!</kbd> command will
 cause name completion.  Completions are displayed as strings or
 vectors.  However, as before, you don't actually type 
&lsquo;<samp>&quot;</samp>&rsquo;,
Index: texi2html/Tests/viper_res/viper_8.html
diff -u texi2html/Tests/viper_res/viper_8.html:1.18 
texi2html/Tests/viper_res/viper_8.html:1.19
--- texi2html/Tests/viper_res/viper_8.html:1.18 Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/viper_res/viper_8.html      Sat Apr  8 23:02:08 2006
@@ -184,7 +184,7 @@
 <tr><th><a name="INDEX0_1">E</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="viper_5.html#IDX295"><code><kbd>e</kbd></code></a></td><td 
valign="top"><a href="viper_5.html#SEC34">4.2.1 Move Commands</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="viper_5.html#IDX294"><code><kbd>E</kbd></code></a></td><td 
valign="top"><a href="viper_5.html#SEC34">4.2.1 Move Commands</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="viper_2.html#SEC6"><code><kbd>ESC</kbd></code></a></td><td 
valign="top"><a href="viper_2.html#SEC6">1.3 States in Viper</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="viper_2.html#SEC6"><code>&lt;ESC&gt;</code></a></td><td valign="top"><a 
href="viper_2.html#SEC6">1.3 States in Viper</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX0_2">F</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="viper_5.html#IDX303"><code><kbd>F&lt;char&gt;</kbd></code></a></td><td 
valign="top"><a href="viper_5.html#SEC34">4.2.1 Move Commands</a></td></tr>
Index: texi2html/Tests/xemacs_frame_res/xemacs.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs.html:1.20 
texi2html/Tests/xemacs_frame_res/xemacs.html:1.21
--- texi2html/Tests/xemacs_frame_res/xemacs.html:1.20   Sat Apr  8 22:40:19 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs.html        Sat Apr  8 23:02:08 2006
@@ -266,9 +266,9 @@
 </td></tr>
 <tr><td align="left" valign="top"><a href="xemacs_5.html#SEC25">2.1.3 String 
Key Sequences</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     
Available for upward compatibility.
 </td></tr>
-<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC26">2.1.4 
Assignment of the <kbd>META</kbd> Key</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">                 Using <kbd>ESC</kbd> to represent 
<kbd>Meta</kbd>
+<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC26">2.1.4 
Assignment of the &lt;META&gt; Key</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">                 Using &lt;ESC&gt; to represent 
&lt;Meta&gt;
 </td></tr>
-<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> 
Keys</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     Adding 
modifier keys on certain keyboards.
+<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the &lt;SUPER&gt; and &lt;HYPER&gt; 
Keys</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     Adding 
modifier keys on certain keyboards.
 </td></tr>
 <tr><td align="left" valign="top"><a href="xemacs_5.html#SEC28">2.2 
Representation of Characters</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top"> How characters appear in XEmacs buffers.
 </td></tr>
Index: texi2html/Tests/xemacs_frame_res/xemacs_10.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_10.html:1.19 
texi2html/Tests/xemacs_frame_res/xemacs_10.html:1.20
--- texi2html/Tests/xemacs_frame_res/xemacs_10.html:1.19        Sat Apr  8 
22:40:19 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_10.html     Sat Apr  8 23:02:08 2006
@@ -76,8 +76,8 @@
 <a name="IDX246"></a>
 <a name="IDX247"></a>
 <p> To run a command by name, start with <kbd>M-x</kbd>, then type the
-command name, and finish with <kbd>RET</kbd>.  <kbd>M-x</kbd> uses the 
minibuffer
-to read the command name.  <kbd>RET</kbd> exits the minibuffer and runs the
+command name, and finish with &lt;RET&gt;.  <kbd>M-x</kbd> uses the minibuffer
+to read the command name.  &lt;RET&gt; exits the minibuffer and runs the
 command.
 </p>
 <p>  Emacs uses the minibuffer for reading input for many different purposes;
@@ -89,10 +89,10 @@
 <p>  You can use completion to enter a command name.  For example, to
 invoke the command <code>forward-char</code>, type:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x forward-char 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x forward-char &lt;RET&gt;
 </pre></td></tr></table>
 <p>or
-</p><table><tr><td>&nbsp;</td><td><pre class="example">M-x fo <kbd>TAB</kbd> c 
<kbd>RET</kbd>
+</p><table><tr><td>&nbsp;</td><td><pre class="example">M-x fo &lt;TAB&gt; c 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>After you type in <code>M-x fo TAB</code> emacs will give you a possible 
list of 
@@ -210,9 +210,9 @@
 &lsquo;<samp>@</samp>&rsquo; and &lsquo;<samp>*</samp>&rsquo;; they are 
processed in the order that they appear.
 </p>
 <p>Normally, when describing a command that is run by name, we omit the
-<kbd>RET</kbd> that is needed to terminate the name.  Thus we may refer to
-<kbd>M-x auto-fill-mode</kbd> rather than <kbd>M-x auto-fill-mode</kbd> 
<kbd>RET</kbd>.
-We mention the <kbd>RET</kbd> only when it is necessary to emphasize its
+&lt;RET&gt; that is needed to terminate the name.  Thus we may refer to
+<kbd>M-x auto-fill-mode</kbd> rather than <kbd>M-x auto-fill-mode</kbd> 
&lt;RET&gt;.
+We mention the &lt;RET&gt; only when it is necessary to emphasize its
 presence, for example, when describing a sequence of input that contains
 a command name and arguments that follow it.
 </p>
Index: texi2html/Tests/xemacs_frame_res/xemacs_11.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_11.html:1.22 
texi2html/Tests/xemacs_frame_res/xemacs_11.html:1.23
--- texi2html/Tests/xemacs_frame_res/xemacs_11.html:1.22        Sat Apr  8 
22:40:19 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_11.html     Sat Apr  8 23:02:08 2006
@@ -66,7 +66,7 @@
 documentation-printing commands.  The characters that you can type after
 <kbd>C-h</kbd> are called <em>help options</em>.  One help option is 
<kbd>C-h</kbd>;
 that is how you ask for help about using <kbd>C-h</kbd>.  To cancel, type
-<kbd>C-g</kbd>.  The function key <kbd>F1</kbd> is equivalent to 
<kbd>C-h</kbd>.
+<kbd>C-g</kbd>.  The function key &lt;F1&gt; is equivalent to <kbd>C-h</kbd>.
 </p>
 <a name="IDX250"></a>
 <a name="IDX251"></a>
@@ -83,7 +83,7 @@
 Emacs still waits for you to type an option.  To cancel, type <kbd>C-g</kbd>.
 </p>
 <p>  Most help buffers use a special major mode, Help mode, which lets you
-scroll conveniently with <kbd>SPC</kbd> and <kbd>DEL</kbd> or <kbd>BS</kbd>.
+scroll conveniently with &lt;SPC&gt; and &lt;DEL&gt; or &lt;BS&gt;.
 </p>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#SEC72">8.1 Help 
Summary</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">        
Brief list of all Help commands.
@@ -126,7 +126,7 @@
 <p>  Here is a summary of the defined help commands.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-h a <var>regexp</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h a <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Display a list of functions and variables whose names match 
<var>regexp</var>
 (<code>hyper-apropos</code>).
 </p></dd>
@@ -144,8 +144,8 @@
 (<code>describe-key-briefly</code>).  Here <kbd>c</kbd> stands for 
`character'.  For more
 extensive information on <var>key</var>, use <kbd>C-h k</kbd>.
 </p></dd>
-<dt> <kbd>C-h d <var>function</var> <kbd>RET</kbd></kbd></dt>
-<dt> <kbd>C-h f <var>function</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h d <var>function</var> &lt;RET&gt;</kbd></dt>
+<dt> <kbd>C-h f <var>function</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Display documentation on the Lisp function named <var>function</var>
 (<code>describe-function</code>).  Since commands are Lisp functions,
 a command name may be used.
@@ -185,31 +185,31 @@
 <dt> <kbd>C-h t</kbd></dt>
 <dd><p>Enter the XEmacs interactive tutorial (<code>help-with-tutorial</code>).
 </p></dd>
-<dt> <kbd>C-h v <var>var</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h v <var>var</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Display the documentation of the Lisp variable <var>var</var>
 (<code>describe-variable</code>).
 </p></dd>
-<dt> <kbd>C-h w <var>command</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h w <var>command</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Print which keys run the command named <var>command</var> 
(<code>where-is</code>).
 </p></dd>
-<dt> <kbd>C-h B <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h B &lt;RET&gt;</kbd></dt>
 <dd><p>Display info on how to deal with Beta versions of XEmacs
 (<code>describe-beta</code>).
 </p></dd>
-<dt> <kbd>C-h C <var>group</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C <var>group</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select customization buffer for <var>group</var> 
(<code>customize</code>).
 </p></dd>
-<dt> <kbd>C-h F <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h F &lt;RET&gt;</kbd></dt>
 <dd><p>View the local copy of the XEmacs FAQ (<code>xemacs-local-faq</code>).
 </p></dd>
-<dt> <kbd>C-h C-i <var>file</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C-i <var>file</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Read Info file <var>file</var> with Info browser 
(<code>Info-query</code>).
 </p></dd>
-<dt> <kbd>C-h C-c <var>command</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C-c <var>command</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Look up an Emacs command <var>command</var> in the Emacs manual in the 
Info
 system (<code>Info-goto-emacs-command-node</code>).
 </p></dd>
-<dt> <kbd>C-h C-f <var>function</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C-f <var>function</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Look up an Emacs Lisp function <var>function</var> in the Elisp manual 
in the
 Info system (<code>Info-elisp-ref</code>).
 </p></dd>
@@ -283,7 +283,7 @@
 you can use the argument <var>function</var> to get the documentation of a
 command that you know by name.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-h f auto-fill-mode 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-h f auto-fill-mode 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>displays the documentation for <code>auto-fill-mode</code>. Using <kbd>C-h 
f</kbd>
@@ -296,7 +296,7 @@
 <p>  <kbd>C-h f</kbd> is also useful for Lisp functions that you are planning 
to
 use in a Lisp program.  For example, if you have just written the
 expression <code>(make-vector len)</code> and want to make sure you are using
-<code>make-vector</code> properly, type <kbd>C-h f make-vector 
<kbd>RET</kbd></kbd>.
+<code>make-vector</code> properly, type <kbd>C-h f make-vector 
&lt;RET&gt;</kbd>.
 Because <kbd>C-h f</kbd> allows all function names, not just command names,
 you may find that some of your favorite abbreviations that work in
 <kbd>M-x</kbd> don't work in <kbd>C-h f</kbd>.  An abbreviation may be unique
@@ -304,7 +304,7 @@
 allowed.
 </p>
 <p>  The function name for <kbd>C-h f</kbd> to describe has a default which is
-used if you type <kbd>RET</kbd> leaving the minibuffer empty.  The default is
+used if you type &lt;RET&gt; leaving the minibuffer empty.  The default is
 the function called by the innermost Lisp expression in the buffer
 around point, <em>provided</em> that is a valid, defined Lisp function
 name.  For example, if point is located following the text
@@ -320,7 +320,7 @@
 </p>
 <a name="IDX254"></a>
 <a name="IDX255"></a>
-<p>  <kbd>C-h w <var>command</var> <kbd>RET</kbd></kbd> 
(<code>where-is</code>) tells you what
+<p>  <kbd>C-h w <var>command</var> &lt;RET&gt;</kbd> (<code>where-is</code>) 
tells you what
 keys are bound to <var>command</var>.  It prints a list of the keys in the
 echo area. Alternatively, it informs you that a command is not bound to
 any keys, which implies that you must use <kbd>M-x</kbd> to call the
@@ -368,7 +368,7 @@
 
 <p>  A more sophisticated sort of question to ask is, &ldquo;What are the
 commands for working with files?&rdquo;  To ask this question, type <kbd>C-h
-a file <kbd>RET</kbd></kbd>, which displays a list of all command names that
+a file &lt;RET&gt;</kbd>, which displays a list of all command names that
 contain &lsquo;<samp>file</samp>&rsquo;, including <code>copy-file</code>, 
<code>find-file</code>, and
 so on.  With each command name appears a brief description of how to use
 the command, and what keys you can currently invoke it with.  For
@@ -381,7 +381,7 @@
 <p>  Because <kbd>C-h A</kbd> looks only for functions whose names contain the
 string you specify, you must use ingenuity in choosing the string.  If
 you are looking for commands for killing backwards and <kbd>C-h a
-kill-backwards <kbd>RET</kbd></kbd> doesn't reveal any, don't give up.  Try 
just
+kill-backwards &lt;RET&gt;</kbd> doesn't reveal any, don't give up.  Try just
 <kbd>kill</kbd>, or just <kbd>backwards</kbd>, or just <kbd>back</kbd>.  Be 
persistent.
 Pretend you are playing Adventure.  Also note that you can use a regular
 expression as the argument, for more flexibility (see section <a 
href="xemacs_15.html#SEC121">Syntax of Regular Expressions</a>).
@@ -423,7 +423,7 @@
 </p>
 <p>  If you want more information about a function definition, variable or
 symbol property listed in the Apropos buffer, you can click on it with
-<kbd>Mouse-2</kbd> or move there and type <kbd>RET</kbd>.
+<kbd>Mouse-2</kbd> or move there and type &lt;RET&gt;.
 </p>
 <hr size="6">
 <a name="Library-Keywords"></a>
@@ -512,11 +512,11 @@
 <p>  Help buffers provide the commands of View mode (see section <a 
href="xemacs_17.html#SEC168">Miscellaneous File Operations</a>), plus a few 
special commands of their own.
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>Scroll forward.
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
-<dt> <kbd><kbd>BS</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
+<dt> <kbd>&lt;BS&gt;</kbd></dt>
 <dd><p>Scroll backward.
 </p></dd>
 </dl>
@@ -563,7 +563,7 @@
 <a name="IDX264"></a>
 <a name="IDX265"></a>
 <p>  There are two special help commands for accessing XEmacs documentation
-through Info.  <kbd>C-h C-f <var>function</var> <kbd>RET</kbd></kbd> enters 
Info and
+through Info.  <kbd>C-h C-f <var>function</var> &lt;RET&gt;</kbd> enters Info 
and
 goes straight to the documentation of the XEmacs function
 <var>function</var>.  <kbd>C-h C-k <var>key</var></kbd> enters Info and goes 
straight
 to the documentation of the key <var>key</var>.  These two keys run the
@@ -596,7 +596,7 @@
 <p>  You can get a similar list for a particular prefix key by typing
 <kbd>C-h</kbd> after the prefix key.  (There are a few prefix keys for which
 this does not work&mdash;those that provide their own bindings for
-<kbd>C-h</kbd>.  One of these is <kbd>ESC</kbd>, because <kbd><kbd>ESC</kbd> 
C-h</kbd> is
+<kbd>C-h</kbd>.  One of these is &lt;ESC&gt;, because <kbd>&lt;ESC&gt; 
C-h</kbd> is
 actually <kbd>C-M-h</kbd>, which marks a defun.)
 </p>
 <a name="IDX272"></a>
Index: texi2html/Tests/xemacs_frame_res/xemacs_12.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_12.html:1.24 
texi2html/Tests/xemacs_frame_res/xemacs_12.html:1.25
--- texi2html/Tests/xemacs_frame_res/xemacs_12.html:1.24        Sat Apr  8 
22:40:19 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_12.html     Sat Apr  8 23:02:08 2006
@@ -149,7 +149,7 @@
 <p>  Here are some commands for setting the mark:
 </p>
 <dl compact="compact">
-<dt> <kbd>C-<kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>C-&lt;SPC&gt;</kbd></dt>
 <dd><p>Set the mark where point is (<code>set-mark-command</code>).
 </p></dd>
 <dt> <kbd>C-@</kbd></dt>
@@ -169,7 +169,7 @@
 <p>  For example, to convert part of the buffer to all
 upper-case, you can use the <kbd>C-x C-u</kbd> (<code>upcase-region</code>)
 command, which operates on the text in the region.  First go to the
-beginning of the text you want to capitalize and type 
<kbd>C-<kbd>SPC</kbd></kbd> to
+beginning of the text you want to capitalize and type <kbd>C-&lt;SPC&gt;</kbd> 
to
 put the mark there, then move to the end, and then type <kbd>C-x C-u</kbd> to
 capitalize the selected region.  You can also set the mark at the end of the
 text, move to the beginning, and then type <kbd>C-x C-u</kbd>.  Most commands
@@ -178,16 +178,16 @@
 </p>
 <a name="IDX284"></a>
 <a name="IDX285"></a>
-<p>  The most common way to set the mark is with the 
<kbd>C-<kbd>SPC</kbd></kbd>
+<p>  The most common way to set the mark is with the <kbd>C-&lt;SPC&gt;</kbd>
 command (<code>set-mark-command</code>).  This command sets the mark where
 point is. You can then move point away, leaving the mark behind.  It is
-actually incorrect to speak of the character <kbd>C-<kbd>SPC</kbd></kbd>; 
there is
-no such character.  When you type <kbd>SPC</kbd> while holding down
-<kbd>CTRL</kbd>, you get the character <kbd>C-@</kbd> on most terminals. This
+actually incorrect to speak of the character <kbd>C-&lt;SPC&gt;</kbd>; there is
+no such character.  When you type &lt;SPC&gt; while holding down
+&lt;CTRL&gt;, you get the character <kbd>C-@</kbd> on most terminals. This
 character is actually bound to <code>set-mark-command</code>.  But unless you 
are
-unlucky enough to have a terminal where typing <kbd>C-<kbd>SPC</kbd></kbd> does
+unlucky enough to have a terminal where typing <kbd>C-&lt;SPC&gt;</kbd> does
 not produce <kbd>C-@</kbd>, you should think of this character as
-<kbd>C-<kbd>SPC</kbd></kbd>.
+<kbd>C-&lt;SPC&gt;</kbd>.
 </p>
 <a name="IDX286"></a>
 <a name="IDX287"></a>
@@ -262,7 +262,7 @@
 </li><li>
 Print hardcopy with <kbd>M-x print-region</kbd> (see section <a 
href="xemacs_29.html#SEC345">Hardcopy Output</a>).
 </li><li>
-Indent it with <kbd>C-x <kbd>TAB</kbd></kbd> or <kbd>C-M-\</kbd> (see section 
<a href="xemacs_22.html#SEC192">Indentation</a>).
+Indent it with <kbd>C-x &lt;TAB&gt;</kbd> or <kbd>C-M-\</kbd> (see section <a 
href="xemacs_22.html#SEC192">Indentation</a>).
 </li></ul>
 
 <hr size="6">
@@ -367,7 +367,7 @@
 a spot that you may want to go back to.  To make this feature more
 useful, Emacs remembers 16 previous locations of the mark in the
 <em>mark ring</em>.  Most commands that set the mark push the old mark onto
-this ring.  To return to a marked location, use <kbd>C-u C-<kbd>SPC</kbd></kbd>
+this ring.  To return to a marked location, use <kbd>C-u C-&lt;SPC&gt;</kbd>
 (or <kbd>C-u C-@</kbd>); this is the command <code>set-mark-command</code> 
given a
 numeric argument.  The command moves point to where the mark was, and
 restores the mark from the ring of former marks. Repeated use of this
@@ -375,7 +375,7 @@
 The marks you have seen go to the end of the ring, so no marks are lost.
 </p>
 <p>  Each buffer has its own mark ring.  All editing commands use the current
-buffer's mark ring.  In particular, <kbd>C-u C-<kbd>SPC</kbd></kbd> always 
stays in
+buffer's mark ring.  In particular, <kbd>C-u C-&lt;SPC&gt;</kbd> always stays 
in
 the same buffer.
 </p>
 <p>  Many commands that can move long distances, such as <kbd>M-&lt;</kbd>
@@ -389,7 +389,7 @@
 <p>  The variable <code>mark-ring-max</code> is the maximum number of entries 
to
 keep in the mark ring.  If that many entries exist and another entry is
 added, the last entry in the list is discarded.  Repeating <kbd>C-u
-C-<kbd>SPC</kbd></kbd> circulates through the entries that are currently in the
+C-&lt;SPC&gt;</kbd> circulates through the entries that are currently in the
 ring.
 </p>
 <a name="IDX305"></a>
@@ -492,7 +492,7 @@
 <p>XEmacs also provides the following mouse functions.  Most of these are
 not bound to mouse gestures by default, but they are provided for your
 customization pleasure.  For example, if you wanted <kbd>shift-left</kbd>
-(that is, holding down the <kbd>Shift</kbd> key and clicking the left mouse
+(that is, holding down the &lt;Shift&gt; key and clicking the left mouse
 button) to delete the character at which you are pointing, then you
 could do this:
 </p>
@@ -550,22 +550,22 @@
 </p></dd>
 <dt> <kbd>mouse-track</kbd></dt>
 <dd><p>Make a selection with the mouse.   This is the default binding of 
-the left mouse button (<kbd>button1</kbd>).
+the left mouse button (&lt;button1&gt;).
 </p></dd>
 <dt> <kbd>mouse-track-adjust</kbd></dt>
 <dd><p>Extend the existing selection.  This is the default binding of
-<kbd>Shift-button1</kbd>.
+&lt;Shift-button1&gt;.
 </p></dd>
 <dt> <kbd>mouse-track-and-copy-to-cutbuffer</kbd></dt>
 <dd><p>Make a selection like <code>mouse-track</code>, but also copy it to the 
cut buffer.
 </p></dd>
 <dt> <kbd>mouse-track-delete-and-insert</kbd></dt>
 <dd><p>Make a selection with the mouse and insert it at point.  This is the
-default binding of <kbd>control-shift-button1</kbd>.
+default binding of &lt;control-shift-button1&gt;.
 </p></dd>
 <dt> <kbd>mouse-track-insert</kbd></dt>
 <dd><p>Make a selection with the mouse and insert it at point.
-This is the default binding of <kbd>control-button1</kbd>.
+This is the default binding of &lt;control-button1&gt;.
 </p></dd>
 <dt> <kbd>mouse-window-to-region</kbd></dt>
 <dd><p>Narrow a window to the region between the cursor and the mouse pointer.
@@ -598,15 +598,15 @@
 <p>The <kbd>M-x mouse-track-adjust</kbd> command should be bound to a mouse
 button.  The selection will be enlarged or shrunk so that the point of
 the mouse click is one of its endpoints.  This is only meaningful
-after the <code>mouse-track</code> command (<kbd>button1</kbd>) has been 
executed.
+after the <code>mouse-track</code> command (&lt;button1&gt;) has been executed.
 </p>
 <p>The <kbd>M-x mouse-track-delete-and-insert</kbd> command is exactly the same
-as the <code>mouse-track</code> command on <kbd>button1</kbd>, except that 
point is
+as the <code>mouse-track</code> command on &lt;button1&gt;, except that point 
is
 not moved; the selected text is immediately inserted after being
 selected; and the text of the selection is deleted.
 </p>
 <p>The <kbd>M-x mouse-track-insert</kbd> command is exactly the same as the
-<code>mouse-track</code> command on <kbd>button1</kbd>, except that point is 
not moved;
+<code>mouse-track</code> command on &lt;button1&gt;, except that point is not 
moved;
 the selected text is immediately inserted after being selected; and the
 selection is immediately disowned afterwards.
 </p>
@@ -643,7 +643,7 @@
 &lsquo;<samp>kill</samp>&rsquo; and &lsquo;<samp>delete</samp>&rsquo; to 
indicate what they do.  If you perform
 a kill or delete command by mistake, use the <kbd>C-x u</kbd> 
(<code>undo</code>)
 command to undo it (see section <a href="xemacs_8.html#SEC59">Undoing 
Changes</a>). The delete commands include <kbd>C-d</kbd>
-(<code>delete-char</code>) and <kbd>DEL</kbd> 
(<code>delete-backward-char</code>), which
+(<code>delete-char</code>) and &lt;DEL&gt; 
(<code>delete-backward-char</code>), which
 delete only one character at a time, and those commands that delete only
 spaces or newlines.  Commands that can destroy significant amounts of
 nontrivial data usually kill.
@@ -672,13 +672,13 @@
 <dt> <kbd>C-d</kbd></dt>
 <dd><p>Delete next character (<code>delete-char</code>).
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Delete previous character (<code>delete-backward-char</code>).
 </p></dd>
 <dt> <kbd>M-\</kbd></dt>
 <dd><p>Delete spaces and tabs around point 
(<code>delete-horizontal-space</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>M-&lt;SPC&gt;</kbd></dt>
 <dd><p>Delete spaces and tabs around point, leaving one space
 (<code>just-one-space</code>).
 </p></dd>
@@ -692,12 +692,12 @@
 </dl>
 
 <p>  The most basic delete commands are <kbd>C-d</kbd> 
(<code>delete-char</code>) and
-<kbd>DEL</kbd> (<code>delete-backward-char</code>).  <kbd>C-d</kbd> deletes the
+&lt;DEL&gt; (<code>delete-backward-char</code>).  <kbd>C-d</kbd> deletes the
 character after point, the one the cursor is &ldquo;on top of&rdquo;.  Point
-doesn't move.  <kbd>DEL</kbd> deletes the character before the cursor, and
+doesn't move.  &lt;DEL&gt; deletes the character before the cursor, and
 moves point back.  You can delete newlines like any other characters in
 the buffer; deleting a newline joins two lines.  Actually, <kbd>C-d</kbd> and
-<kbd>DEL</kbd> aren't always delete commands; if you give them an argument,
+&lt;DEL&gt; aren't always delete commands; if you give them an argument,
 they kill instead, since they can erase more than one character this
 way.
 </p>
@@ -712,7 +712,7 @@
 <p>  The other delete commands delete only formatting characters: spaces,
 tabs and newlines.  <kbd>M-\</kbd> (<code>delete-horizontal-space</code>) 
deletes
 all spaces and tab characters before and after point.
-<kbd>M-<kbd>SPC</kbd></kbd> (<code>just-one-space</code>) does the same but 
leaves a
+<kbd>M-&lt;SPC&gt;</kbd> (<code>just-one-space</code>) does the same but 
leaves a
 single space after point, regardless of the number of spaces that
 existed previously (even zero).
 </p>
@@ -804,10 +804,10 @@
 <dt> <kbd>M-d</kbd></dt>
 <dd><p>Kill word (<code>kill-word</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill word backwards (<code>backward-kill-word</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to beginning of sentence 
(<code>backward-kill-sentence</code>).
 See section <a href="xemacs_23.html#SEC207">Sentences</a>.
 </p></dd>
@@ -837,9 +837,9 @@
 argument acts as a repeat count.  A negative argument means to search
 backward and kill text before point.
 </p>
-<p>  Other syntactic units can be killed: words, with 
<kbd>M-<kbd>DEL</kbd></kbd> and
+<p>  Other syntactic units can be killed: words, with <kbd>M-&lt;DEL&gt;</kbd> 
and
 <kbd>M-d</kbd> (see section <a href="xemacs_23.html#SEC206">Words</a>); sexps, 
with <kbd>C-M-k</kbd> (see section <a href="xemacs_24.html#SEC217">Lists and 
Sexps</a>); and
-sentences, with <kbd>C-x <kbd>DEL</kbd></kbd> and <kbd>M-k</kbd>
+sentences, with <kbd>C-x &lt;DEL&gt;</kbd> and <kbd>M-k</kbd>
 (see section <a href="xemacs_23.html#SEC207">Sentences</a>).
 </p>
 <hr size="6">
@@ -988,12 +988,12 @@
 </pre></td></tr></table>
 
 <p>with point at the beginning of the second line.  If you type <kbd>C-k C-u 2
-M-<kbd>DEL</kbd> C-k</kbd>, the first <kbd>C-k</kbd> kills the text 
&lsquo;<samp>line of sample
-text</samp>&rsquo;, <kbd>C-u 2 M-<kbd>DEL</kbd></kbd> kills &lsquo;<samp>the 
first</samp>&rsquo; with the newline that
+M-&lt;DEL&gt; C-k</kbd>, the first <kbd>C-k</kbd> kills the text 
&lsquo;<samp>line of sample
+text</samp>&rsquo;, <kbd>C-u 2 M-&lt;DEL&gt;</kbd> kills &lsquo;<samp>the 
first</samp>&rsquo; with the newline that
 followed it, and the second <kbd>C-k</kbd> kills the newline after the second
 line.  The result is that the buffer contains &lsquo;<samp>This is and here is 
the
-third.</samp>&rsquo; and a single kill entry contains &lsquo;<samp>the 
first<kbd>RET</kbd>line of
-sample text<kbd>RET</kbd></samp>&rsquo;&mdash;all the killed text, in its 
original order.
+third.</samp>&rsquo; and a single kill entry contains &lsquo;<samp>the 
first&lt;RET&gt;line of
+sample text&lt;RET&gt;</samp>&rsquo;&mdash;all the killed text, in its 
original order.
 </p>
 <a name="IDX338"></a>
 <a name="IDX339"></a>
@@ -1382,7 +1382,7 @@
 </p>
 <p>When <code>zmacs-regions</code> is <code>t</code>, there is no distinction 
between
 the primary X selection and the active region selected by point and the
-mark.  To see this, set the mark (<kbd>C-SPC</kbd>) and move the cursor
+mark.  To see this, set the mark (&lt;C-SPC&gt;) and move the cursor
 with any cursor-motion command: the region between point and mark is
 highlighted, and you can watch it grow and shrink as you move the
 cursor.
@@ -1395,7 +1395,7 @@
 <p>Commands that require a region (such as <kbd>C-w</kbd>) signal an error if
 the region is not active.  Certain commands cause the region to be in
 its active state.  The most common ones are <code>push-mark</code>
-(<kbd>C-SPC</kbd>) and <code>exchange-point-and-mark</code> (<kbd>C-x 
C-x</kbd>).
+(&lt;C-SPC&gt;) and <code>exchange-point-and-mark</code> (<kbd>C-x C-x</kbd>).
 </p>
 <a name="IDX342"></a>
 <p>When <code>zmacs-regions</code> is <code>t</code>, programs can be 
non-intrusive
Index: texi2html/Tests/xemacs_frame_res/xemacs_13.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_13.html:1.21 
texi2html/Tests/xemacs_frame_res/xemacs_13.html:1.22
--- texi2html/Tests/xemacs_frame_res/xemacs_13.html:1.21        Sat Apr  8 
22:40:19 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_13.html     Sat Apr  8 23:02:08 2006
@@ -77,7 +77,7 @@
 view-register</kbd>.
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x view-register <kbd>RET</kbd> <var>r</var></kbd></dt>
+<dt> <kbd>M-x view-register &lt;RET&gt; <var>r</var></kbd></dt>
 <dd><p>Display a description of what register <var>r</var> contains.
 </p></dd>
 </dl>
@@ -129,7 +129,7 @@
 and moves point to that place in it.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x r <kbd>SPC</kbd> <var>r</var></kbd></dt>
+<dt> <kbd>C-x r &lt;SPC&gt; <var>r</var></kbd></dt>
 <dd><p>Save position of point in register <var>r</var> 
(<code>point-to-register</code>).
 </p></dd>
 <dt> <kbd>C-x r j <var>r</var></kbd></dt>
@@ -140,7 +140,7 @@
 <a name="IDX352"></a>
 <a name="IDX353"></a>
 <p>  To save the current position of point in a register, choose a name
-<var>r</var> and type <kbd>C-x r <kbd>SPC</kbd> <var>r</var></kbd>.  The 
register <var>r</var>
+<var>r</var> and type <kbd>C-x r &lt;SPC&gt; <var>r</var></kbd>.  The register 
<var>r</var>
 retains the position thus saved until you store something else in that
 register.
 </p>
@@ -287,7 +287,7 @@
 <dd><p>Save the state of the selected frame's windows in register <var>r</var>
 (<code>window-configuration-to-register</code>).
 </p></dd>
-<dt> <kbd>M-x frame-configuration-to-register <kbd>RET</kbd> 
<var>r</var></kbd></dt>
+<dt> <kbd>M-x frame-configuration-to-register &lt;RET&gt; 
<var>r</var></kbd></dt>
 <dd><p>Save the state of all frames, including all their windows, in register
 <var>r</var> (<code>frame-configuration-to-register</code>).
 </p></dd>
@@ -414,16 +414,16 @@
 install that to use bookmark facility (see section <a 
href="xemacs_25.html#SEC262">Packages</a>).
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x r m <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x r m &lt;RET&gt;</kbd></dt>
 <dd><p>Set the bookmark for the visited file, at point.
 </p>
 </dd>
-<dt> <kbd>C-x r m <var>bookmark</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x r m <var>bookmark</var> &lt;RET&gt;</kbd></dt>
 <dd><a name="IDX367"></a>
 <p>Set the bookmark named <var>bookmark</var> at point 
(<code>bookmark-set</code>).
 </p>
 </dd>
-<dt> <kbd>C-x r b <var>bookmark</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x r b <var>bookmark</var> &lt;RET&gt;</kbd></dt>
 <dd><a name="IDX368"></a>
 <p>Jump to the bookmark named <var>bookmark</var> (<code>bookmark-jump</code>).
 </p>
@@ -481,7 +481,7 @@
 <p>  Here are some additional commands for working with bookmarks:
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x bookmark-load <kbd>RET</kbd> <var>filename</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-load &lt;RET&gt; <var>filename</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX378"></a>
 <p>Load a file named <var>filename</var> that contains a list of bookmark
 values.  You can use this command, as well as <code>bookmark-write</code>, to
@@ -489,23 +489,23 @@
 bookmark file.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-write <kbd>RET</kbd> <var>filename</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-write &lt;RET&gt; <var>filename</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX379"></a>
 <p>Save all the current bookmark values in the file <var>filename</var>.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-delete <kbd>RET</kbd> <var>bookmark</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-delete &lt;RET&gt; <var>bookmark</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX380"></a>
 <p>Delete the bookmark named <var>bookmark</var>.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-insert-location <kbd>RET</kbd> <var>bookmark</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-insert-location &lt;RET&gt; <var>bookmark</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX381"></a>
 <p>Insert in the buffer the name of the file that bookmark <var>bookmark</var>
 points to.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-insert <kbd>RET</kbd> <var>bookmark</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-insert &lt;RET&gt; <var>bookmark</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX382"></a>
 <p>Insert in the buffer the <em>contents</em> of the file that bookmark
 <var>bookmark</var> points to.
Index: texi2html/Tests/xemacs_frame_res/xemacs_14.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_14.html:1.21 
texi2html/Tests/xemacs_frame_res/xemacs_14.html:1.22
--- texi2html/Tests/xemacs_frame_res/xemacs_14.html:1.21        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_14.html     Sat Apr  8 23:02:08 2006
@@ -396,7 +396,7 @@
 controlled by the variable <code>tab-width</code>, which is made local by
 changing it, just like <code>ctl-arrow</code>.  Note that how the tab character
 in the buffer is displayed has nothing to do with the definition of
-<kbd>TAB</kbd> as a command.
+&lt;TAB&gt; as a command.
 </p>
 <a name="IDX406"></a>
 <p>  If you set the variable <code>selective-display-ellipses</code> to 
<code>nil</code>,
Index: texi2html/Tests/xemacs_frame_res/xemacs_15.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_15.html:1.26 
texi2html/Tests/xemacs_frame_res/xemacs_15.html:1.27
--- texi2html/Tests/xemacs_frame_res/xemacs_15.html:1.26        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_15.html     Sat Apr  8 23:02:08 2006
@@ -117,7 +117,7 @@
 shows you where the string (as you have typed it so far) is found.
 When you have typed enough characters to identify the place you want, you
 can stop.  Depending on what you do next, you may or may not need to
-terminate the search explicitly with a <kbd>RET</kbd>.
+terminate the search explicitly with a &lt;RET&gt;.
 </p>
 <dl compact="compact">
 <dt> <kbd>C-s</kbd></dt>
@@ -146,26 +146,26 @@
 (On slow terminals, the three dots are not displayed.)
 </p>
 <p>  If you make a mistake in typing the search string, you can erase
-characters with <kbd>DEL</kbd>.  Each <kbd>DEL</kbd> cancels the last 
character of the
+characters with &lt;DEL&gt;.  Each &lt;DEL&gt; cancels the last character of 
the
 search string.  This does not happen until Emacs is ready to read another
 input character; first it must either find, or fail to find, the character
 you want to erase.  If you do not want to wait for this to happen, use
 <kbd>C-g</kbd> as described below.
 </p>
 <p>  When you are satisfied with the place you have reached, you can type
-<kbd>RET</kbd> (or <kbd>C-m</kbd>), which stops searching, leaving the cursor 
where 
+&lt;RET&gt; (or &lt;C-m&gt;), which stops searching, leaving the cursor where 
 the search brought it.  Any command not specially meaningful in searches also
 stops the search and is then executed.  Thus, typing <kbd>C-a</kbd> exits the
-search and then moves to the beginning of the line.  <kbd>RET</kbd> is 
necessary
+search and then moves to the beginning of the line.  &lt;RET&gt; is necessary
 only if the next command you want to type is a printing character,
-<kbd>DEL</kbd>, <kbd>ESC</kbd>, or another control character that is special
+&lt;DEL&gt;, &lt;ESC&gt;, or another control character that is special
 within searches (<kbd>C-q</kbd>, <kbd>C-w</kbd>, <kbd>C-r</kbd>, 
<kbd>C-s</kbd>, or <kbd>C-y</kbd>).
 </p>
 <p>  Sometimes you search for &lsquo;<samp>FOO</samp>&rsquo; and find it, but 
were actually
 looking for a different occurrence of it.  To move to the next occurrence
 of the search string, type another <kbd>C-s</kbd>.  Do this as often as
 necessary.  If you overshoot, you can cancel some <kbd>C-s</kbd>
-characters with <kbd>DEL</kbd>.
+characters with &lt;DEL&gt;.
 </p>
 <p>  After you exit a search, you can search for the same string again by
 typing just <kbd>C-s C-s</kbd>: the first <kbd>C-s</kbd> is the key that 
invokes
@@ -177,7 +177,7 @@
 &lsquo;<samp>FOOT</samp>&rsquo;, and there is no 
&lsquo;<samp>FOOT</samp>&rsquo;, the cursor may be after the
 &lsquo;<samp>FOO</samp>&rsquo; in &lsquo;<samp>FOOL</samp>&rsquo;.  At this 
point there are several things you
 can do.  If you mistyped the search string, correct it.  If you like the
-place you have found, you can type <kbd>RET</kbd> or some other Emacs command
+place you have found, you can type &lt;RET&gt; or some other Emacs command
 to &ldquo;accept what the search offered&rdquo;.  Or you can type 
<kbd>C-g</kbd>, which
 removes from the search string the characters that could not be found
 (the &lsquo;<samp>T</samp>&rsquo; in &lsquo;<samp>FOOT</samp>&rsquo;), leaving 
those that were found (the
@@ -203,8 +203,8 @@
 search is now successful and waiting for more input, so a second <kbd>C-g</kbd>
 cancels the entire search.
 </p>
-<p>  To search for a control character such as <kbd>C-s</kbd> or 
<kbd>DEL</kbd> or
-<kbd>ESC</kbd>, you must quote it by typing <kbd>C-q</kbd> first.  This 
function
+<p>  To search for a control character such as <kbd>C-s</kbd> or &lt;DEL&gt; or
+&lt;ESC&gt;, you must quote it by typing <kbd>C-q</kbd> first.  This function
 of <kbd>C-q</kbd> is analogous to its meaning as an Emacs command: it causes
 the following character to be treated the way a graphic character would
 normally be treated in the same context.
@@ -216,7 +216,7 @@
 this if a search fails because the place you started was too far down in the
 file.  Repeated <kbd>C-r</kbd> keeps looking for more occurrences backwards.
 <kbd>C-s</kbd> starts going forward again.  You can cancel <kbd>C-r</kbd> in a
-search with <kbd>DEL</kbd>.
+search with &lt;DEL&gt;.
 </p>
 <p>  The characters <kbd>C-y</kbd> and <kbd>C-w</kbd> can be used in 
incremental search
 to grab text from the buffer into the search string.  This makes it
@@ -231,10 +231,10 @@
 list of the last 16 things you have searched for is retained, and 
 <kbd>M-p</kbd> and <kbd>M-n</kbd> let you cycle through that ring.
 </p>
-<p>The character <kbd>M-<kbd>TAB</kbd></kbd> does completion on the elements 
in 
+<p>The character <kbd>M-&lt;TAB&gt;</kbd> does completion on the elements in 
 the search history ring.  For example, if you know that you have
 recently searched for the string <code>POTATOE</code>, you could type
-<kbd>C-s P O M-<kbd>TAB</kbd></kbd>.  If you had searched for other strings
+<kbd>C-s P O M-&lt;TAB&gt;</kbd>.  If you had searched for other strings
 beginning with <code>PO</code> then you would be shown a list of them, and
 would need to type more to select one. 
 </p>
@@ -306,7 +306,7 @@
 <dd><p>Recall the next element in the isearch history ring 
 (<code>isearch-ring-advance</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>M-&lt;TAB&gt;</kbd></dt>
 <dd><p>Do completion on the elements in the isearch history ring 
 (<code>isearch-complete</code>).
 </p>
@@ -384,34 +384,34 @@
 you type the entire search string before searching begins.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-s <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-s &lt;RET&gt; <var>string</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search for <var>string</var>.
 </p></dd>
-<dt> <kbd>C-r <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-r &lt;RET&gt; <var>string</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search backward for <var>string</var>.
 </p></dd>
 </dl>
 
-<p>  To do a non-incremental search, first type <kbd>C-s <kbd>RET</kbd></kbd>
+<p>  To do a non-incremental search, first type <kbd>C-s &lt;RET&gt;</kbd>
 (or <kbd>C-s C-m</kbd>).  This enters the minibuffer to read the search string.
-Terminate the string with <kbd>RET</kbd> to start the search.  If the string
+Terminate the string with &lt;RET&gt; to start the search.  If the string
 is not found, the search command gets an error.
 </p>
 <p> By default, <kbd>C-s</kbd> invokes incremental search, but if you give it 
an
 empty argument, which would otherwise be useless, it invokes non-incremental
-search.  Therefore, <kbd>C-s <kbd>RET</kbd></kbd> invokes non-incremental 
search. 
-<kbd>C-r <kbd>RET</kbd></kbd> also works this way.
+search.  Therefore, <kbd>C-s &lt;RET&gt;</kbd> invokes non-incremental search. 
+<kbd>C-r &lt;RET&gt;</kbd> also works this way.
 </p>
 <a name="IDX436"></a>
 <a name="IDX437"></a>
 <p>  Forward and backward non-incremental searches are implemented by the
 commands <code>search-forward</code> and <code>search-backward</code>.  You 
can bind
 these commands to keys.  The reason that incremental
-search is programmed to invoke them as well is that <kbd>C-s 
<kbd>RET</kbd></kbd>
+search is programmed to invoke them as well is that <kbd>C-s &lt;RET&gt;</kbd>
 is the traditional sequence of characters used in Emacs to invoke
 non-incremental search.
 </p>
-<p> Non-incremental searches performed using <kbd>C-s <kbd>RET</kbd></kbd> do
+<p> Non-incremental searches performed using <kbd>C-s &lt;RET&gt;</kbd> do
 not call <code>search-forward</code> right away.  They first check
 if the next character is <kbd>C-w</kbd>, which requests a word search.
 See section <a href="#SEC119">Word Search</a>.
@@ -448,28 +448,28 @@
 to search  without having to know the line breaks.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-s <kbd>RET</kbd> C-w <var>words</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-s &lt;RET&gt; C-w <var>words</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search for <var>words</var>, ignoring differences in punctuation.
 </p></dd>
-<dt> <kbd>C-r <kbd>RET</kbd> C-w <var>words</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-r &lt;RET&gt; C-w <var>words</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search backward for <var>words</var>, ignoring differences in 
punctuation.
 </p></dd>
 </dl>
 
 <p>  Word search is a special case of non-incremental search.  It is invoked
-with <kbd>C-s <kbd>RET</kbd> C-w</kbd> followed by the search string, which
-must always be terminated with another <kbd>RET</kbd>.  Being non-incremental, 
this
+with <kbd>C-s &lt;RET&gt; C-w</kbd> followed by the search string, which
+must always be terminated with another &lt;RET&gt;.  Being non-incremental, 
this
 search does not start until the argument is terminated.  It works by
 constructing a regular expression and searching for that.  See section <a 
href="#SEC120">Regular Expression Search</a>.
 </p>
-<p> You can do a backward word search with <kbd>C-r <kbd>RET</kbd> C-w</kbd>.
+<p> You can do a backward word search with <kbd>C-r &lt;RET&gt; C-w</kbd>.
 </p>
 <a name="IDX438"></a>
 <a name="IDX439"></a>
 <p>  Forward and backward word searches are implemented by the commands
 <code>word-search-forward</code> and <code>word-search-backward</code>.  You 
can
 bind these commands to keys.  The reason that incremental
-search is programmed to invoke them as well is that <kbd>C-s <kbd>RET</kbd> 
C-w</kbd>
+search is programmed to invoke them as well is that <kbd>C-s &lt;RET&gt; 
C-w</kbd>
 is the traditional Emacs sequence of keys for word search.
 </p>
 <hr size="6">
@@ -540,8 +540,8 @@
 <code>re-search-forward</code> and <code>re-search-backward</code>.  You can 
invoke
 them with <kbd>M-x</kbd> or bind them to keys.  You can also call
 <code>re-search-forward</code> by way of incremental regexp search with
-<kbd>M-C-s <kbd>RET</kbd></kbd>; similarly for <code>re-search-backward</code> 
with
-<kbd>M-C-r <kbd>RET</kbd></kbd>.
+<kbd>M-C-s &lt;RET&gt;</kbd>; similarly for <code>re-search-backward</code> 
with
+<kbd>M-C-r &lt;RET&gt;</kbd>.
 </p>
 <hr size="6">
 <a name="Regexps"></a>
@@ -1062,10 +1062,10 @@
 <h3 class="subsection"> 12.7.1 Unconditional Replacement </h3>
 
 <dl compact="compact">
-<dt> <kbd>M-x replace-string <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd> 
<var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x replace-string &lt;RET&gt; <var>string</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace every occurrence of <var>string</var> with <var>newstring</var>.
 </p></dd>
-<dt> <kbd>M-x replace-regexp <kbd>RET</kbd> <var>regexp</var> <kbd>RET</kbd> 
<var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x replace-regexp &lt;RET&gt; <var>regexp</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace every match for <var>regexp</var> with <var>newstring</var>.
 </p></dd>
 </dl>
@@ -1080,7 +1080,7 @@
 </p>
 <p>  When <code>replace-string</code> exits, point is left at the last 
occurrence
 replaced.  The value of point when the <code>replace-string</code> command was
-issued is remembered on the mark ring; <kbd>C-u C-<kbd>SPC</kbd></kbd> moves 
back
+issued is remembered on the mark ring; <kbd>C-u C-&lt;SPC&gt;</kbd> moves back
 there.
 </p>
 <p>  A numeric argument restricts replacement to matches that are surrounded
@@ -1118,13 +1118,13 @@
 whatever matched the <var>d</var>'th parenthesized grouping in 
<var>regexp</var>.
 For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
<kbd>RET</kbd> c[ad]+r <kbd>RET</kbd> \&amp;-safe <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
&lt;RET&gt; c[ad]+r &lt;RET&gt; \&amp;-safe &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>would replace (for example) &lsquo;<samp>cadr</samp>&rsquo; with 
&lsquo;<samp>cadr-safe</samp>&rsquo; and &lsquo;<samp>cddr</samp>&rsquo;
 with &lsquo;<samp>cddr-safe</samp>&rsquo;.
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
<kbd>RET</kbd> \(c[ad]+r\)-safe <kbd>RET</kbd> \1 <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
&lt;RET&gt; \(c[ad]+r\)-safe &lt;RET&gt; \1 &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>would perform exactly the opposite replacements.  To include a 
&lsquo;<samp>\</samp>&rsquo;
@@ -1154,7 +1154,7 @@
 <p>  If the arguments to a replace command are in lower case, the command
 preserves case when it makes a replacement.  Thus, the following command:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-string 
<kbd>RET</kbd> foo <kbd>RET</kbd> bar <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-string 
&lt;RET&gt; foo &lt;RET&gt; bar &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>replaces a lower-case &lsquo;<samp>foo</samp>&rsquo; with a lower case 
&lsquo;<samp>bar</samp>&rsquo;, &lsquo;<samp>FOO</samp>&rsquo;
@@ -1190,11 +1190,11 @@
 <h3 class="subsection"> 12.7.4 Query Replace </h3>
 
 <dl compact="compact">
-<dt> <kbd>M-% <var>string</var> <kbd>RET</kbd> <var>newstring</var> 
<kbd>RET</kbd></kbd></dt>
-<dt> <kbd>M-x query-replace <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd> 
<var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-% <var>string</var> &lt;RET&gt; <var>newstring</var> 
&lt;RET&gt;</kbd></dt>
+<dt> <kbd>M-x query-replace &lt;RET&gt; <var>string</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace some occurrences of <var>string</var> with <var>newstring</var>.
 </p></dd>
-<dt> <kbd>M-x query-replace-regexp <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd> <var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x query-replace-regexp &lt;RET&gt; <var>regexp</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace some matches for <var>regexp</var> with <var>newstring</var>.
 </p></dd>
 </dl>
@@ -1228,27 +1228,27 @@
 <a name="IDX492"></a>
 
 <dl compact="compact">
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>to replace the occurrence with <var>newstring</var>.  This preserves 
case, just
 like <code>replace-string</code>, provided <code>case-replace</code> is 
non-<code>nil</code>,
 as it normally is.
 </p>
 </dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>to skip to the next occurrence without replacing this one.
 </p>
 </dd>
 <dt> <kbd>, <span class="roman">(Comma)</span></kbd></dt>
 <dd><p>to replace this occurrence and display the result.  You are then
 prompted for another input character.  However, since the replacement has
-already been made, <kbd>DEL</kbd> and <kbd>SPC</kbd> are equivalent.  At this
+already been made, &lt;DEL&gt; and &lt;SPC&gt; are equivalent.  At this
 point, you can type <kbd>C-r</kbd> (see below) to alter the replaced text.  To
 undo the replacement, you can type <kbd>C-x u</kbd>. 
 This exits the <code>query-replace</code>.  If you want to do further
-replacement you must use <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> to 
restart (see section <a href="xemacs_9.html#SEC69">Repeating Minibuffer 
Commands</a>).
+replacement you must use <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> to restart 
(see section <a href="xemacs_9.html#SEC69">Repeating Minibuffer Commands</a>).
 </p>
 </dd>
-<dt> <kbd><kbd>ESC</kbd></kbd></dt>
+<dt> <kbd>&lt;ESC&gt;</kbd></dt>
 <dd><p>to exit without doing any more replacements.
 </p>
 </dd>
@@ -1294,7 +1294,7 @@
 
 <p>  If you type any other character, Emacs exits the 
<code>query-replace</code>, and
 executes the character as a command.  To restart the 
<code>query-replace</code>,
-use <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd>, which repeats the 
<code>query-replace</code> because it
+use <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd>, which repeats the 
<code>query-replace</code> because it
 used the minibuffer to read its arguments.  See section <a 
href="xemacs_9.html#SEC69">C-x ESC ESC</a>.
 </p>
 <hr size="6">
Index: texi2html/Tests/xemacs_frame_res/xemacs_16.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_16.html:1.20 
texi2html/Tests/xemacs_frame_res/xemacs_16.html:1.21
--- texi2html/Tests/xemacs_frame_res/xemacs_16.html:1.20        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_16.html     Sat Apr  8 23:02:08 2006
@@ -98,20 +98,20 @@
 <h2 class="section"> 13.1 Killing Your Mistakes </h2>
 
 <dl compact="compact">
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Delete last character (<code>delete-backward-char</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill last word (<code>backward-kill-word</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd></dt>
 <dd><p>Kill to beginning of sentence (<code>backward-kill-sentence</code>).
 </p></dd>
 </dl>
 
 <a name="IDX499"></a>
 <a name="IDX500"></a>
-<p>  The <kbd>DEL</kbd> character (<code>delete-backward-char</code>) is the 
most
+<p>  The &lt;DEL&gt; character (<code>delete-backward-char</code>) is the most
 important correction command.  When used among graphic (self-inserting)
 characters, it can be thought of as canceling the last character typed.
 </p>
@@ -120,18 +120,18 @@
 <a name="IDX503"></a>
 <a name="IDX504"></a>
 <p>  When your mistake is longer than a couple of characters, it might be more
-convenient to use <kbd>M-<kbd>DEL</kbd></kbd> or <kbd>C-x <kbd>DEL</kbd></kbd>.
-<kbd>M-<kbd>DEL</kbd></kbd> kills back to the start of the last word, and 
<kbd>C-x
-<kbd>DEL</kbd></kbd> kills back to the start of the last sentence.  <kbd>C-x
-<kbd>DEL</kbd></kbd> is particularly useful when you are thinking of what to 
write as
+convenient to use <kbd>M-&lt;DEL&gt;</kbd> or <kbd>C-x &lt;DEL&gt;</kbd>.
+<kbd>M-&lt;DEL&gt;</kbd> kills back to the start of the last word, and <kbd>C-x
+&lt;DEL&gt;</kbd> kills back to the start of the last sentence.  <kbd>C-x
+&lt;DEL&gt;</kbd> is particularly useful when you are thinking of what to 
write as
 you type it, in case you change your mind about phrasing.
-<kbd>M-<kbd>DEL</kbd></kbd> and <kbd>C-x <kbd>DEL</kbd></kbd> save the killed 
text for
+<kbd>M-&lt;DEL&gt;</kbd> and <kbd>C-x &lt;DEL&gt;</kbd> save the killed text 
for
 <kbd>C-y</kbd> and <kbd>M-y</kbd> to retrieve.  See section <a 
href="xemacs_12.html#SEC91">Yanking</a>.
 </p>
-<p>  <kbd>M-<kbd>DEL</kbd></kbd> is often useful even when you have typed only 
a few
+<p>  <kbd>M-&lt;DEL&gt;</kbd> is often useful even when you have typed only a 
few
 characters wrong, if you know you are confused in your typing and aren't
 sure exactly what you typed.  At such a time, you cannot correct with
-<kbd>DEL</kbd> except by looking at the screen to see what you did.  It 
requires
+&lt;DEL&gt; except by looking at the screen to see what you did.  It requires
 less thought to kill the whole word and start over.
 </p>
 <hr size="6">
Index: texi2html/Tests/xemacs_frame_res/xemacs_17.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_17.html:1.23 
texi2html/Tests/xemacs_frame_res/xemacs_17.html:1.24
--- texi2html/Tests/xemacs_frame_res/xemacs_17.html:1.23        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_17.html     Sat Apr  8 23:02:08 2006
@@ -136,7 +136,7 @@
 specify long file names.  See section <a 
href="xemacs_9.html#SEC63">Completion</a>.
 </p>
 <p>  There is always a <em>default file name</em> which is used if you
-enter an empty argument by typing just <kbd>RET</kbd>.  Normally the default
+enter an empty argument by typing just &lt;RET&gt;.  Normally the default
 file name is the name of the file visited in the current buffer; this
 makes it easy to operate on that file with any of the Emacs file
 commands.
@@ -187,7 +187,7 @@
 displayed in the minibuffer when the function is called; you can delete
 the old directory name and supply a new directory name. For example, if
 the current directory is &lsquo;<tt>/u/rms/gnu</tt>&rsquo;, you can delete 
&lsquo;<tt>gnu</tt>&rsquo;
-and type &lsquo;<tt>oryx</tt>&rsquo; and <kbd>RET</kbd> to create 
&lsquo;<tt>/u/rms/oryx</tt>&rsquo;.
+and type &lsquo;<tt>oryx</tt>&rsquo; and &lt;RET&gt; to create 
&lsquo;<tt>/u/rms/oryx</tt>&rsquo;.
 Removing a directory is similar to creating one.  To remove a directory,
 use <code>remove-directory</code>; it takes one argument, a file name string.
 </p>
@@ -300,7 +300,7 @@
 <a name="IDX542"></a>
 <p>  To visit a file, use the command <kbd>C-x C-f</kbd> 
(<code>find-file</code>).  Follow
 the command with the name of the file you wish to visit, terminated by a
-<kbd>RET</kbd>.  If you are using XEmacs under X, you can also use the
+&lt;RET&gt;.  If you are using XEmacs under X, you can also use the
 <b>Open...</b> command from the <b>File</b> menu bar item. 
 </p>
 <p>  The file name is read using the minibuffer (see section <a 
href="xemacs_9.html#SEC60">The Minibuffer</a>), with
@@ -1083,14 +1083,14 @@
 <h3 class="subsection"> 14.5.3 Recovering Data from Auto-Saves </h3>
 
 <p>  If you want to use the contents of an auto-save file to recover from a
-loss of data, use the command <kbd>M-x recover-file <kbd>RET</kbd> 
<var>file</var>
-<kbd>RET</kbd></kbd>.  Emacs visits <var>file</var> and then (after your 
confirmation)
+loss of data, use the command <kbd>M-x recover-file &lt;RET&gt; <var>file</var>
+&lt;RET&gt;</kbd>.  Emacs visits <var>file</var> and then (after your 
confirmation)
 restores the contents from the auto-save file 
&lsquo;<tt>#<var>file</var>#</tt>&rsquo;.  You
 can then save the file with <kbd>C-x C-s</kbd> to put the recovered text into
 <var>file</var> itself.  For example, to recover file 
&lsquo;<tt>foo.c</tt>&rsquo; from its
 auto-save file &lsquo;<tt>#foo.c#</tt>&rsquo;, do:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x recover-file 
<kbd>RET</kbd> foo.c <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x recover-file 
&lt;RET&gt; foo.c &lt;RET&gt;
 C-x C-s
 </pre></td></tr></table>
 
@@ -1617,7 +1617,7 @@
 <h3 class="subsection"> 14.6.6 Examining And Comparing Old Versions </h3>
 
 <dl compact="compact">
-<dt> <kbd>C-x v ~ <var>version</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x v ~ <var>version</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Examine version <var>version</var> of the visited file, in a buffer of 
its
 own (<code>vc-version-other-window</code>).
 </p>
@@ -1627,7 +1627,7 @@
 of the file.
 </p>
 </dd>
-<dt> <kbd>C-u C-x v = <var>file</var> <kbd>RET</kbd> <var>oldvers</var> 
<kbd>RET</kbd> <var>newvers</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-u C-x v = <var>file</var> &lt;RET&gt; <var>oldvers</var> 
&lt;RET&gt; <var>newvers</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Compare the specified two versions of <var>file</var>.
 </p></dd>
 </dl>
@@ -1635,7 +1635,7 @@
 <a name="IDX607"></a>
 <a name="IDX608"></a>
 <p>  You can examine any version of a file by first visiting it, and then
-using <kbd>C-x v ~ <var>version</var> <kbd>RET</kbd></kbd>
+using <kbd>C-x v ~ <var>version</var> &lt;RET&gt;</kbd>
 (<code>vc-version-other-window</code>).  This puts the text of version
 <var>version</var> in a file named 
&lsquo;<tt><var>filename</var>.~<var>version</var>~</tt>&rsquo;,
 then visits it in a separate window.
@@ -1811,7 +1811,7 @@
 <dd><a name="IDX613"></a>
 <a name="IDX614"></a>
 </dd>
-<dt> <code>C-x v s <var>name</var> <kbd>RET</kbd></code></dt>
+<dt> <code>C-x v s <var>name</var> &lt;RET&gt;</code></dt>
 <dd><p>Define the last saved versions of every registered file in or under the
 current directory as a snapshot named <var>name</var>
 (<code>vc-create-snapshot</code>).
@@ -1819,7 +1819,7 @@
 <a name="IDX615"></a>
 <a name="IDX616"></a>
 </dd>
-<dt> <code>C-x v r <var>name</var> <kbd>RET</kbd></code></dt>
+<dt> <code>C-x v r <var>name</var> &lt;RET&gt;</code></dt>
 <dd><p>Check out all registered files at or below the current directory level
 using whatever versions correspond to the snapshot <var>name</var>
 (<code>vc-retrieve-snapshot</code>).
@@ -2023,13 +2023,13 @@
 file name which is either a  directory to be listed or pattern
 containing wildcards for the files to be listed.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/etc 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/etc 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>lists all the files in directory &lsquo;<tt>/u2/emacs/etc</tt>&rsquo;.  An 
example of
 specifying a file name pattern is:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/src/*.c 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/src/*.c 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>  Normally, <kbd>C-x C-d</kbd> prints a brief directory listing containing 
just
@@ -2086,8 +2086,8 @@
 you can use <kbd>C-x `</kbd> to visit successive changed locations in the two
 source files.  You can also move to a particular hunk of changes and
 type <kbd>C-c C-c</kbd> to find the corresponding source location.  You can
-also use the other special commands of Compilation mode: <kbd>SPC</kbd> and
-<kbd>DEL</kbd> for scrolling, and <kbd>M-p</kbd> and <kbd>M-n</kbd> for cursor 
motion.
+also use the other special commands of Compilation mode: &lt;SPC&gt; and
+&lt;DEL&gt; for scrolling, and <kbd>M-p</kbd> and <kbd>M-n</kbd> for cursor 
motion.
 See section <a href="xemacs_25.html#SEC252">Running &ldquo;make&rdquo;, or 
Compilers Generally</a>.
 </p>
 <a name="IDX626"></a>
@@ -2224,9 +2224,9 @@
 the cursor at the beginning of the filename on the line, rather than
 at the beginning of the line.
 </p>
-<p>  For extra convenience, <kbd>SPC</kbd> and <kbd>n</kbd> in Dired are 
equivalent to
+<p>  For extra convenience, &lt;SPC&gt; and <kbd>n</kbd> in Dired are 
equivalent to
 <kbd>C-n</kbd>.  <kbd>p</kbd> is equivalent to <kbd>C-p</kbd>.  Moving by 
lines is done so
-often in Dired that it deserves to be easy to type.  <kbd>DEL</kbd> (move up 
and
+often in Dired that it deserves to be easy to type.  &lt;DEL&gt; (move up and
 unflag) is often useful simply for moving up.
 </p>
 <p>  The <kbd>g</kbd> command in Dired runs <code>revert-buffer</code> to 
reinitialize
@@ -2265,7 +2265,7 @@
 <dt> <kbd>u</kbd></dt>
 <dd><p>Remove deletion-flag on this line.
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Remove deletion-flag on previous line, moving point to that line.
 </p></dd>
 <dt> <kbd>x</kbd></dt>
@@ -2293,8 +2293,8 @@
 <p>  The files are flagged for deletion rather than deleted immediately to
 avoid the danger of deleting a file accidentally.  Until you direct Dired
 to delete the flagged files, you can remove deletion flags using the
-commands <kbd>u</kbd> and <kbd>DEL</kbd>.  <kbd>u</kbd> works just like 
<kbd>d</kbd>, but
-removes flags rather than making flags.  <kbd>DEL</kbd> moves upward, removing
+commands <kbd>u</kbd> and &lt;DEL&gt;.  <kbd>u</kbd> works just like 
<kbd>d</kbd>, but
+removes flags rather than making flags.  &lt;DEL&gt; moves upward, removing
 flags; it is like <kbd>u</kbd> with numeric argument automatically negated.
 </p>
 <p>  To delete the flagged files, type <kbd>x</kbd>.  This command first 
displays a
@@ -2455,8 +2455,8 @@
 <p>  <kbd>M-x view-file</kbd> allows you to scan or read a file by sequential
 screenfuls.  It reads a file name argument using the minibuffer.  After
 reading the file into an Emacs buffer, <code>view-file</code> reads and 
displays
-one windowful.  You can then type <kbd>SPC</kbd> to scroll forward one window,
-or <kbd>DEL</kbd> to scroll backward.  Various other commands are provided for
+one windowful.  You can then type &lt;SPC&gt; to scroll forward one window,
+or &lt;DEL&gt; to scroll backward.  Various other commands are provided for
 moving around in the file, but none for changing it; type <kbd>C-h</kbd> while
 viewing a file for a list of them.  Most commands are the default Emacs
 cursor motion commands.  To exit from viewing, type <kbd>C-c</kbd>.
Index: texi2html/Tests/xemacs_frame_res/xemacs_18.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_18.html:1.20 
texi2html/Tests/xemacs_frame_res/xemacs_18.html:1.21
--- texi2html/Tests/xemacs_frame_res/xemacs_18.html:1.20        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_18.html     Sat Apr  8 23:02:08 2006
@@ -130,10 +130,10 @@
 <h2 class="section"> 15.1 Creating and Selecting Buffers </h2>
 
 <dl compact="compact">
-<dt> <kbd>C-x b <var>buffer</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x b <var>buffer</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select or create a buffer named <var>buffer</var> 
(<code>switch-to-buffer</code>).
 </p></dd>
-<dt> <kbd>C-x 4 b <var>buffer</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 b <var>buffer</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Similar, but select a buffer named <var>buffer</var> in another window
 (<code>switch-to-buffer-other-window</code>).
 </p></dd>
@@ -149,7 +149,7 @@
 <a name="IDX650"></a>
 <a name="IDX651"></a>
 <p>  To select a buffer named <var>bufname</var>, type <kbd>C-x b 
<var>bufname</var>
-<kbd>RET</kbd></kbd>.  This is the command <code>switch-to-buffer</code> with 
argument
+&lt;RET&gt;</kbd>.  This is the command <code>switch-to-buffer</code> with 
argument
 <var>bufname</var>.  You can use completion on an abbreviation for the buffer
 name you want (see section <a href="xemacs_9.html#SEC63">Completion</a>).  An 
empty argument to <kbd>C-x b</kbd>
 specifies the most recently selected buffer that is not displayed in any
@@ -157,7 +157,7 @@
 </p>
 <p>  Most buffers are created when you visit files, or use Emacs commands
 that display text.  You can also create a buffer explicitly by typing
-<kbd>C-x b <var>bufname</var> <kbd>RET</kbd></kbd>, which creates a new, empty 
buffer
+<kbd>C-x b <var>bufname</var> &lt;RET&gt;</kbd>, which creates a new, empty 
buffer
 that is not visiting any file, and selects it for editing.  The new
 buffer's major mode is determined by the value of
 <code>default-major-mode</code> (see section <a 
href="xemacs_21.html#SEC190">Major Modes</a>).  Buffers not visiting
@@ -339,7 +339,7 @@
 <a name="IDX663"></a>
  
 <p>  <kbd>C-x k</kbd> (<code>kill-buffer</code>) kills one buffer, whose name 
you
-specify in the minibuffer.  If you type just <kbd>RET</kbd> in the
+specify in the minibuffer.  If you type just &lt;RET&gt; in the
 minibuffer, the default, killing the current buffer, is used.  If the
 current buffer is killed, the buffer that has been selected recently but
 does not appear in any window now is selected.  If the buffer being
@@ -421,7 +421,7 @@
 <dt> <kbd>u</kbd></dt>
 <dd><p>Remove any request made for the current line, and move down.
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Move to previous line and remove any request made for that line.
 </p></dd>
 </dl>
Index: texi2html/Tests/xemacs_frame_res/xemacs_19.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_19.html:1.19 
texi2html/Tests/xemacs_frame_res/xemacs_19.html:1.20
--- texi2html/Tests/xemacs_frame_res/xemacs_19.html:1.19        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_19.html     Sat Apr  8 23:02:08 2006
@@ -319,15 +319,15 @@
 <a name="IDX682"></a>
 <a name="IDX683"></a>
 <dl compact="compact">
-<dt> <kbd>C-x 4 b <var>bufname</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 b <var>bufname</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select buffer <var>bufname</var> in another window.  This runs
 <code>switch-to-buffer-other-window</code>.
 </p></dd>
-<dt> <kbd>C-x 4 f <var>filename</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 f <var>filename</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Visit file <var>filename</var> and select its buffer in another window. 
 This
 runs <code>find-file-other-window</code>.  See section <a 
href="xemacs_17.html#SEC136">Visiting Files</a>.
 </p></dd>
-<dt> <kbd>C-x 4 d <var>directory</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 d <var>directory</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select a Dired buffer for directory <var>directory</var> in another 
window.
 This runs <code>dired-other-window</code>.  See section <a 
href="xemacs_17.html#SEC163">Dired, the Directory Editor</a>.
 </p></dd>
Index: texi2html/Tests/xemacs_frame_res/xemacs_20.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_20.html:1.25 
texi2html/Tests/xemacs_frame_res/xemacs_20.html:1.26
--- texi2html/Tests/xemacs_frame_res/xemacs_20.html:1.25        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_20.html     Sat Apr  8 23:02:08 2006
@@ -177,7 +177,7 @@
 language, to make it convenient to type them.
 </p>
 <a name="IDX700"></a>
-<p>  The prefix key <kbd>C-x <kbd>RET</kbd></kbd> is used for commands that 
pertain
+<p>  The prefix key <kbd>C-x &lt;RET&gt;</kbd> is used for commands that 
pertain
 to world scripts, coding systems, and input methods.
 </p>
 
@@ -237,7 +237,7 @@
 <a name="IDX703"></a>
 <p>  To display information about the effects of a certain language
 environment <var>lang-env</var>, use the command <kbd>C-h L <var>lang-env</var>
-<kbd>RET</kbd></kbd> (<code>describe-language-environment</code>).  This tells 
you which
+&lt;RET&gt;</kbd> (<code>describe-language-environment</code>).  This tells 
you which
 languages this language environment is useful for, and lists the
 character sets, coding systems, and input methods that go with it.  It
 also shows some sample text to illustrate scripts used in this language
@@ -294,7 +294,7 @@
 corresponds to many different Chinese characters, you must select one of
 the alternatives using special XEmacs commands.  Keys such as <kbd>C-f</kbd>,
 <kbd>C-b</kbd>, <kbd>C-n</kbd>, <kbd>C-p</kbd>, and digits have special 
definitions in
-this situation, used for selecting among the alternatives.  <kbd>TAB</kbd>
+this situation, used for selecting among the alternatives.  &lt;TAB&gt;
 displays a buffer showing all the possibilities.
 </p>
 <p>   In Japanese input methods, first you input a whole word using
@@ -314,7 +314,7 @@
 entering the separate letter and accent.  For example, <kbd>e ' '</kbd> gives
 you the two characters &lsquo;<samp>e'</samp>&rsquo;.  Another way is to type 
another letter
 after the <kbd>e</kbd>&mdash;something that won't combine with that&mdash;and
-immediately delete it.  For example, you could type <kbd>e e <kbd>DEL</kbd>
+immediately delete it.  For example, you could type <kbd>e e &lt;DEL&gt;
 '</kbd> to get separate &lsquo;<samp>e</samp>&rsquo; and 
&lsquo;<samp>'</samp>&rsquo;.
 </p>
 <p>  Another method, more general but not quite as easy to type, is to use
@@ -362,12 +362,12 @@
 <dd><p>Enable or disable use of the selected input method.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> C-\ <var>method</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; C-\ <var>method</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select a new input method for the current buffer.
 </p>
 </dd>
-<dt> <kbd>C-h I <var>method</var> <kbd>RET</kbd></kbd></dt>
-<dt> <kbd>C-h C-\ <var>method</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h I <var>method</var> &lt;RET&gt;</kbd></dt>
+<dt> <kbd>C-h C-\ <var>method</var> &lt;RET&gt;</kbd></dt>
 <dd><a name="IDX706"></a>
 <a name="IDX707"></a>
 <a name="IDX708"></a>
@@ -384,7 +384,7 @@
 <a name="IDX710"></a>
 <a name="IDX711"></a>
 <p>  To choose an input method for the current buffer, use <kbd>C-x
-<kbd>RET</kbd> C-\</kbd> (<code>select-input-method</code>).  This command 
reads the
+&lt;RET&gt; C-\</kbd> (<code>select-input-method</code>).  This command reads 
the
 input method name with the minibuffer; the name normally starts with the
 language environment that it is meant to be used with.  The variable
 <code>current-input-method</code> records which input method is selected.
@@ -399,7 +399,7 @@
 </p>
 <p>  If you type <kbd>C-\</kbd> and you have not yet selected an input method,
 it prompts for you to specify one.  This has the same effect as using
-<kbd>C-x <kbd>RET</kbd> C-\</kbd> to specify an input method.
+<kbd>C-x &lt;RET&gt; C-\</kbd> to specify an input method.
 </p>
 <a name="IDX714"></a>
 <p>  Selecting a language environment specifies a default input method for
@@ -537,11 +537,11 @@
 newline, carriage-return linefeed, and just carriage-return.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-h C <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Describe coding system <var>coding</var>.
 </p>
 </dd>
-<dt> <kbd>C-h C <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C &lt;RET&gt;</kbd></dt>
 <dd><p>Describe the coding systems currently in use.
 </p>
 </dd>
@@ -740,26 +740,26 @@
 system, you can use these commands to specify one:
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x <kbd>RET</kbd> f <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; f <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for the visited file
 in the current buffer.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> c <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; c <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Specify coding system <var>coding</var> for the immediately following
 command.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> k <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; k <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for keyboard input.  (This feature 
is
 non-functional and is temporarily disabled.)
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> t <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; t <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for terminal output.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> p <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; p <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for subprocess input and output
 in the current buffer.
 </p></dd>
@@ -777,7 +777,7 @@
 <a name="IDX726"></a>
 <a name="IDX727"></a>
 <p>  Another way to specify the coding system for a file is when you visit
-the file.  First use the command <kbd>C-x <kbd>RET</kbd> c</kbd>
+the file.  First use the command <kbd>C-x &lt;RET&gt; c</kbd>
 (<code>universal-coding-system-argument</code>); this command uses the
 minibuffer to read a coding system name.  After you exit the minibuffer,
 the specified coding system is used for <em>the immediately following
@@ -809,7 +809,7 @@
 </p>
 <a name="IDX729"></a>
 <a name="IDX730"></a>
-<p>  The command <kbd>C-x <kbd>RET</kbd> t</kbd> 
(<code>set-terminal-coding-system</code>)
+<p>  The command <kbd>C-x &lt;RET&gt; t</kbd> 
(<code>set-terminal-coding-system</code>)
 specifies the coding system for terminal output.  If you specify a
 character code for terminal output, all characters output to the
 terminal are translated into that coding system.
@@ -822,7 +822,7 @@
 </p>
 <a name="IDX731"></a>
 <a name="IDX732"></a>
-<p>  The command <kbd>C-x <kbd>RET</kbd> k</kbd> 
(<code>set-keyboard-coding-system</code>)
+<p>  The command <kbd>C-x &lt;RET&gt; k</kbd> 
(<code>set-keyboard-coding-system</code>)
 specifies the coding system for keyboard input.  Character-code
 translation of keyboard input is useful for terminals with keys that
 send non-ASCII graphic characters&mdash;for example, some terminals designed
@@ -842,7 +842,7 @@
 </p>
 <a name="IDX733"></a>
 <a name="IDX734"></a>
-<p>  The command <kbd>C-x <kbd>RET</kbd> p</kbd> 
(<code>set-buffer-process-coding-system</code>)
+<p>  The command <kbd>C-x &lt;RET&gt; p</kbd> 
(<code>set-buffer-process-coding-system</code>)
 specifies the coding system for input and output to a subprocess.  This
 command applies to the current buffer; normally, each subprocess has its
 own buffer, and thus you can use this command to specify translation to
Index: texi2html/Tests/xemacs_frame_res/xemacs_21.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_21.html:1.17 
texi2html/Tests/xemacs_frame_res/xemacs_21.html:1.18
--- texi2html/Tests/xemacs_frame_res/xemacs_21.html:1.17        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_21.html     Sat Apr  8 23:02:08 2006
@@ -75,8 +75,8 @@
 mode or Text mode.
 </p>
 <p>  Selecting a major mode changes the meanings of a few keys to become
-more specifically adapted to the language being edited.  <kbd>TAB</kbd>,
-<kbd>DEL</kbd>, and <kbd>LFD</kbd> are changed frequently.  In addition, 
commands
+more specifically adapted to the language being edited.  &lt;TAB&gt;,
+&lt;DEL&gt;, and &lt;LFD&gt; are changed frequently.  In addition, commands
 which handle comments use the mode to determine how to delimit comments.
 Many major modes redefine the syntactical properties of characters
 appearing in the buffer.  See section <a href="xemacs_30.html#SEC374">The 
Syntax Table</a>.
@@ -94,7 +94,7 @@
 <p>  Most programming language major modes specify that only blank lines
 separate paragraphs.  This is so that the paragraph commands remain useful.
 See section <a href="xemacs_23.html#SEC208">Paragraphs</a>.  They also cause 
Auto Fill mode to use the definition of
-<kbd>TAB</kbd> to indent the new lines it creates.  This is because most lines
+&lt;TAB&gt; to indent the new lines it creates.  This is because most lines
 in a program are usually indented.  See section <a 
href="xemacs_22.html#SEC192">Indentation</a>.
 </p>
 <table class="menu" border="0" cellspacing="0">
Index: texi2html/Tests/xemacs_frame_res/xemacs_22.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_22.html:1.21 
texi2html/Tests/xemacs_frame_res/xemacs_22.html:1.22
--- texi2html/Tests/xemacs_frame_res/xemacs_22.html:1.21        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_22.html     Sat Apr  8 23:02:08 2006
@@ -62,15 +62,15 @@
 <h1 class="chapter"> 19. Indentation </h1>
 
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Indent current line &ldquo;appropriately&rdquo; in a mode-dependent 
fashion.
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
-<dd><p>Perform <kbd>RET</kbd> followed by <kbd>TAB</kbd> 
(<code>newline-and-indent</code>).
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
+<dd><p>Perform &lt;RET&gt; followed by &lt;TAB&gt; 
(<code>newline-and-indent</code>).
 </p></dd>
 <dt> <kbd>M-^</kbd></dt>
 <dd><p>Merge two lines (<code>delete-indentation</code>).  This would cancel 
out
-the effect of <kbd>LFD</kbd>.
+the effect of &lt;LFD&gt;.
 </p></dd>
 <dt> <kbd>C-M-o</kbd></dt>
 <dd><p>Split line at point; text on the line after point becomes a new line
@@ -83,7 +83,7 @@
 <dt> <kbd>C-M-\</kbd></dt>
 <dd><p>Indent several lines to same column (<code>indent-region</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;TAB&gt;</kbd></dt>
 <dd><p>Shift block of lines rigidly right or left 
(<code>indent-rigidly</code>).
 </p></dd>
 <dt> <kbd>M-i</kbd></dt>
@@ -101,16 +101,16 @@
 code, lines are indented according to their nesting in parentheses.  The
 same general idea is used for C code, though details differ.
 </p>
-<p>   Use the <kbd>TAB</kbd> command to indent a line whatever the language.
+<p>   Use the &lt;TAB&gt; command to indent a line whatever the language.
 Each major mode defines this command to perform indentation appropriate
-for the particular language.  In Lisp mode, <kbd>TAB</kbd> aligns a line
+for the particular language.  In Lisp mode, &lt;TAB&gt; aligns a line
 according to its depth in parentheses.  No matter where in the line you
-are when you type <kbd>TAB</kbd>, it aligns the line as a whole.  In C mode,
-<kbd>TAB</kbd> implements a subtle and sophisticated indentation style that
+are when you type &lt;TAB&gt;, it aligns the line as a whole.  In C mode,
+&lt;TAB&gt; implements a subtle and sophisticated indentation style that
 knows about many aspects of C syntax.
 </p>
 <a name="IDX740"></a>
-<p>  In Text mode, <kbd>TAB</kbd> runs the command 
<code>tab-to-tab-stop</code>, which
+<p>  In Text mode, &lt;TAB&gt; runs the command <code>tab-to-tab-stop</code>, 
which
 indents to the next tab stop column.  You can set the tab stops with
 <kbd>M-x edit-tab-stops</kbd>.
 </p>
@@ -146,7 +146,7 @@
 <h2 class="section"> 19.1 Indentation Commands and Techniques </h2>
 
 <p>  If you just want to insert a tab character in the buffer, you can type
-<kbd>C-q <kbd>TAB</kbd></kbd>.
+<kbd>C-q &lt;TAB&gt;</kbd>.
 </p>
 <a name="IDX741"></a>
 <a name="IDX742"></a>
@@ -155,8 +155,8 @@
 positions point at the first non-blank character on the line.
 </p>
 <p>  To insert an indented line before the current line, type <kbd>C-a C-o
-<kbd>TAB</kbd></kbd>.  To make an indented line after the current line, use
-<kbd>C-e <kbd>LFD</kbd></kbd>.
+&lt;TAB&gt;</kbd>.  To make an indented line after the current line, use
+<kbd>C-e &lt;LFD&gt;</kbd>.
 </p>
 <a name="IDX743"></a>
 <a name="IDX744"></a>
@@ -186,10 +186,10 @@
 <a name="IDX752"></a>
 <p>  There are also commands for changing the indentation of several lines at
 once.  <kbd>Control-Meta-\</kbd> (<code>indent-region</code>) gives each line 
which
-begins in the region the &ldquo;usual&rdquo; indentation by invoking 
<kbd>TAB</kbd> at the
+begins in the region the &ldquo;usual&rdquo; indentation by invoking 
&lt;TAB&gt; at the
 beginning of the line.  A numeric argument specifies the column to indent
 to.  Each line is shifted left or right so that its first non-blank
-character appears in that column.  <kbd>C-x <kbd>TAB</kbd></kbd>
+character appears in that column.  <kbd>C-x &lt;TAB&gt;</kbd>
 (<code>indent-rigidly</code>) moves all the lines in the region right by its
 argument (left, for negative arguments).  The whole group of lines moves
 rigidly sideways, which is how the command gets its name.
@@ -204,7 +204,7 @@
 indentation point then applicable is used.  If no indentation point is
 applicable even then, <code>tab-to-tab-stop</code> is run (see next section).
 </p>
-<p>  <code>indent-relative</code> is the definition of <kbd>TAB</kbd> in 
Indented Text
+<p>  <code>indent-relative</code> is the definition of &lt;TAB&gt; in Indented 
Text
 mode.  See section <a href="xemacs_23.html#SEC196">Commands for Human 
Languages</a>.
 </p>
 <hr size="6">
@@ -228,7 +228,7 @@
 </tr></table>
 <h2 class="section"> 19.2 Tab Stops </h2>
 
-<p>  For typing in tables, you can use Text mode's definition of 
<kbd>TAB</kbd>,
+<p>  For typing in tables, you can use Text mode's definition of &lt;TAB&gt;,
 <code>tab-to-tab-stop</code>.  This command inserts indentation before point,
 enough to reach the next tab stop column.  Even if you are not in Text mode,
 this function is associated with <kbd>M-i</kbd> anyway.
Index: texi2html/Tests/xemacs_frame_res/xemacs_23.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_23.html:1.22 
texi2html/Tests/xemacs_frame_res/xemacs_23.html:1.23
--- texi2html/Tests/xemacs_frame_res/xemacs_23.html:1.22        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_23.html     Sat Apr  8 23:02:08 2006
@@ -130,7 +130,7 @@
 
 <p>  You should use Text mode&mdash;rather than Fundamental or Lisp 
mode&mdash;to
 edit files of text in a human language.  Invoke <kbd>M-x text-mode</kbd> to
-enter Text mode.  In Text mode, <kbd>TAB</kbd> runs the function
+enter Text mode.  In Text mode, &lt;TAB&gt; runs the function
 <code>tab-to-tab-stop</code>, which allows you to use arbitrary tab stops set
 with <kbd>M-x edit-tab-stops</kbd> (see section <a 
href="xemacs_22.html#SEC194">Tab Stops</a>).  Features concerned
 with comments in programs are turned off unless they are explicitly invoked.
@@ -139,10 +139,10 @@
 </p>
 <a name="IDX760"></a>
 <p>  A similar variant mode is Indented Text mode, intended for editing
-text in which most lines are indented.  This mode defines <kbd>TAB</kbd> to
+text in which most lines are indented.  This mode defines &lt;TAB&gt; to
 run <code>indent-relative</code> (see section <a 
href="xemacs_22.html#SEC192">Indentation</a>), and makes Auto Fill
 indent the lines it creates.  As a result, a line made by Auto Filling,
-or by <kbd>LFD</kbd>, is normally indented just like the previous line.  Use
+or by &lt;LFD&gt;, is normally indented just like the previous line.  Use
 <kbd>M-x indented-text-mode</kbd> to select this mode.
 </p>
 <a name="IDX761"></a>
@@ -227,11 +227,11 @@
 <p>  The other feature of Nroff mode is Electric Nroff newline mode.  
 This is a minor mode that you can turn on or off with
 <kbd>M-x electric-nroff-mode</kbd> (see section <a 
href="xemacs_30.html#SEC352">Minor Modes</a>).  When the mode is
-on and you use <kbd>RET</kbd> to end a line containing an nroff command
+on and you use &lt;RET&gt; to end a line containing an nroff command
 that opens a kind of grouping, Emacs automatically inserts the matching
 nroff command to close that grouping on the following line.  For
 example, if you are at the beginning of a line and type <kbd>.(b
-<kbd>RET</kbd></kbd>, the matching command &lsquo;<samp>.)b</samp>&rsquo; will 
be inserted on a new
+&lt;RET&gt;</kbd>, the matching command &lsquo;<samp>.)b</samp>&rsquo; will be 
inserted on a new
 line following point.
 </p>
 <a name="IDX769"></a>
@@ -342,7 +342,7 @@
 <dd><p>Insert, according to context, either &lsquo;<samp>``</samp>&rsquo; or 
&lsquo;<samp>&quot;</samp>&rsquo; or
 &lsquo;<samp>''</samp>&rsquo; (<code>TeX-insert-quote</code>).
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
 <dd><p>Insert a paragraph break (two newlines) and check the previous
 paragraph for unbalanced braces or dollar signs
 (<code>tex-terminate-<br>paragraph</code>).
@@ -394,7 +394,7 @@
 <a name="IDX776"></a>
 <a name="IDX777"></a>
 <a name="IDX778"></a>
-<p>  There are two commands for checking the matching of braces.  
<kbd>LFD</kbd>
+<p>  There are two commands for checking the matching of braces.  &lt;LFD&gt;
 (<code>tex-terminate-paragraph</code>) checks the paragraph before point, and
 inserts two newlines to start a new paragraph.  It prints a message in the
 echo area if any mismatch is found.  <kbd>M-x validate-tex-buffer</kbd> checks
@@ -879,7 +879,7 @@
 <dt> <kbd>M-d</kbd></dt>
 <dd><p>Kill up to the end of a word (<code>kill-word</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to the beginning of a word (<code>backward-kill-word</code>).
 </p></dd>
 <dt> <kbd>M-@</kbd></dt>
@@ -893,8 +893,8 @@
 
 <p>  Notice how these keys form a series that parallels the
 character-based <kbd>C-f</kbd>, <kbd>C-b</kbd>, <kbd>C-d</kbd>, <kbd>C-t</kbd> 
and
-<kbd>DEL</kbd>.  <kbd>M-@</kbd> is related to <kbd>C-@</kbd>, which is an 
alias for
-<kbd>C-<kbd>SPC</kbd></kbd>.
+&lt;DEL&gt;.  <kbd>M-@</kbd> is related to <kbd>C-@</kbd>, which is an alias 
for
+<kbd>C-&lt;SPC&gt;</kbd>.
 </p>
 <a name="IDX823"></a>
 <a name="IDX824"></a>
@@ -917,16 +917,16 @@
 just the part after point.  If some punctuation comes between point and the
 next word, it is killed along with the word.  (To kill only the
 next word but not the punctuation before it, simply type <kbd>Meta-f</kbd> to 
get
-to the end and kill the word backwards with <kbd>Meta-<kbd>DEL</kbd></kbd>.)
+to the end and kill the word backwards with <kbd>Meta-&lt;DEL&gt;</kbd>.)
 <kbd>Meta-d</kbd> takes arguments just like <kbd>Meta-f</kbd>.
 </p>
 <a name="IDX829"></a>
 <a name="IDX830"></a>
-<p>  <kbd>Meta-<kbd>DEL</kbd></kbd> (<code>backward-kill-word</code>) kills 
the word before
+<p>  <kbd>Meta-&lt;DEL&gt;</kbd> (<code>backward-kill-word</code>) kills the 
word before
 point.  It kills everything from point back to where <kbd>Meta-b</kbd> would
 move to.  If point is after the space in &lsquo;<samp>FOO, BAR</samp>&rsquo;, 
then
 &lsquo;<samp>FOO, </samp>&rsquo; is killed.   To kill just 
&lsquo;<samp>FOO</samp>&rsquo;, type
-<kbd>Meta-b Meta-d</kbd> instead of <kbd>Meta-<kbd>DEL</kbd></kbd>.
+<kbd>Meta-b Meta-d</kbd> instead of <kbd>Meta-&lt;DEL&gt;</kbd>.
 </p>
 <a name="IDX831"></a>
 <a name="IDX832"></a>
@@ -985,7 +985,7 @@
 <dt> <kbd>M-k</kbd></dt>
 <dd><p>Kill forward to the end of the sentence (<code>kill-sentence</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to the beginning of the sentence 
<br>(<code>backward-kill-sentence</code>).
 </p></dd>
 </dl>
@@ -1019,7 +1019,7 @@
 sentence.  With minus one as an argument it kills back to the beginning
 of the sentence.  Larger arguments serve as repeat counts.
 </p>
-<p>  There is a special command, <kbd>C-x <kbd>DEL</kbd></kbd>
+<p>  There is a special command, <kbd>C-x &lt;DEL&gt;</kbd>
 (<code>backward-kill-sentence</code>), for killing back to the beginning of a
 sentence, which is useful when you change your mind in the middle of
 composing text.
@@ -1136,7 +1136,7 @@
 example, if a file is printed on a line printer, each &ldquo;page&rdquo; of the
 file starts on a new page of paper.  Emacs treats a page-separator
 character just like any other character.  It can be inserted with
-<kbd>C-q C-l</kbd> or deleted with <kbd>DEL</kbd>.  You are free to
+<kbd>C-q C-l</kbd> or deleted with &lt;DEL&gt;.  You are free to
 paginate your file or not.  However, since pages are often meaningful
 divisions of the file, commands are provided to move over them and
 operate on them.
@@ -1259,14 +1259,14 @@
 
 <p>  <em>Auto Fill</em> mode is a minor mode in which lines are broken
 automatically when they become too wide.  Breaking happens only when
-you type a <kbd>SPC</kbd> or <kbd>RET</kbd>.
+you type a &lt;SPC&gt; or &lt;RET&gt;.
 </p>
 <dl compact="compact">
 <dt> <kbd>M-x auto-fill-mode</kbd></dt>
 <dd><p>Enable or disable Auto Fill mode.
 </p></dd>
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>In Auto Fill mode, break lines when appropriate.
 </p></dd>
 </dl>
@@ -1282,13 +1282,13 @@
 </p>
 <p>  In Auto Fill mode, lines are broken automatically at spaces when they get
 longer than desired.  Line breaking and rearrangement takes place
-only when you type <kbd>SPC</kbd> or <kbd>RET</kbd>.  To insert a space
-or newline without permitting line-breaking, type <kbd>C-q 
<kbd>SPC</kbd></kbd> or
-<kbd>C-q <kbd>LFD</kbd></kbd> (recall that a newline is really a linefeed).
+only when you type &lt;SPC&gt; or &lt;RET&gt;.  To insert a space
+or newline without permitting line-breaking, type <kbd>C-q &lt;SPC&gt;</kbd> or
+<kbd>C-q &lt;LFD&gt;</kbd> (recall that a newline is really a linefeed).
 <kbd>C-o</kbd> inserts a newline without line breaking.
 </p>
 <p>  Auto Fill mode works well with Lisp mode: when it makes a new line in
-Lisp mode, it indents that line with <kbd>TAB</kbd>.  If a line ending in a
+Lisp mode, it indents that line with &lt;TAB&gt;.  If a line ending in a
 Lisp comment gets too long, the text of the comment is split into two
 comment lines.  Optionally, new comment delimiters are inserted at the
 end of the first line and the beginning of the second, so that each line
Index: texi2html/Tests/xemacs_frame_res/xemacs_24.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_24.html:1.25 
texi2html/Tests/xemacs_frame_res/xemacs_24.html:1.26
--- texi2html/Tests/xemacs_frame_res/xemacs_24.html:1.25        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_24.html     Sat Apr  8 23:02:08 2006
@@ -157,17 +157,17 @@
 <p>  There are several variants of Lisp mode, which differ in the way they
 interface to Lisp execution.  See section <a 
href="xemacs_25.html#SEC253">Major Modes for Lisp</a>.
 </p>
-<p>  Each of the programming language modes defines the <kbd>TAB</kbd> key to 
run
+<p>  Each of the programming language modes defines the &lt;TAB&gt; key to run
 an indentation function that knows the indentation conventions of that
 language and updates the current line's indentation accordingly.  For
-example, in C mode <kbd>TAB</kbd> is bound to <code>c-indent-line</code>.  
<kbd>LFD</kbd>
-is normally defined to do <kbd>RET</kbd> followed by <kbd>TAB</kbd>; thus it, 
too,
+example, in C mode &lt;TAB&gt; is bound to <code>c-indent-line</code>.  
&lt;LFD&gt;
+is normally defined to do &lt;RET&gt; followed by &lt;TAB&gt;; thus it, too,
 indents in a mode-specific fashion.
 </p>
 <a name="IDX889"></a>
 <a name="IDX890"></a>
 <p>  In most programming languages, indentation is likely to vary from line to
-line.  So the major modes for those languages rebind <kbd>DEL</kbd> to treat a
+line.  So the major modes for those languages rebind &lt;DEL&gt; to treat a
 tab as if it were the equivalent number of spaces (using the command
 <code>backward-delete-char-untabify</code>).  This makes it possible to rub out
 indentation one column at a time without worrying whether it is made up of
@@ -512,43 +512,43 @@
 <h3 class="subsection"> 21.4.1 Basic Program Indentation Commands </h3>
 
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Adjust indentation of current line.
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
-<dd><p>Equivalent to <kbd>RET</kbd> followed by <kbd>TAB</kbd> 
(<code>newline-and-indent</code>).
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
+<dd><p>Equivalent to &lt;RET&gt; followed by &lt;TAB&gt; 
(<code>newline-and-indent</code>).
 </p></dd>
 </dl>
 
 <a name="IDX927"></a>
 <a name="IDX928"></a>
 <a name="IDX929"></a>
-<p>  The basic indentation command is <kbd>TAB</kbd>, which gives the current
+<p>  The basic indentation command is &lt;TAB&gt;, which gives the current
 line the correct indentation as determined from the previous lines.  The
-function that <kbd>TAB</kbd> runs depends on the major mode; it is
+function that &lt;TAB&gt; runs depends on the major mode; it is
 <code>lisp-indent-line</code> in Lisp mode, <code>c-indent-line</code> in C 
mode,
 etc.  These functions understand different syntaxes for different
-languages, but they all do about the same thing.  <kbd>TAB</kbd> in any
+languages, but they all do about the same thing.  &lt;TAB&gt; in any
 programming language major mode inserts or deletes whitespace at the
 beginning of the current line, independent of where point is in the
 line.  If point is inside the whitespace at the beginning of the line,
-<kbd>TAB</kbd> leaves it at the end of that whitespace; otherwise, 
<kbd>TAB</kbd>
+&lt;TAB&gt; leaves it at the end of that whitespace; otherwise, &lt;TAB&gt;
 leaves point fixed with respect to the characters around it.
 </p>
-<p>  Use <kbd>C-q <kbd>TAB</kbd></kbd> to insert a tab at point.
+<p>  Use <kbd>C-q &lt;TAB&gt;</kbd> to insert a tab at point.
 </p>
 <a name="IDX930"></a>
 <a name="IDX931"></a>
-<p>  When entering a large amount of new code, use <kbd>LFD</kbd>
-(<code>newline-and-indent</code>), which is equivalent to a <kbd>RET</kbd> 
followed
-by a <kbd>TAB</kbd>.  <kbd>LFD</kbd> creates a blank line, then gives it the
+<p>  When entering a large amount of new code, use &lt;LFD&gt;
+(<code>newline-and-indent</code>), which is equivalent to a &lt;RET&gt; 
followed
+by a &lt;TAB&gt;.  &lt;LFD&gt; creates a blank line, then gives it the
 appropriate indentation.
 </p>
-<p>  <kbd>TAB</kbd> indents the second and following lines of the body of a
+<p>  &lt;TAB&gt; indents the second and following lines of the body of a
 parenthetical grouping each under the preceding one; therefore, if you
 alter one line's indentation to be nonstandard, the lines below tend
 to follow it.  This is the right behavior in cases where the standard
-result of <kbd>TAB</kbd> does not look good.
+result of &lt;TAB&gt; does not look good.
 </p>
 <p>  Remember that Emacs assumes that an open-parenthesis, open-brace, or
 other opening delimiter at the left margin (including the indentation
@@ -588,7 +588,7 @@
 <dt> <kbd>C-M-q</kbd></dt>
 <dd><p>Re-indent all the lines within one list (<code>indent-sexp</code>).
 </p></dd>
-<dt> <kbd>C-u <kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>C-u &lt;TAB&gt;</kbd></dt>
 <dd><p>Shift an entire list rigidly sideways so that its first line
 is properly indented.
 </p></dd>
@@ -606,12 +606,12 @@
 bound to other suitable functions in other modes.  The indentation of
 the line the sexp starts on is not changed; therefore, only the relative
 indentation within the list, and not its position, is changed.  To
-correct the position as well, type a <kbd>TAB</kbd> before <kbd>C-M-q</kbd>.
+correct the position as well, type a &lt;TAB&gt; before <kbd>C-M-q</kbd>.
 </p>
 <a name="IDX935"></a>
 <p>  If the relative indentation within a list is correct but the
 indentation of its beginning is not, go to the line on which the list
-begins and type <kbd>C-u <kbd>TAB</kbd></kbd>.  When you give <kbd>TAB</kbd> a 
numeric
+begins and type <kbd>C-u &lt;TAB&gt;</kbd>.  When you give &lt;TAB&gt; a 
numeric
 argument, it moves all the lines in the group, starting on the current
 line, sideways the same amount that the current line moves.  The command
 does not move lines that start inside strings, or C
@@ -620,7 +620,7 @@
 <a name="IDX936"></a>
 <a name="IDX937"></a>
 <p>  Another way to specify a range to be re-indented is with point and
-mark.  The command <kbd>C-M-\</kbd> (<code>indent-region</code>) applies 
<kbd>TAB</kbd>
+mark.  The command <kbd>C-M-\</kbd> (<code>indent-region</code>) applies 
&lt;TAB&gt;
 to every line whose first character is between point and mark.
 </p>
 <hr size="6">
@@ -748,11 +748,11 @@
 Correct C indentation is done on all the lines that are made this way.
 </p>
 <a name="IDX941"></a>
-<p>  If <code>c-tab-always-indent</code> is non-<code>nil</code>, the 
<kbd>TAB</kbd> command
+<p>  If <code>c-tab-always-indent</code> is non-<code>nil</code>, the 
&lt;TAB&gt; command
 in C mode does indentation only if point is at the left margin or within
 the line's indentation.  If there is non-whitespace to the left of point,
-<kbd>TAB</kbd> just inserts a tab character in the buffer.  Normally,
-this variable is <code>nil</code>, and <kbd>TAB</kbd> always reindents the 
current line.
+&lt;TAB&gt; just inserts a tab character in the buffer.  Normally,
+this variable is <code>nil</code>, and &lt;TAB&gt; always reindents the 
current line.
 </p>
 <p>  C does not have anything analogous to particular function names for which
 special forms of indentation are desirable.  However, it has a different
@@ -987,8 +987,8 @@
 <dt> <kbd>C-u - C-x ;</kbd></dt>
 <dd><p>Kill comment on current line (<code>kill-comment</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>LFD</kbd></kbd></dt>
-<dd><p>Like <kbd>RET</kbd> followed by inserting and aligning a comment
+<dt> <kbd>M-&lt;LFD&gt;</kbd></dt>
+<dd><p>Like &lt;RET&gt; followed by inserting and aligning a comment
 (<code>indent-new-comment-line</code>).
 </p></dd>
 </dl>
@@ -1014,7 +1014,7 @@
 start with two semicolons are indented as if they were lines of code,
 instead of at the comment column.  Comments which start with three
 semicolons are supposed to start at the left margin.  Emacs understands
-these conventions by indenting a double-semicolon comment using <kbd>TAB</kbd>
+these conventions by indenting a double-semicolon comment using &lt;TAB&gt;
 and by not changing the indentation of a triple-semicolon comment at all.
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">;; This function is just an 
example.
@@ -1065,12 +1065,12 @@
 <h3 class="subsection"> 21.6.1 Multiple Lines of Comments </h3>
 
 <p>  If you are typing a comment and want to continue it on another line,
-use the command <kbd>Meta-<kbd>LFD</kbd></kbd> 
(<code>indent-new-comment-line</code>),
+use the command <kbd>Meta-&lt;LFD&gt;</kbd> 
(<code>indent-new-comment-line</code>),
 which terminates the comment you are typing, creates a new blank line
 afterward, and begins a new comment indented under the old one.  If
 Auto Fill mode is on and you go past the fill column while typing, the 
 comment is continued in just this fashion.  If point is
-not at the end of the line when you type <kbd>M-<kbd>LFD</kbd></kbd>, the text 
on
+not at the end of the line when you type <kbd>M-&lt;LFD&gt;</kbd>, the text on
 the rest of the line becomes part of the new comment line.
 </p>
 <hr size="6">
@@ -1125,12 +1125,12 @@
 <code>&quot;/* &quot;</code> and <code>comment-end</code> has the value 
<code>&quot; */&quot;</code>.
 </p>
 <a name="IDX955"></a>
-<p>  <code>comment-multi-line</code> controls how <kbd>M-<kbd>LFD</kbd></kbd>
+<p>  <code>comment-multi-line</code> controls how <kbd>M-&lt;LFD&gt;</kbd>
 (<code>indent-new-comment-line</code>) behaves when used inside a comment.  If
 <code>comment-multi-line</code> is <code>nil</code>, as it normally is, then
-<kbd>M-<kbd>LFD</kbd></kbd> terminates the comment on the starting line and 
starts
+<kbd>M-&lt;LFD&gt;</kbd> terminates the comment on the starting line and starts
 a new comment on the new following line.  If <code>comment-multi-line</code>
-is not <code>nil</code>, then <kbd>M-<kbd>LFD</kbd></kbd> sets up the new 
following line
+is not <code>nil</code>, then <kbd>M-&lt;LFD&gt;</kbd> sets up the new 
following line
 as part of the same comment that was found on the starting line.  This
 is done by not inserting a terminator on the old line and not inserting
 a starter on the new line.  In languages where multi-line comments are legal,
@@ -1191,7 +1191,7 @@
 O</kbd>, which has the same effect except for leaving the cursor before the
 close parenthesis.  You can then type <kbd>M-)</kbd>, which moves past the
 close parenthesis, deletes any indentation preceding it (in this example
-there is none), and indents with <kbd>LFD</kbd> after it.
+there is none), and indents with &lt;LFD&gt; after it.
 </p>
 <hr size="6">
 <a name="Lisp-Completion"></a>
@@ -1219,7 +1219,7 @@
 </p>
 <a name="IDX961"></a>
 <a name="IDX962"></a>
-<p>  The command <kbd>M-<kbd>TAB</kbd></kbd> 
(<code>lisp-complete-symbol</code>) takes the
+<p>  The command <kbd>M-&lt;TAB&gt;</kbd> (<code>lisp-complete-symbol</code>) 
takes the
 partial Lisp symbol before point to be an abbreviation, and compares it
 against all non-trivial Lisp symbols currently known to Emacs.  Any
 additional characters that they all have in common are inserted at point.
@@ -1319,7 +1319,7 @@
 change log file yourself.
 </p>
 <p>  The change log file is always visited in Indented Text mode, which means
-that <kbd>LFD</kbd> and auto-filling indent each new line like the previous
+that &lt;LFD&gt; and auto-filling indent each new line like the previous
 line.  This is convenient for entering the contents of an entry, which must
 be indented.  See section <a href="xemacs_23.html#SEC197">Text Mode</a>.
 </p>
@@ -1982,7 +1982,7 @@
 ever-increasing distances away for the text that should appear at
 the beginning of the definition.
 </p>
-<p>  If an empty argument is given (by typing <kbd>RET</kbd>), the sexp in the
+<p>  If an empty argument is given (by typing &lt;RET&gt;), the sexp in the
 buffer before or around point is used as the name of the tag to find.
 See section <a href="#SEC217">Lists and Sexps</a>, for information on sexps.
 </p>
@@ -1994,7 +1994,7 @@
 the substring, give <code>find-tag</code> a numeric argument, as in <kbd>C-u
 M-.</kbd>.  This does not read a tag name, but continues searching the tag
 table's text for another tag containing the same substring last used.
-If your keyboard has a real <kbd>META</kbd> key, <kbd>M-0 M-.</kbd> is an 
easier
+If your keyboard has a real &lt;META&gt; key, <kbd>M-0 M-.</kbd> is an easier
 alternative to <kbd>C-u M-.</kbd>.
 </p>
 <p>If the optional second argument <var>other-window</var> is 
non-<code>nil</code>, it uses
@@ -2071,11 +2071,11 @@
 <kbd>M-x grep</kbd> (see section <a href="xemacs_25.html#SEC252">Running 
&ldquo;make&rdquo;, or Compilers Generally</a>).
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x tags-search <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x tags-search &lt;RET&gt; <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search for <var>regexp</var> through the files in the selected tags
 table.
 </p></dd>
-<dt> <kbd>M-x tags-query-replace <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd> <var>replacement</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x tags-query-replace &lt;RET&gt; <var>regexp</var> &lt;RET&gt; 
<var>replacement</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Perform a <code>query-replace-regexp</code> on each file in the 
selected tags table.
 </p></dd>
 <dt> <kbd>M-,</kbd></dt>
@@ -2358,10 +2358,10 @@
 <h4 class="subsubsection"> 21.12.2.1 Fortran Indentation Commands </h4>
 
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Indent the current line (<code>fortran-indent-line</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>LFD</kbd></kbd></dt>
+<dt> <kbd>M-&lt;LFD&gt;</kbd></dt>
 <dd><p>Break the current line and set up a continuation line.
 </p></dd>
 <dt> <kbd>C-M-q</kbd></dt>
@@ -2371,7 +2371,7 @@
 </dl>
 
 <a name="IDX999"></a>
-<p>  <kbd>TAB</kbd> is redefined by Fortran mode to reindent the current line 
for
+<p>  &lt;TAB&gt; is redefined by Fortran mode to reindent the current line for
 Fortran (<code>fortran-indent-line</code>).  Line numbers and continuation
 markers are indented to their required columns, and the body of the
 statement is independently indented, based on its nesting in the program.
@@ -2384,7 +2384,7 @@
 </p>
 <a name="IDX1002"></a>
 <a name="IDX1003"></a>
-<p>  The key <kbd>M-<kbd>LFD</kbd></kbd> is redefined as 
<code>fortran-split-line</code>, a
+<p>  The key <kbd>M-&lt;LFD&gt;</kbd> is redefined as 
<code>fortran-split-line</code>, a
 command to split a line in the appropriate fashion for Fortran.  In a
 non-comment line, the second half becomes a continuation line and is
 indented accordingly.  In a comment line, both halves become separate
@@ -2756,10 +2756,10 @@
 defines these commands:
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p><code>tab-to-tab-stop</code>.
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
 <dd><p>Insert a newline and then indent using <code>tab-to-tab-stop</code>.
 </p></dd>
 <dt> <kbd>:</kbd></dt>
Index: texi2html/Tests/xemacs_frame_res/xemacs_25.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_25.html:1.28 
texi2html/Tests/xemacs_frame_res/xemacs_25.html:1.29
--- texi2html/Tests/xemacs_frame_res/xemacs_25.html:1.28        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_25.html     Sat Apr  8 23:02:08 2006
@@ -141,7 +141,7 @@
 <a name="IDX1020"></a>
 <p>  When the shell command line is read, the minibuffer appears containing a
 default command line (the command you used the last time you typed
-<kbd>M-x compile</kbd>).  If you type just <kbd>RET</kbd>, the same command 
line is used
+<kbd>M-x compile</kbd>).  If you type just &lt;RET&gt;, the same command line 
is used
 again.  The first <kbd>M-x compile</kbd> provides <code>make -k</code> as the 
default.
 The default is taken from the variable <code>compile-command</code>; if the
 appropriate compilation command for a file is something other than
@@ -242,7 +242,7 @@
 </p></dd>
 <dt> Lisp Interaction mode</dt>
 <dd><p>The mode for an interactive session with Emacs Lisp.  It defines
-<kbd>LFD</kbd> to evaluate the sexp before point and insert its value in the
+&lt;LFD&gt; to evaluate the sexp before point and insert its value in the
 buffer.  See section <a href="#SEC260">Lisp Interaction Buffers</a>.
 </p></dd>
 <dt> Lisp mode</dt>
@@ -791,14 +791,14 @@
 the expressions you evaluate and their output goes in the buffer.
 </p>
 <p>  The &lsquo;<samp>*scratch*</samp>&rsquo; buffer's major mode is Lisp 
Interaction mode, which
-is the same as Emacs-Lisp mode except for one command, <kbd>LFD</kbd>.  In
-Emacs-Lisp mode, <kbd>LFD</kbd> is an indentation command.  In Lisp
-Interaction mode, <kbd>LFD</kbd> is bound to 
<code>eval-print-last-sexp</code>.  This
+is the same as Emacs-Lisp mode except for one command, &lt;LFD&gt;.  In
+Emacs-Lisp mode, &lt;LFD&gt; is an indentation command.  In Lisp
+Interaction mode, &lt;LFD&gt; is bound to <code>eval-print-last-sexp</code>.  
This
 function reads the Lisp expression before point, evaluates it, and inserts
 the value in printed representation before point.
 </p>
 <p> The way to use the &lsquo;<samp>*scratch*</samp>&rsquo; buffer is to 
insert Lisp
-expressions at the end, ending each one with <kbd>LFD</kbd> so that it will
+expressions at the end, ending each one with &lt;LFD&gt; so that it will
 be evaluated.  The result is a complete typescript of the expressions
 you have evaluated and their values.
 </p>
@@ -844,7 +844,7 @@
 Emacs buffer named &lsquo;<samp>*lisp*</samp>&rsquo;.  In other words, any 
&ldquo;terminal output&rdquo;
 from Lisp will go into the buffer, advancing point, and any &ldquo;terminal
 input&rdquo; for Lisp comes from text in the buffer.  To give input to Lisp, go
-to the end of the buffer and type the input, terminated by <kbd>RET</kbd>.  The
+to the end of the buffer and type the input, terminated by &lt;RET&gt;.  The
 &lsquo;<samp>*lisp*</samp>&rsquo; buffer is in Inferior Lisp mode, which has 
all the
 special characteristics of Lisp mode and Shell mode (see section <a 
href="xemacs_29.html#SEC340">Shell Mode</a>).
 </p>
@@ -1285,7 +1285,7 @@
 installed and is up to date.
 </p>
 <p>From here, you can select or unselect packages for installation using
-the <kbd>RET</kbd> key, the <kbd>Mouse-2</kbd> button or selecting 
&quot;Select&quot; from
+the &lt;RET&gt; key, the <kbd>Mouse-2</kbd> button or selecting 
&quot;Select&quot; from
 the (Popup) Menu.
 Once you've finished selecting the packages, you can
 press the <kbd>x</kbd> key (or use the menu) to actually install the
@@ -1298,14 +1298,14 @@
 <dt> <kbd>?</kbd></dt>
 <dd><p>Display simple help.
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
-<dt> <kbd><kbd>Mouse-2</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
+<dt> <kbd>&lt;Mouse-2&gt;</kbd></dt>
 <dd><p>Toggle between selecting and unselecting a package for installation.
 </p></dd>
 <dt> <kbd>x</kbd></dt>
 <dd><p>Install selected packages.
 </p></dd>
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>View, in the minibuffer, additional information about the package, such
 as the package date (not the build date) and the package author.  Moving 
 the mouse over a package name will also do the same thing.
Index: texi2html/Tests/xemacs_frame_res/xemacs_26.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_26.html:1.21 
texi2html/Tests/xemacs_frame_res/xemacs_26.html:1.22
--- texi2html/Tests/xemacs_frame_res/xemacs_26.html:1.21        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_26.html     Sat Apr  8 23:02:08 2006
@@ -65,7 +65,7 @@
 different text.  Abbrevs are defined by the user to expand in specific
 ways.  For example, you might define &lsquo;<samp>foo</samp>&rsquo; as an 
abbrev expanding to
 &lsquo;<samp>find outer otter</samp>&rsquo;.  With this abbrev defined, you 
would be able to
-get &lsquo;<samp>find outer otter </samp>&rsquo; into the buffer by typing 
<kbd>f o o <kbd>SPC</kbd></kbd>.
+get &lsquo;<samp>find outer otter </samp>&rsquo; into the buffer by typing 
<kbd>f o o &lt;SPC&gt;</kbd>.
 </p>
 <a name="IDX1060"></a>
 <a name="IDX1061"></a>
@@ -158,7 +158,7 @@
 before point.  Use a numeric argument to say how many words before point
 should be taken as the expansion.  For example, to define the abbrev
 &lsquo;<samp>foo</samp>&rsquo; as in the example above, insert the text 
&lsquo;<samp>find outer
-otter</samp>&rsquo;, then type <br><kbd>C-u 3 C-x a g f o o 
<kbd>RET</kbd></kbd>.
+otter</samp>&rsquo;, then type <br><kbd>C-u 3 C-x a g f o o &lt;RET&gt;</kbd>.
 </p>
 <p>  An argument of zero to <kbd>C-x a g</kbd> means to use the contents of the
 region as the expansion of the abbrev being defined.
@@ -214,7 +214,7 @@
 <h2 class="section"> 23.2 Controlling Abbrev Expansion </h2>
 
 <p>  An abbrev expands whenever it is in a buffer just before point and you
-type a self-inserting punctuation character (<kbd>SPC</kbd>, comma,
+type a self-inserting punctuation character (&lt;SPC&gt;, comma,
 etc.).  Most often an abbrev is used by inserting the abbrev followed
 by punctuation.
 </p>
Index: texi2html/Tests/xemacs_frame_res/xemacs_27.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_27.html:1.20 
texi2html/Tests/xemacs_frame_res/xemacs_27.html:1.21
--- texi2html/Tests/xemacs_frame_res/xemacs_27.html:1.20        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_27.html     Sat Apr  8 23:02:08 2006
@@ -151,14 +151,14 @@
 <p>  Insertion of text is adapted to the quarter-plane screen model through
 the use of Overwrite mode (see section <a href="xemacs_30.html#SEC352">Minor 
Modes</a>).  Self-inserting characters
 replace existing text, column by column, rather than pushing existing text
-to the right.  <kbd>RET</kbd> runs <code>picture-newline</code>, which just 
moves to
+to the right.  &lt;RET&gt; runs <code>picture-newline</code>, which just moves 
to
 the beginning of the following line so that new text will replace that
 line.
 </p>
 <a name="IDX1092"></a>
 <a name="IDX1093"></a>
 <a name="IDX1094"></a>
-<p>  Text is erased instead of deleted and killed.  <kbd>DEL</kbd>
+<p>  Text is erased instead of deleted and killed.  &lt;DEL&gt;
 (<code>picture-backward-clear-column</code>) replaces the preceding character
 with a space rather than removing it.  <kbd>C-d</kbd>
 (<code>picture-clear-column</code>) does the same in a forward direction.
@@ -169,7 +169,7 @@
 <p>  To do actual insertion, you must use special commands.  <kbd>C-o</kbd>
 (<code>picture-open-line</code>) creates a blank line, but does so after
 the current line; it never splits a line.  <kbd>C-M-o</kbd>, 
<code>split-line</code>,
-makes sense in Picture mode, so it remains unchanged.  <kbd>LFD</kbd>
+makes sense in Picture mode, so it remains unchanged.  &lt;LFD&gt;
 (<code>picture-duplicate-line</code>) inserts another line
 with the same contents below the current line.
 </p>
@@ -269,20 +269,20 @@
 <h2 class="section"> 24.3 Picture Mode Tabs </h2>
  
 <p>  Two kinds of tab-like action are provided in Picture mode.
-Context-based tabbing is done with <kbd>M-<kbd>TAB</kbd></kbd>
+Context-based tabbing is done with <kbd>M-&lt;TAB&gt;</kbd>
 (<code>picture-tab-search</code>).  With no argument, it moves to a point
 underneath the next &ldquo;interesting&rdquo; character that follows 
whitespace in
 the previous non-blank line.  &ldquo;Next&rdquo; here means &ldquo;appearing 
at a
 horizontal position greater than the one point starts out at&rdquo;.  With an
-argument, as in <kbd>C-u M-<kbd>TAB</kbd></kbd>, the command moves to the next 
such
-interesting character in the current line.  <kbd>M-<kbd>TAB</kbd></kbd> does 
not
+argument, as in <kbd>C-u M-&lt;TAB&gt;</kbd>, the command moves to the next 
such
+interesting character in the current line.  <kbd>M-&lt;TAB&gt;</kbd> does not
 change the text; it only moves point.  &ldquo;Interesting&rdquo; characters are
 defined by the variable <code>picture-tab-chars</code>, which contains a string
 of characters considered interesting.  Its default value is
 <code>&quot;!-~&quot;</code>.
 </p>
 <a name="IDX1102"></a>
-<p>  <kbd>TAB</kbd> itself runs <code>picture-tab</code>, which operates based 
on the
+<p>  &lt;TAB&gt; itself runs <code>picture-tab</code>, which operates based on 
the
 current tab stop settings; it is the Picture mode equivalent of
 <code>tab-to-tab-stop</code>.  Without arguments it just moves point, but with
 a numeric argument it clears the text that it moves over.
@@ -290,11 +290,11 @@
 <a name="IDX1103"></a>
 <a name="IDX1104"></a>
 <p>  The context-based and tab-stop-based forms of tabbing are brought
-together by the command <kbd>C-c <kbd>TAB</kbd></kbd> 
(<code>picture-set-tab-stops</code>.)
-This command sets the tab stops to the positions which 
<kbd>M-<kbd>TAB</kbd></kbd>
+together by the command <kbd>C-c &lt;TAB&gt;</kbd> 
(<code>picture-set-tab-stops</code>.)
+This command sets the tab stops to the positions which <kbd>M-&lt;TAB&gt;</kbd>
 would consider significant in the current line.  If you use this command
-with <kbd>TAB</kbd>, you can get the effect of context-based tabbing.  But
-<kbd>M-<kbd>TAB</kbd></kbd> is more convenient in the cases where it is 
sufficient.
+with &lt;TAB&gt;, you can get the effect of context-based tabbing.  But
+<kbd>M-&lt;TAB&gt;</kbd> is more convenient in the cases where it is 
sufficient.
 </p>
 <hr size="6">
 <a name="Rectangles-in-Picture"></a>
Index: texi2html/Tests/xemacs_frame_res/xemacs_28.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_28.html:1.21 
texi2html/Tests/xemacs_frame_res/xemacs_28.html:1.22
--- texi2html/Tests/xemacs_frame_res/xemacs_28.html:1.21        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_28.html     Sat Apr  8 23:02:08 2006
@@ -401,7 +401,7 @@
 <dd><p>Fill all paragraphs of yanked old messages, each individually
 (<code>mail-fill-yanked-message</code>).
 </p></dd>
-<dt> <kbd><kbd>button3</kbd></kbd></dt>
+<dt> <kbd>&lt;button3&gt;</kbd></dt>
 <dd><p>Pops up a menu of useful mail-mode commands.
 </p></dd>
 </dl>
Index: texi2html/Tests/xemacs_frame_res/xemacs_29.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_29.html:1.24 
texi2html/Tests/xemacs_frame_res/xemacs_29.html:1.25
--- texi2html/Tests/xemacs_frame_res/xemacs_29.html:1.24        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_29.html     Sat Apr  8 23:02:08 2006
@@ -439,12 +439,12 @@
 <dd><p>Scroll calendar one month backward (<code>scroll-calendar-right</code>).
 </p></dd>
 <dt> <kbd>C-v</kbd></dt>
-<dt> <kbd><kbd>NEXT</kbd></kbd></dt>
+<dt> <kbd>&lt;NEXT&gt;</kbd></dt>
 <dd><p>Scroll calendar three months forward
 (<code>scroll-calendar-left-three-months</code>).
 </p></dd>
 <dt> <kbd>M-v</kbd></dt>
-<dt> <kbd><kbd>PRIOR</kbd></kbd></dt>
+<dt> <kbd>&lt;PRIOR&gt;</kbd></dt>
 <dd><p>Scroll calendar three months backward
 (<code>scroll-calendar-right-three-months</code>).
 </p></dd>
@@ -473,7 +473,7 @@
 by four, typing <kbd>C-u C-v</kbd> scrolls the calendar forward by a year and
 typing <kbd>C-u M-v</kbd> scrolls the calendar backward by a year.
 </p>
-<p>  The function keys <kbd>NEXT</kbd> and <kbd>PRIOR</kbd> are equivalent to
+<p>  The function keys &lt;NEXT&gt; and &lt;PRIOR&gt; are equivalent to
 <kbd>C-v</kbd> and <kbd>M-v</kbd>, just as they are in other modes.
 </p>
 
@@ -789,7 +789,7 @@
 <a name="IDX1214"></a>
 <p>  To get even more detailed information, use the <kbd>a</kbd> command, which
 displays a separate buffer containing a list of all holidays in the
-current three-month range.  You can use <kbd>SPC</kbd> in the calendar window
+current three-month range.  You can use &lt;SPC&gt; in the calendar window
 to scroll that list.
 </p>
 <a name="IDX1215"></a>
@@ -3353,7 +3353,7 @@
 to that buffer.  That is to say, any &ldquo;terminal output&rdquo; from the 
subshell
 will go into the buffer, advancing point, and any &ldquo;terminal input&rdquo; 
for
 the subshell comes from text in the buffer.  To give input to the subshell,
-go to the end of the buffer and type the input, terminated by <kbd>RET</kbd>.
+go to the end of the buffer and type the input, terminated by &lt;RET&gt;.
 </p>
 <p>  XEmacs does not wait for the subshell to do anything.  You can switch
 windows or buffers and edit them while the shell is waiting, or while it is
@@ -3403,15 +3403,15 @@
 <a name="IDX1399"></a>
 <p>XEmacs keeps a history of the most recent commands you have typed in the
 &lsquo;<samp>*shell*</samp>&rsquo; buffer.  If you are at the beginning of a 
shell command
-line and type <kbd>M-p</kbd>, the previous shell input is inserted into the
-buffer before point.  Immediately typing <kbd>M-p</kbd> again deletes that
-input and inserts the one before it.  By repeating <kbd>M-p</kbd> you can
+line and type &lt;M-p&gt;, the previous shell input is inserted into the
+buffer before point.  Immediately typing &lt;M-p&gt; again deletes that
+input and inserts the one before it.  By repeating &lt;M-p&gt; you can
 move backward through your commands until you find one you want to
-repeat.  You may then edit the command before typing <kbd>RET</kbd> if you
-wish. <kbd>M-n</kbd> moves forward through the command history, in case you
-moved backward past the one you wanted while using <kbd>M-p</kbd>.  If you
+repeat.  You may then edit the command before typing &lt;RET&gt; if you
+wish. &lt;M-n&gt; moves forward through the command history, in case you
+moved backward past the one you wanted while using &lt;M-p&gt;.  If you
 type the first few characters of a previous command and then type
-<kbd>M-p</kbd>, the most recent shell input starting with those characters is
+&lt;M-p&gt;, the most recent shell input starting with those characters is
 inserted.  This can be very convenient when you are repeating a sequence
 of shell commands.  The variable <code>input-ring-size</code> controls how
 many commands are saved in your input history.  The default is 30.
@@ -3472,7 +3472,7 @@
 <a name="IDX1425"></a>
 <a name="IDX1426"></a>
 <dl compact="compact">
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>At end of buffer send line as input; otherwise, copy current line to 
end of
 buffer and send it (<code>send-shell-input</code>).  When a line is copied, any
 text at the beginning of the line that matches the variable
@@ -3517,7 +3517,7 @@
 <dd><p>Copy the previous bunch of shell input and insert it into the
 buffer before point (<code>copy-last-shell-input</code>).  No final newline
 is inserted, and the input copied is not resubmitted until you type
-<kbd>RET</kbd>.
+&lt;RET&gt;.
 </p></dd>
 <dt> <kbd>M-p</kbd></dt>
 <dd><p>Move backward through the input history.  Search for a matching command
@@ -3525,10 +3525,10 @@
 </p></dd>
 <dt> <kbd>M-n</kbd></dt>
 <dd><p>Move forward through the input history.  Useful when you are
-using <kbd>M-p</kbd> quickly and go past the desired command 
+using &lt;M-p&gt; quickly and go past the desired command 
 (<code>comint-next-input</code>).
 </p></dd>
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Complete the file name preceding point 
(<code>comint-dynamic-complete</code>).
 </p></dd>
 </dl>
@@ -3643,11 +3643,11 @@
 <p>The following commands are only available in Char mode:
 </p><dl compact="compact">
 <dt> <kbd>C-c C-c</kbd></dt>
-<dd><p>Send a literal <kbd>C-c</kbd> to the sub-shell.
+<dd><p>Send a literal &lt;C-c&gt; to the sub-shell.
 </p>
 </dd>
 <dt> <kbd>C-c C-x</kbd></dt>
-<dd><p>A prefix command to conveniently access the global <kbd>C-x</kbd> 
commands.
+<dd><p>A prefix command to conveniently access the global &lt;C-x&gt; commands.
 For example, <kbd>C-c C-x o</kbd> invokes the global binding of
 <kbd>C-x o</kbd>, which is normally &lsquo;<samp>other-window</samp>&rsquo;.
 </p></dd>
@@ -4020,7 +4020,7 @@
 
 <p>Copy text from a buffer using <kbd>M-x conx-buffer</kbd> or <kbd>M-x 
conx-region</kbd>
 and then type <kbd>M-x conx</kbd>.  Output is continuously generated until you
-type <kbd>^G</kbd>. You can save the <code>conx</code> database to a file with
+type &lt;^G&gt;. You can save the <code>conx</code> database to a file with
 <kbd>M-x conx-save</kbd>, which you can retrieve with <code>M-x 
conx-load</code>. 
 To clear the database, use <code>M-x conx-init</code>.
 </p>
Index: texi2html/Tests/xemacs_frame_res/xemacs_30.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_30.html:1.26 
texi2html/Tests/xemacs_frame_res/xemacs_30.html:1.27
--- texi2html/Tests/xemacs_frame_res/xemacs_30.html:1.26        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_30.html     Sat Apr  8 23:02:08 2006
@@ -125,7 +125,7 @@
 <h2 class="section"> 27.1 Minor Modes </h2>
 
 <p>  Minor modes are options which you can use or not.  For example, Auto
-Fill mode is a minor mode in which <kbd>SPC</kbd> breaks lines between words
+Fill mode is a minor mode in which &lt;SPC&gt; breaks lines between words
 as you type.  All the minor modes are independent of each other and of
 the selected major mode.  Most minor modes inform you in the mode line
 when they are on; for example, &lsquo;<samp>Fill</samp>&rsquo; in the mode 
line means that
@@ -259,7 +259,7 @@
 minibuffer, with completion.  It prints both the value and the
 documentation of the variable.
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-h v fill-column 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-h v fill-column 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>prints something like:
@@ -282,7 +282,7 @@
 minibuffer (with completion), and then prompts for a Lisp expression for the
 new value using the minibuffer a second time.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x set-variable 
<kbd>RET</kbd> fill-column <kbd>RET</kbd> 75 <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x set-variable 
&lt;RET&gt; fill-column &lt;RET&gt; 75 &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>sets <code>fill-column</code> to 75, as if you had executed the Lisp 
expression
@@ -393,7 +393,7 @@
 typically includes some <em>editable fields</em> that you can edit.  There
 are also <em>active fields</em>; this means a field that does something
 when you <em>invoke</em> it.  To invoke an active field, either click on it
-with <kbd>Mouse-1</kbd>, or move point to it and type <kbd>RET</kbd>.
+with <kbd>Mouse-1</kbd>, or move point to it and type &lt;RET&gt;.
 </p>
 <p>  For example, the phrase &lsquo;<samp>[Open]</samp>&rsquo; that appears in 
a second-level
 group is an active field.  Invoking the &lsquo;<samp>[Open]</samp>&rsquo; 
field for a group
@@ -460,7 +460,7 @@
 of the option: in the example above, it says you have not changed the
 option yet.  The word &lsquo;<samp>[State]</samp>&rsquo; at the beginning of 
this line is
 active; you can get a menu of various operations by invoking it with
-<kbd>Mouse-1</kbd> or <kbd>RET</kbd>.  These operations are essential for
+<kbd>Mouse-1</kbd> or &lt;RET&gt;.  These operations are essential for
 customizing the variable.
 </p>
 <p>  The line after the &lsquo;<samp>[State]</samp>&rsquo; line displays the 
beginning of the
@@ -496,7 +496,7 @@
 <a name="IDX1482"></a>
 <p>  While editing a value or field that is a file name, directory name,
 command name, or anything else for which completion is defined, you can
-type <kbd>M-<kbd>TAB</kbd></kbd> (<code>widget-complete</code>) to do 
completion.
+type <kbd>M-&lt;TAB&gt;</kbd> (<code>widget-complete</code>) to do completion.
 </p>
 <p>  Some options have a small fixed set of possible legitimate values.
 These options don't let you edit the value textually.  Instead, an
@@ -538,15 +538,15 @@
 <a name="IDX1484"></a>
 <a name="IDX1485"></a>
 <a name="IDX1486"></a>
-<p>  Two special commands, <kbd>TAB</kbd> and <kbd>S-<kbd>TAB</kbd></kbd>, are 
useful for
-moving through the customization buffer.  <kbd>TAB</kbd>
+<p>  Two special commands, &lt;TAB&gt; and <kbd>S-&lt;TAB&gt;</kbd>, are 
useful for
+moving through the customization buffer.  &lt;TAB&gt;
 (<code>widget-forward</code>) moves forward to the next active or editable
-field; <kbd>S-<kbd>TAB</kbd></kbd> (<code>widget-backward</code>) moves 
backward to the
+field; <kbd>S-&lt;TAB&gt;</kbd> (<code>widget-backward</code>) moves backward 
to the
 previous active or editable field.
 </p>
-<p>  Typing <kbd>RET</kbd> on an editable field also moves forward, just like
-<kbd>TAB</kbd>.  The reason for this is that people have a tendency to type
-<kbd>RET</kbd> when they are finished editing a field.  If you have occasion
+<p>  Typing &lt;RET&gt; on an editable field also moves forward, just like
+&lt;TAB&gt;.  The reason for this is that people have a tendency to type
+&lt;RET&gt; when they are finished editing a field.  If you have occasion
 to insert a newline in an editable field, use <kbd>C-o</kbd> or <kbd>C-q
 C-j</kbd>,
 </p>
@@ -684,16 +684,16 @@
 face or group that you want to customize.
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x customize-option <kbd>RET</kbd> <var>option</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-option &lt;RET&gt; <var>option</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with just one option, <var>option</var>.
 </p></dd>
-<dt> <kbd>M-x customize-face <kbd>RET</kbd> <var>face</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-face &lt;RET&gt; <var>face</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with just one face, <var>face</var>.
 </p></dd>
-<dt> <kbd>M-x customize-group <kbd>RET</kbd> <var>group</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-group &lt;RET&gt; <var>group</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with just one group, <var>group</var>.
 </p></dd>
-<dt> <kbd>M-x customize-apropos <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-apropos &lt;RET&gt; <var>regexp</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with all the options, faces and groups
 that match <var>regexp</var>.
 </p></dd>
@@ -1204,7 +1204,7 @@
 You can then use it in another editing session.  First visit the file
 you want to save the definition in.  Then use the command:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x insert-kbd-macro 
<kbd>RET</kbd> <var>macroname</var> <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x insert-kbd-macro 
&lt;RET&gt; <var>macroname</var> &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>This inserts some Lisp code that, when executed later, will define the same
@@ -1249,10 +1249,10 @@
 <kbd>C-x q</kbd> reads a character from the terminal to decide whether to
 continue.
 </p>
-<p>  The special answers to a <kbd>C-x q</kbd> query are <kbd>SPC</kbd>, 
<kbd>DEL</kbd>,
+<p>  The special answers to a <kbd>C-x q</kbd> query are &lt;SPC&gt;, 
&lt;DEL&gt;,
 <kbd>C-d</kbd>, <kbd>C-l</kbd>, and <kbd>C-r</kbd>.  Any other character 
terminates
 execution of the keyboard macro and is then read as a command.
-<kbd>SPC</kbd> means to continue.  <kbd>DEL</kbd> means to skip the remainder 
of
+&lt;SPC&gt; means to continue.  &lt;DEL&gt; means to skip the remainder of
 this repetition of the macro, starting again from the beginning in the
 next repetition.  <kbd>C-d</kbd> means to skip the remainder of this
 repetition and cancel further repetition.  <kbd>C-l</kbd> redraws the frame
@@ -1260,7 +1260,7 @@
 a recursive editing level, in which you can perform editing that is not
 part of the macro.  When you exit the recursive edit using <kbd>C-M-c</kbd>,
 you are asked again how to continue with the keyboard macro.  If you
-type a <kbd>SPC</kbd> at this time, the rest of the macro definition is
+type a &lt;SPC&gt; at this time, the rest of the macro definition is
 executed.  It is up to you to leave point and the text in a state such
 that the rest of the macro will do what you want.
 </p>
@@ -1371,15 +1371,15 @@
 <li>
 <code>minibuffer-local-map</code> is used for ordinary input (no completion).
 </li><li>
-<code>minibuffer-local-ns-map</code> is similar, except that <kbd>SPC</kbd> 
exits
-just like <kbd>RET</kbd>.  This is used mainly for Mocklisp compatibility.
+<code>minibuffer-local-ns-map</code> is similar, except that &lt;SPC&gt; exits
+just like &lt;RET&gt;.  This is used mainly for Mocklisp compatibility.
 </li><li>
 <code>minibuffer-local-completion-map</code> is for permissive completion.
 </li><li>
 <code>minibuffer-local-must-match-map</code> is for strict completion and
 for cautious completion.
 </li><li>
-<code>repeat-complex-command-map</code> is for use in <kbd>C-x <kbd>ESC</kbd> 
<kbd>ESC</kbd></kbd>.
+<code>repeat-complex-command-map</code> is for use in <kbd>C-x &lt;ESC&gt; 
&lt;ESC&gt;</kbd>.
 </li><li>
 <code>isearch-mode-map</code> contains the bindings of the special keys which
 are bound in the pseudo-mode entered with <kbd>C-s</kbd> and <kbd>C-r</kbd>.
@@ -1399,7 +1399,7 @@
 </li><li>
 <code>help-map</code> is used for characters that follow <kbd>C-h</kbd>.
 </li><li>
-<code>esc-map</code> is for characters that follow <kbd>ESC</kbd>. All Meta
+<code>esc-map</code> is for characters that follow &lt;ESC&gt;. All Meta
 characters are actually defined by this map.
 </li><li>
 <code>ctl-x-4-map</code> is for characters that follow <kbd>C-x 4</kbd>.
@@ -1418,7 +1418,7 @@
 </p>
 <p>  Prefix key definitions can appear in either the global
 map or a local map.  The definitions of <kbd>C-c</kbd>, <kbd>C-x</kbd>, 
<kbd>C-h</kbd>,
-and <kbd>ESC</kbd> as prefix keys appear in the global map, so these prefix
+and &lt;ESC&gt; as prefix keys appear in the global map, so these prefix
 keys are always available.  Major modes can locally redefine a key as a
 prefix by putting a prefix key definition for it in the local
 map.
@@ -1490,14 +1490,14 @@
 <h4 class="subsubsection"> 27.4.2.1 Changing Key Bindings Interactively </h4>
 
 <dl compact="compact">
-<dt> <kbd>M-x global-set-key <kbd>RET</kbd> <var>key</var> <var>cmd</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x global-set-key &lt;RET&gt; <var>key</var> <var>cmd</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Defines <var>key</var> globally to run <var>cmd</var>.
 </p></dd>
-<dt> <kbd>M-x local-set-key <kbd>RET</kbd> <var>keys</var> <var>cmd</var> 
<kbd>RET</kbd></kbd> </dt>
+<dt> <kbd>M-x local-set-key &lt;RET&gt; <var>keys</var> <var>cmd</var> 
&lt;RET&gt;</kbd> </dt>
 <dd><p>Defines <var>key</var> locally (in the major mode now in effect) to run
 <var>cmd</var>.
 </p></dd>
-<dt> <kbd>M-x local-unset-key <kbd>RET</kbd> <var>keys</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x local-unset-key &lt;RET&gt; <var>keys</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Removes the local binding of <var>key</var>.
 </p></dd>
 </dl>
@@ -1513,7 +1513,7 @@
 </p>
 <p>The following example:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
<kbd>RET</kbd> C-f next-line <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
&lt;RET&gt; C-f next-line &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>redefines <kbd>C-f</kbd> to move down a line.  The fact that <var>cmd</var> 
is
@@ -1528,7 +1528,7 @@
 <kbd>C-x</kbd>, another character is read; if that character is <kbd>4</kbd>,
 another character is read, and so on.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
<kbd>RET</kbd> C-x 4 $ spell-other-window <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
&lt;RET&gt; C-x 4 $ spell-other-window &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>redefines <kbd>C-x 4 $</kbd> to run the (fictitious) command
@@ -1634,7 +1634,7 @@
 <p>Here are some examples of programmatically binding keys:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">
-;;;  Bind <code>my-command</code> to <kbd>f1</kbd>
+;;;  Bind <code>my-command</code> to &lt;f1&gt;
 (global-set-key 'f1 'my-command)                
 
 ;;;  Bind <code>my-command</code> to <kbd>Shift-f1</kbd>
@@ -1646,7 +1646,7 @@
 ;;; Bind <code>my-command</code> to the middle mouse button.
 (global-set-key 'button2 'my-command)
 
-;;; Bind <code>my-command</code> to <kbd><kbd>META</kbd> <kbd>CTL</kbd> 
<kbd>Right Mouse Button</kbd></kbd>
+;;; Bind <code>my-command</code> to <kbd>&lt;META&gt; &lt;CTL&gt; &lt;Right 
Mouse Button&gt;</kbd>
 ;;; in the keymap that is in force when you are running <code>dired</code>.
 (define-key dired-mode-map '(meta control button3) 'my-command)
 
@@ -1683,13 +1683,13 @@
 
 <p>Note, however, that in some cases you may be binding more than one
 key sequence by using a single command.  This situation can 
-arise because in ASCII, <kbd>C-i</kbd> and <kbd>TAB</kbd> have
+arise because in ASCII, <kbd>C-i</kbd> and &lt;TAB&gt; have
 the same representation.  Therefore, when Emacs sees:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">(global-set-key 
&quot;\C-i&quot; 'end-of-line)
 </pre></td></tr></table>
 
-<p>it is unclear whether the user intended to bind <kbd>C-i</kbd> or 
<kbd>TAB</kbd>.
+<p>it is unclear whether the user intended to bind <kbd>C-i</kbd> or 
&lt;TAB&gt;.
 The solution XEmacs adopts is to bind both of these key
 sequences.
 </p>
@@ -2185,7 +2185,7 @@
 </p>
 <ul>
 <li>
-Make <kbd>TAB</kbd> in C mode just insert a tab if point is in the middle of a
+Make &lt;TAB&gt; in C mode just insert a tab if point is in the middle of a
 line.
 
 <table><tr><td>&nbsp;</td><td><pre class="example">(setq c-tab-always-indent 
nil)
@@ -2279,14 +2279,14 @@
 </pre></td></tr></table>
 
 </li><li>
-Bind the function key <kbd>F1</kbd> to a command in C mode.
+Bind the function key &lt;F1&gt; to a command in C mode.
 Note that the names of function keys must be lower case.
 
 <table><tr><td>&nbsp;</td><td><pre class="example">(define-key c-mode-map 'f1 
'make-symbolic-link)
 </pre></td></tr></table>
 
 </li><li>
-Bind the shifted version of <kbd>F1</kbd> to a command.
+Bind the shifted version of &lt;F1&gt; to a command.
 
 <table><tr><td>&nbsp;</td><td><pre class="example">(define-key c-mode-map 
'(shift f1) 'make-symbolic-link)
 </pre></td></tr></table>
@@ -3635,7 +3635,7 @@
 Abort (and dump core)? (y or n)
 </pre></td></tr></table>
 
-<p>Answer each one with <kbd>y</kbd> or <kbd>n</kbd> followed by 
<kbd>RET</kbd>.
+<p>Answer each one with <kbd>y</kbd> or <kbd>n</kbd> followed by &lt;RET&gt;.
 </p>
 <p>  Saying <kbd>y</kbd> to &lsquo;<samp>Auto-save?</samp>&rsquo; causes 
immediate auto-saving of all
 modified buffers in which auto-saving is enabled.
@@ -3687,10 +3687,10 @@
 <kbd>C-g C-g</kbd> to get out of it and then start a new one.
 </p>
 <a name="IDX1559"></a>
-<p>  Second, type <kbd>M-x doctor <kbd>RET</kbd></kbd>.
+<p>  Second, type <kbd>M-x doctor &lt;RET&gt;</kbd>.
 </p>
 <p>  The doctor will make you feel better.  Each time you say something to
-the doctor, you must end it by typing <kbd>RET</kbd> <kbd>RET</kbd>.  This 
lets the
+the doctor, you must end it by typing &lt;RET&gt; &lt;RET&gt;.  This lets the
 doctor know you are finished.
 </p>
 <hr size="6">
@@ -3819,7 +3819,7 @@
 impossible.  But in any case, it is unnecessary work for us.
 </p>
 <p>  For example, suppose that you type <kbd>C-x C-f /glorp/baz.ugh
-<kbd>RET</kbd></kbd>, visiting a file which (you know) happens to be rather 
large,
+&lt;RET&gt;</kbd>, visiting a file which (you know) happens to be rather large,
 and Emacs prints out &lsquo;<samp>I feel pretty today</samp>&rsquo;.  The best 
way to report
 the bug is with a sentence like the preceding one, because it gives all the
 facts and nothing but the facts.
@@ -3843,7 +3843,7 @@
 <p>  You should not even say &ldquo;visit a file&rdquo; instead of <kbd>C-x 
C-f</kbd> unless
 you <i>know</i> that it makes no difference which visiting command is used.
 Similarly, rather than saying &ldquo;if I have three characters on the 
line,&rdquo;
-say &ldquo;after I type <kbd><kbd>RET</kbd> A B C <kbd>RET</kbd> 
C-p</kbd>,&rdquo; if that is
+say &ldquo;after I type <kbd>&lt;RET&gt; A B C &lt;RET&gt; C-p</kbd>,&rdquo; 
if that is
 the way you entered the text.
 </p>
 <p>  If you are not in Fundamental mode when the problem occurs, you should
@@ -3891,7 +3891,7 @@
 <table><tr><td>&nbsp;</td><td><pre class="example">(open-dribble-file 
&quot;~/dribble&quot;)
 </pre></td></tr></table>
 
-<p>using <kbd>Meta-<kbd>ESC</kbd></kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer just after starting
+<p>using <kbd>Meta-&lt;ESC&gt;</kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer just after starting
 Emacs.  From then on, all Emacs input will be written in the specified
 dribble file until the Emacs process is killed.
 </p>
@@ -3906,7 +3906,7 @@
 <table><tr><td>&nbsp;</td><td><pre class="example">(open-termscript 
&quot;~/termscript&quot;)
 </pre></td></tr></table>
 
-<p>using <kbd>Meta-<kbd>ESC</kbd></kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer
+<p>using <kbd>Meta-&lt;ESC&gt;</kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer
 just after starting Emacs.  From then on, all output from Emacs to the
 terminal will be written in the specified termscript file as well, until
 the Emacs process is killed.  If the problem happens when Emacs starts
Index: texi2html/Tests/xemacs_frame_res/xemacs_31.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_31.html:1.21 
texi2html/Tests/xemacs_frame_res/xemacs_31.html:1.22
--- texi2html/Tests/xemacs_frame_res/xemacs_31.html:1.21        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_31.html     Sat Apr  8 23:02:08 2006
@@ -194,7 +194,7 @@
 entire name, that process is called completion.  Completion is done for
 minibuffer (q.v.) arguments when the set of possible valid inputs is
 known; for example, on command names, buffer names, and file names.
-Completion occurs when you type <kbd>TAB</kbd>, <kbd>SPC</kbd>, or 
<kbd>RET</kbd>.
+Completion occurs when you type &lt;TAB&gt;, &lt;SPC&gt;, or &lt;RET&gt;.
 See section <a href="xemacs_9.html#SEC63">Completion</a>.
 </p>
 </dd>
@@ -209,9 +209,9 @@
 <dd><p>ASCII characters with octal codes 0 through 037, and also code 0177,
 do not have graphic images assigned to them.  These are the control
 characters.  Any control character can be typed by holding down the
-<kbd>CTRL</kbd> key and typing some other character; some have special keys
-on the keyboard.  <kbd>RET</kbd>, <kbd>TAB</kbd>, <kbd>ESC</kbd>, 
<kbd>LFD</kbd>, and
-<kbd>DEL</kbd> are all control characters.  See section <a 
href="xemacs_5.html#SEC21">Keystrokes, Key Sequences, and Key Bindings</a>.
+&lt;CTRL&gt; key and typing some other character; some have special keys
+on the keyboard.  &lt;RET&gt;, &lt;TAB&gt;, &lt;ESC&gt;, &lt;LFD&gt;, and
+&lt;DEL&gt; are all control characters.  See section <a 
href="xemacs_5.html#SEC21">Keystrokes, Key Sequences, and Key Bindings</a>.
 </p>
 </dd>
 <dt> Copyleft</dt>
@@ -258,7 +258,7 @@
 <dt> Default Argument</dt>
 <dd><p>The default for an argument is the value that is used if you do not
 specify one.  When Emacs prompts you in the minibuffer for an argument,
-the default argument is used if you just type <kbd>RET</kbd>.
+the default argument is used if you just type &lt;RET&gt;.
 See section <a href="xemacs_9.html#SEC60">The Minibuffer</a>.
 </p>
 </dd>
@@ -274,8 +274,8 @@
 are calls to the Lisp function <code>defun</code>.  See section <a 
href="xemacs_24.html#SEC218">Defuns</a>.
 </p>
 </dd>
-<dt> <kbd>DEL</kbd></dt>
-<dd><p>The <kbd>DEL</kbd> character runs the command that deletes one 
character of
+<dt> &lt;DEL&gt;</dt>
+<dd><p>The &lt;DEL&gt; character runs the command that deletes one character of
 text.  See section <a href="xemacs_7.html#SEC49">Basic Editing</a>.
 </p>
 </dd>
@@ -360,11 +360,11 @@
 echo area, accompanied by a beep.
 </p>
 </dd>
-<dt> <kbd>ESC</kbd></dt>
-<dd><p><kbd>ESC</kbd> is a character used as a prefix for typing Meta 
characters on
-keyboards lacking a <kbd>META</kbd> key.  Unlike the <kbd>META</kbd> key 
(which,
-like the <kbd>SHIFT</kbd> key, is held down while another character is
-typed), the <kbd>ESC</kbd> key is pressed and released, and applies to the
+<dt> &lt;ESC&gt;</dt>
+<dd><p>&lt;ESC&gt; is a character used as a prefix for typing Meta characters 
on
+keyboards lacking a &lt;META&gt; key.  Unlike the &lt;META&gt; key (which,
+like the &lt;SHIFT&gt; key, is held down while another character is
+typed), the &lt;ESC&gt; key is pressed and released, and applies to the
 next character typed.
 </p>
 </dd>
@@ -422,7 +422,7 @@
 just names.  All the non-Meta (q.v.) characters except for the
 Control (q.v.) character are graphic characters.  These include
 letters, digits, punctuation, and spaces; they do not include
-<kbd>RET</kbd> or <kbd>ESC</kbd>.  In Emacs, typing a graphic character inserts
+&lt;RET&gt; or &lt;ESC&gt;.  In Emacs, typing a graphic character inserts
 that character (in ordinary editing modes).  See section <a 
href="xemacs_7.html#SEC49">Basic Editing</a>.
 </p>
 </dd>
@@ -436,9 +436,9 @@
 listings of text in Emacs buffers.  See section <a 
href="xemacs_29.html#SEC345">Hardcopy Output</a>.
 </p>
 </dd>
-<dt> <kbd>HELP</kbd></dt>
-<dd><p>You can type <kbd>HELP</kbd> at any time to ask what options you have, 
or
-to ask what any command does.  <kbd>HELP</kbd> is really <kbd>Control-h</kbd>.
+<dt> &lt;HELP&gt;</dt>
+<dd><p>You can type &lt;HELP&gt; at any time to ask what options you have, or
+to ask what any command does.  &lt;HELP&gt; is really <kbd>Control-h</kbd>.
 See section <a href="xemacs_11.html#SEC71">Help</a>.
 </p>
 </dd>
@@ -540,7 +540,7 @@
 </p>
 </dd>
 <dt> M-</dt>
-<dd><p><kbd>M-</kbd> in the name of a character is an abbreviation for 
<kbd>META</kbd>,
+<dd><p><kbd>M-</kbd> in the name of a character is an abbreviation for 
&lt;META&gt;,
 one of the modifier keys that can accompany any character.
 See section <a href="xemacs_5.html#SEC21">Keystrokes, Key Sequences, and Key 
Bindings</a>.
 </p>
@@ -548,8 +548,8 @@
 <dt> M-C-</dt>
 <dd><p>&lsquo;<samp>M-C-</samp>&rsquo; in the name of a character is an 
abbreviation for
 Control-Meta; it means the same thing as &lsquo;<samp>C-M-</samp>&rsquo;.  If 
your
-terminal lacks a real <kbd>META</kbd> key, you type a Control-Meta character by
-typing <kbd>ESC</kbd> and then typing the corresponding Control character.
+terminal lacks a real &lt;META&gt; key, you type a Control-Meta character by
+typing &lt;ESC&gt; and then typing the corresponding Control character.
 See section <a href="xemacs_5.html#SEC21">C-M-</a>.
 </p>
 </dd>
@@ -591,10 +591,10 @@
 <dt> Meta</dt>
 <dd><p>Meta is the name of a modifier bit which a command character may have.
 It is present in a character if the character is typed with the
-<kbd>META</kbd> key held down.  Such characters are given names that start
+&lt;META&gt; key held down.  Such characters are given names that start
 with <kbd>Meta-</kbd>.  For example, <kbd>Meta-&lt;</kbd> is typed by holding 
down
-<kbd>META</kbd> and at the same time typing <kbd>&lt;</kbd> (which itself is 
done,
-on most terminals, by holding down <kbd>SHIFT</kbd> and typing <kbd>,</kbd>).
+&lt;META&gt; and at the same time typing <kbd>&lt;</kbd> (which itself is done,
+on most terminals, by holding down &lt;SHIFT&gt; and typing <kbd>,</kbd>).
 See section <a href="xemacs_5.html#SEC21">Meta</a>.
 </p>
 </dd>
@@ -647,7 +647,7 @@
 </p>
 </dd>
 <dt> Newline</dt>
-<dd><p><kbd>LFD</kbd> characters in the buffer terminate lines of text and are
+<dd><p>&lt;LFD&gt; characters in the buffer terminate lines of text and are
 called newlines.  See section <a href="xemacs_5.html#SEC21">Newline</a>.
 </p>
 </dd>
@@ -721,7 +721,7 @@
 significance depends on the context and on convention.  For example,
 an &ldquo;ordinary&rdquo; character as an Emacs command inserts itself; so in
 this context, a special character is any character that does not
-normally insert itself (such as <kbd>DEL</kbd>, for example), and quoting
+normally insert itself (such as &lt;DEL&gt;, for example), and quoting
 it makes it insert itself as if it were not special.  Not all contexts
 allow quoting.  See section <a href="xemacs_7.html#SEC49">Basic Editing</a>.
 </p>
@@ -779,8 +779,8 @@
 (q.v.).  See section <a href="xemacs_29.html#SEC344">Narrowing</a>.
 </p>
 </dd>
-<dt> <kbd>RET</kbd></dt>
-<dd><p><kbd>RET</kbd> is the character than runs the command to insert a
+<dt> &lt;RET&gt;</dt>
+<dd><p>&lt;RET&gt; is the character than runs the command to insert a
 newline into the text.  It is also used to terminate most arguments
 read in the minibuffer (q.v.).  See section <a 
href="xemacs_5.html#SEC21">Return</a>.
 </p>
Index: texi2html/Tests/xemacs_frame_res/xemacs_33.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_33.html:1.19 
texi2html/Tests/xemacs_frame_res/xemacs_33.html:1.20
--- texi2html/Tests/xemacs_frame_res/xemacs_33.html:1.19        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_33.html     Sat Apr  8 23:02:08 2006
@@ -411,7 +411,7 @@
 <tr><td></td><td valign="top"><a href="xemacs_13.html#SEC106"><code>C-x r 
w</code></a></td><td valign="top"><a href="xemacs_13.html#SEC106">10.4 Saving 
Window Configurations in Registers</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX700"><code>C-x 
RET</code></a></td><td valign="top"><a href="xemacs_20.html#SEC182">17.1 What 
is Mule?</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX726"><code>C-x RET 
c</code></a></td><td valign="top"><a href="xemacs_20.html#SEC189">17.8 
Specifying a Coding System</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_20.html#IDX717"><code>C-x 
<kbd>RET</kbd> C</code></a></td><td valign="top"><a 
href="xemacs_20.html#SEC187">17.6 Coding Systems</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_20.html#IDX717"><code>C-x 
&lt;RET&gt; C</code></a></td><td valign="top"><a 
href="xemacs_20.html#SEC187">17.6 Coding Systems</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX711"><code>C-x RET 
C-\</code></a></td><td valign="top"><a href="xemacs_20.html#SEC185">17.4 
Selecting an Input Method</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX724"><code>C-x RET 
f</code></a></td><td valign="top"><a href="xemacs_20.html#SEC189">17.8 
Specifying a Coding System</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX731"><code>C-x RET 
k</code></a></td><td valign="top"><a href="xemacs_20.html#SEC189">17.8 
Specifying a Coding System</a></td></tr>
Index: texi2html/Tests/xemacs_frame_res/xemacs_34.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_34.html:1.13 
texi2html/Tests/xemacs_frame_res/xemacs_34.html:1.14
--- texi2html/Tests/xemacs_frame_res/xemacs_34.html:1.13        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_34.html     Sat Apr  8 23:02:08 2006
@@ -130,7 +130,7 @@
 <tr><th><a name="INDEX0_1">E</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_7.html#IDX160"><code>END</code></a></td><td valign="top"><a 
href="xemacs_7.html#SEC51">4.2 Changing the Location of Point</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX36"><code>ESC</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC24">2.1.2 Representing Key Sequences</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>ESC</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the <kbd>META</kbd> 
Key</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>ESC</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the &lt;META&gt; 
Key</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_15.html#IDX486"><code>ESC 
(query-replace)</code></a></td><td valign="top"><a 
href="xemacs_15.html#SEC127">12.7.4 Query Replace</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX0_2">F</a></th><td></td><td></td></tr>
@@ -147,7 +147,7 @@
 <tr><td></td><td valign="top"><a 
href="xemacs_7.html#IDX159"><code>HOME</code></a></td><td valign="top"><a 
href="xemacs_7.html#SEC51">4.2 Changing the Location of Point</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX22"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 
Keystrokes as Building Blocks of Key Sequences</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#SEC23"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC23">2.1.1 
Representing Keystrokes</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the &lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX0_5">I</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#IDX1299"><code>i a <span 
class="roman">(Calendar mode)</span></code></a></td><td valign="top"><a 
href="xemacs_29.html#SEC323">26.5.7 Special Diary Entries</a></td></tr>
@@ -258,7 +258,7 @@
 <tr><td></td><td valign="top"><a 
href="xemacs_23.html#SEC208"><code>M-}</code></a></td><td valign="top"><a 
href="xemacs_23.html#SEC208">20.4 Paragraphs</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#IDX1149"><code>M-} <span 
class="roman">(Calendar mode)</span></code></a></td><td valign="top"><a 
href="xemacs_29.html#SEC303">26.1.1.1 Motion by Integral Days, Weeks, Months, 
Years</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_17.html#IDX563"><code>M-~</code></a></td><td valign="top"><a 
href="xemacs_17.html#SEC137">14.3 Saving Files</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>META</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the <kbd>META</kbd> 
Key</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>META</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the &lt;META&gt; 
Key</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX20"><code>meta 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 
Keystrokes as Building Blocks of Key Sequences</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 </table>
Index: texi2html/Tests/xemacs_frame_res/xemacs_35.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_35.html:1.17 
texi2html/Tests/xemacs_frame_res/xemacs_35.html:1.18
--- texi2html/Tests/xemacs_frame_res/xemacs_35.html:1.17        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_35.html     Sat Apr  8 23:02:08 2006
@@ -152,7 +152,7 @@
 <tr><td></td><td valign="top"><a href="xemacs_15.html#IDX483"><code>SPC 
(query-replace)</code></a></td><td valign="top"><a 
href="xemacs_15.html#SEC127">12.7.4 Query Replace</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX23"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 
Keystrokes as Building Blocks of Key Sequences</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#SEC23"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC23">2.1.1 
Representing Keystrokes</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the &lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX1_6">T</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#IDX1206"><code>t <span 
class="roman">(Calendar mode)</span></code></a></td><td valign="top"><a 
href="xemacs_29.html#SEC309">26.2 LaTeX Calendar</a></td></tr>
Index: texi2html/Tests/xemacs_frame_res/xemacs_43.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_43.html:1.11 
texi2html/Tests/xemacs_frame_res/xemacs_43.html:1.12
--- texi2html/Tests/xemacs_frame_res/xemacs_43.html:1.11        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_43.html     Sat Apr  8 23:02:08 2006
@@ -209,7 +209,7 @@
 <tr><td></td><td valign="top"><a 
href="xemacs_29.html#IDX1311"><code>mark-holidays-in-calendar</code></a></td><td
 valign="top"><a href="xemacs_29.html#SEC325">26.5.8.1 Customizing the 
Calendar</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_12.html#IDX305"><code>mark-ring</code></a></td><td valign="top"><a 
href="xemacs_12.html#SEC84">9.1.4 The Mark Ring</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_12.html#IDX304"><code>mark-ring-max</code></a></td><td 
valign="top"><a href="xemacs_12.html#SEC84">9.1.4 The Mark Ring</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX40"><code>meta-flag</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the <kbd>META</kbd> 
Key</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX40"><code>meta-flag</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the &lt;META&gt; 
Key</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_9.html#IDX218"><code>minibuffer-confirm-incomplete</code></a></td><td
 valign="top"><a href="xemacs_9.html#SEC62">6.2 Editing in the 
Minibuffer</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_9.html#IDX228"><code>minibuffer-confirm-incomplete</code></a></td><td
 valign="top"><a href="xemacs_9.html#SEC67">6.3.4 Completion 
Options</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_30.html#IDX1514"><code>minibuffer-local-completion-map</code></a></td><td
 valign="top"><a href="xemacs_30.html#SEC368">27.4.1 Keymaps</a></td></tr>
Index: texi2html/Tests/xemacs_frame_res/xemacs_47.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_47.html:1.13 
texi2html/Tests/xemacs_frame_res/xemacs_47.html:1.14
--- texi2html/Tests/xemacs_frame_res/xemacs_47.html:1.13        Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_47.html     Sat Apr  8 23:02:08 2006
@@ -174,12 +174,12 @@
 <tr><td></td><td valign="top"><a href="xemacs_30.html#SEC377">key rebinding, 
permanent</a></td><td valign="top"><a href="xemacs_30.html#SEC377">27.6 The 
Init File</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_30.html#SEC369">key rebinding, 
this session</a></td><td valign="top"><a href="xemacs_30.html#SEC369">27.4.2 
Changing Key Bindings</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_30.html#SEC363">keyboard 
macros</a></td><td valign="top"><a href="xemacs_30.html#SEC363">27.3 Keyboard 
Macros</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX42">keycode</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX42">keycode</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#SEC29">keymap</a></td><td 
valign="top"><a href="xemacs_5.html#SEC29">2.3 Keys and Commands</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_30.html#SEC368">keymap</a></td><td valign="top"><a 
href="xemacs_30.html#SEC368">27.4.1 Keymaps</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC22">keystroke</a></td><td valign="top"><a 
href="xemacs_5.html#SEC22">2.1 Keystrokes as Building Blocks of Key 
Sequences</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX19">keysym</a></td><td 
valign="top"><a href="xemacs_5.html#SEC22">2.1 Keystrokes as Building Blocks of 
Key Sequences</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX41">keysyms</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX41">keysyms</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX60">Kill Buffer menu 
item</a></td><td valign="top"><a href="xemacs_5.html#SEC31">2.4.1 The File 
Menu</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_12.html#SEC91">kill 
ring</a></td><td valign="top"><a href="xemacs_12.html#SEC91">9.5 
Yanking</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_12.html#SEC87">killing</a></td><td valign="top"><a 
href="xemacs_12.html#SEC87">9.4 Deletion and Killing</a></td></tr>
@@ -246,7 +246,7 @@
 <tr><td></td><td valign="top"><a href="xemacs_29.html#SEC342">mode, 
Term</a></td><td valign="top"><a href="xemacs_29.html#SEC342">26.7.5 Term 
Mode</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_17.html#IDX539">modified 
(buffer)</a></td><td valign="top"><a href="xemacs_17.html#SEC136">14.2 Visiting 
Files</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX18">modifier 
key</a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 Keystrokes as 
Building Blocks of Key Sequences</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_5.html#IDX43">modifier 
mapping</a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 Assignment 
of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_5.html#IDX43">modifier 
mapping</a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 Assignment 
of the &lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#SEC312">moon, phases 
of</a></td><td valign="top"><a href="xemacs_29.html#SEC312">26.2.3 Phases of 
the Moon</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_12.html#SEC86">mouse 
operations</a></td><td valign="top"><a href="xemacs_12.html#SEC86">9.3 
Additional Mouse Operations</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_12.html#SEC85">mouse 
selection</a></td><td valign="top"><a href="xemacs_12.html#SEC85">9.2 Selecting 
Text with the Mouse</a></td></tr>
Index: texi2html/Tests/xemacs_frame_res/xemacs_5.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_5.html:1.25 
texi2html/Tests/xemacs_frame_res/xemacs_5.html:1.26
--- texi2html/Tests/xemacs_frame_res/xemacs_5.html:1.25 Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_5.html      Sat Apr  8 23:02:08 2006
@@ -73,9 +73,9 @@
 </td></tr>
 <tr><td align="left" valign="top"><a href="#SEC25">2.1.3 String Key 
Sequences</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     
Available for upward compatibility.
 </td></tr>
-<tr><td align="left" valign="top"><a href="#SEC26">2.1.4 Assignment of the 
<kbd>META</kbd> Key</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"> 
                Using <kbd>ESC</kbd> to represent <kbd>Meta</kbd>
+<tr><td align="left" valign="top"><a href="#SEC26">2.1.4 Assignment of the 
&lt;META&gt; Key</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">    
             Using &lt;ESC&gt; to represent &lt;Meta&gt;
 </td></tr>
-<tr><td align="left" valign="top"><a href="#SEC27">2.1.5 Assignment of the 
<kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">     Adding modifier keys on certain keyboards.
+<tr><td align="left" valign="top"><a href="#SEC27">2.1.5 Assignment of the 
&lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">     Adding modifier keys on certain keyboards.
 </td></tr>
 <tr><td align="left" valign="top"><a href="#SEC28">2.2 Representation of 
Characters</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"> How 
characters appear in Emacs buffers.
 </td></tr>
@@ -108,7 +108,7 @@
 which defines 128 different character codes.  Some of these codes are
 assigned graphic symbols like &lsquo;<samp>a</samp>&rsquo; and 
&lsquo;<samp>=</samp>&rsquo;; the rest are
 control characters, such as <kbd>Control-a</kbd> (also called <kbd>C-a</kbd>).
-<kbd>C-a</kbd> means you hold down the <kbd>CTRL</kbd> key and then press
+<kbd>C-a</kbd> means you hold down the &lt;CTRL&gt; key and then press
 <kbd>a</kbd>.
 </p>
 <p>   Keybindings in XEmacs are not restricted to the set of
@@ -215,7 +215,7 @@
 </p>
 <dl compact="compact">
 <dt> <kbd>(control a)</kbd></dt>
-<dd><p>Pressing <kbd>CTRL</kbd> and <kbd>a</kbd> simultaneously.
+<dd><p>Pressing &lt;CTRL&gt; and <kbd>a</kbd> simultaneously.
 </p></dd>
 <dt> <kbd>(control ?a)</kbd></dt>
 <dd><p>Another way of writing the keystroke <kbd>C-a</kbd>.
@@ -224,18 +224,18 @@
 <dd><p>Yet another way of writing the keystroke <kbd>C-a</kbd>.
 </p></dd>
 <dt> <kbd>(break)</kbd></dt>
-<dd><p>Pressing the <kbd>BREAK</kbd> key.
+<dd><p>Pressing the &lt;BREAK&gt; key.
 </p></dd>
 <dt> <kbd>(control meta button2up)</kbd></dt>
-<dd><p>Release the middle mouse button, while pressing <kbd>CTRL</kbd> and
-<kbd>META</kbd>. 
+<dd><p>Release the middle mouse button, while pressing &lt;CTRL&gt; and
+&lt;META&gt;. 
 </p></dd>
 </dl>
 <a name="IDX32"></a>
 <p>  Note: As you define keystrokes, you can use the <kbd>shift</kbd> key only
 as a modifier with characters that do not have a second keysym on the
 same key, such as <kbd>backspace</kbd> and <kbd>tab</kbd>.  It is an error to
-define a keystroke using the <kbd>shift</kbd> modifier with keysyms such as
+define a keystroke using the &lt;shift&gt; modifier with keysyms such as
 <kbd>a</kbd> and <kbd>=</kbd>.  The correct forms are <kbd>A</kbd> and 
<kbd>+</kbd>.
 </p>
 <hr size="6">
@@ -318,7 +318,7 @@
 k)]</kbd> is not a key, because the <kbd>(control f)</kbd> is a complete key
 sequence in itself.  You cannot give <kbd>[(control f (control k)]</kbd> an
 independent meaning as a command while <kbd>(control f)</kbd> is a complete
-sequence, because Emacs would understand <kbd>C-f C-k</kbd> as two
+sequence, because Emacs would understand &lt;C-f C-k&gt; as two
 commands.
 </p>
 <p> The predefined prefix key sequences in Emacs are <kbd>(control c)</kbd>,
@@ -394,28 +394,28 @@
 <td valign="middle" align="left">[<a href="xemacs_33.html#SEC413" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="xemacs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="subsection"> 2.1.4 Assignment of the <kbd>META</kbd> Key </h3>
+<h3 class="subsection"> 2.1.4 Assignment of the &lt;META&gt; Key </h3>
  
 <p>  Not all terminals have the complete set of modifiers.  
-Terminals that have a <kbd>Meta</kbd> key allow you to type Meta characters
+Terminals that have a &lt;Meta&gt; key allow you to type Meta characters
 by just holding that key down.  To type <kbd>Meta-a</kbd>, hold down
-<kbd>META</kbd> and press <kbd>a</kbd>.  On those terminals, the 
<kbd>META</kbd> key
-works like the <kbd>SHIFT</kbd> key.  Such a key is not always labeled
-<kbd>META</kbd>, however, as this function is often a special option for a
+&lt;META&gt; and press <kbd>a</kbd>.  On those terminals, the &lt;META&gt; key
+works like the &lt;SHIFT&gt; key.  Such a key is not always labeled
+&lt;META&gt;, however, as this function is often a special option for a
 key with some other primary purpose.
 </p>
-<p>  If there is no <kbd>META</kbd> key, you can still type Meta characters
-using two-character sequences starting with <kbd>ESC</kbd>.  To enter
-<kbd>M-a</kbd>, you could type <kbd><kbd>ESC</kbd> a</kbd>.  To enter 
<kbd>C-M-a</kbd>, you
-would type <kbd>ESC C-a</kbd>.  <kbd>ESC</kbd> is allowed on terminals with
+<p>  If there is no &lt;META&gt; key, you can still type Meta characters
+using two-character sequences starting with &lt;ESC&gt;.  To enter
+<kbd>M-a</kbd>, you could type <kbd>&lt;ESC&gt; a</kbd>.  To enter 
<kbd>C-M-a</kbd>, you
+would type <kbd>ESC C-a</kbd>.  &lt;ESC&gt; is allowed on terminals with
 Meta keys, too, in case you have formed a habit of using it.
 </p>
-<p>If you are running under X and do not have a <kbd>META</kbd> key, it 
-is possible to reconfigure some other key to be a <kbd>META</kbd> 
-key.  See section <a href="#SEC27">Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys</a>. 
+<p>If you are running under X and do not have a &lt;META&gt; key, it 
+is possible to reconfigure some other key to be a &lt;META&gt; 
+key.  See section <a href="#SEC27">Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys</a>. 
 </p>
 <a name="IDX40"></a>
-<p>  Emacs believes the terminal has a <kbd>META</kbd> key if the variable
+<p>  Emacs believes the terminal has a &lt;META&gt; key if the variable
 <code>meta-flag</code> is non-<code>nil</code>.  Normally this is set 
automatically
 according to the termcap entry for your terminal type.  However, sometimes
 the termcap entry is wrong, and then it is useful to set this variable
@@ -443,14 +443,14 @@
 <td valign="middle" align="left">[<a href="xemacs_33.html#SEC413" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="xemacs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="subsection"> 2.1.5 Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys </h3>
+<h3 class="subsection"> 2.1.5 Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys </h3>
 
-<p>  Most keyboards do not, by default, have <kbd>SUPER</kbd> or 
<kbd>HYPER</kbd>
-modifier keys.  Under X, you can simulate the <kbd>SUPER</kbd> or
-<kbd>HYPER</kbd> key if you want to bind keys to sequences using 
<kbd>super</kbd>
+<p>  Most keyboards do not, by default, have &lt;SUPER&gt; or &lt;HYPER&gt;
+modifier keys.  Under X, you can simulate the &lt;SUPER&gt; or
+&lt;HYPER&gt; key if you want to bind keys to sequences using <kbd>super</kbd>
 and <kbd>hyper</kbd>.  You can use the <code>xmodmap</code> program to do this.
 </p>
-<p>  For example, to turn your <kbd>CAPS-LOCK</kbd> key into a 
<kbd>SUPER</kbd> key,
+<p>  For example, to turn your &lt;CAPS-LOCK&gt; key into a &lt;SUPER&gt; key,
 do the following:
 </p>
 <p>  Create a file called <code>~/.xmodmap</code>.  In this file, place the 
lines
@@ -466,7 +466,7 @@
 the key called <code>Super_L</code> should be a modifier key, which produces 
the
 <code>Mod2</code> modifier.
 </p>
-<p>To create a <kbd>META</kbd> or <kbd>HYPER</kbd> key instead of a 
<kbd>SUPER</kbd> key,
+<p>To create a &lt;META&gt; or &lt;HYPER&gt; key instead of a &lt;SUPER&gt; 
key,
 replace the word <code>Super</code> above with <code>Meta</code> or 
<code>Hyper</code>.
 </p>
 <p>Just after you start up X, execute the command <code>xmodmap 
/.xmodmap</code>.
@@ -587,7 +587,7 @@
 <code>Meta</code>; what matters is that a modifier bit is generated by a 
 keycode which is bound to the keysym <code>Meta_L</code> or 
<code>Meta_R</code>.
 </p>
-<p> Therefore, if you want to make a <kbd>META</kbd> key, the right way 
+<p> Therefore, if you want to make a &lt;META&gt; key, the right way 
 is to make the keycode in question generate both a <code>Meta</code> keysym 
 and some previously-unassigned modifier bit.
 </p>
@@ -617,8 +617,8 @@
 sequences to create key bindings. 
 </p>
 <p>  ASCII graphic characters in Emacs buffers are displayed with their
-graphics.  <kbd>LFD</kbd> is the same as a newline character; it is displayed
-by starting a new line.  <kbd>TAB</kbd> is displayed by moving to the next
+graphics.  &lt;LFD&gt; is the same as a newline character; it is displayed
+by starting a new line.  &lt;TAB&gt; is displayed by moving to the next
 tab stop column (usually every 8 spaces).  Other control characters are
 displayed as a caret (&lsquo;<samp>^</samp>&rsquo;) followed by the 
non-control version of
 the character; thus, <kbd>C-a</kbd> is displayed as 
&lsquo;<samp>^A</samp>&rsquo;.  Non-ASCII
Index: texi2html/Tests/xemacs_frame_res/xemacs_6.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_6.html:1.25 
texi2html/Tests/xemacs_frame_res/xemacs_6.html:1.26
--- texi2html/Tests/xemacs_frame_res/xemacs_6.html:1.25 Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_6.html      Sat Apr  8 23:02:08 2006
@@ -61,7 +61,7 @@
 </tr></table>
 <h1 class="chapter"> 3. Entering and Exiting Emacs </h1>
 
-<p>  The usual way to invoke XEmacs is to type <kbd>xemacs 
<kbd>RET</kbd></kbd> at
+<p>  The usual way to invoke XEmacs is to type <kbd>xemacs &lt;RET&gt;</kbd> at
 the shell.  XEmacs clears the screen and then displays an initial
 advisory message and copyright notice.  You can begin typing XEmacs
 commands immediately afterward.
Index: texi2html/Tests/xemacs_frame_res/xemacs_7.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_7.html:1.23 
texi2html/Tests/xemacs_frame_res/xemacs_7.html:1.24
--- texi2html/Tests/xemacs_frame_res/xemacs_7.html:1.23 Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_7.html      Sat Apr  8 23:02:08 2006
@@ -130,18 +130,18 @@
 </p>
 <a name="IDX132"></a>
 <a name="IDX133"></a>
-<p>   To <em>delete</em> text you have just inserted, use <kbd>BS</kbd>.  
<kbd>BS</kbd>
+<p>   To <em>delete</em> text you have just inserted, use &lt;BS&gt;.  
&lt;BS&gt;
 deletes the character <em>before</em> the cursor (not the one that the
 cursor is on top of or under; that is the character <var>after</var> the
 cursor).  The cursor and all characters after it move backwards.
-Therefore, if you type a printing character and then type <kbd>BS</kbd>, they
+Therefore, if you type a printing character and then type &lt;BS&gt;, they
 cancel out.
 </p>
 <a name="IDX134"></a>
 <a name="IDX135"></a>
-<p>   To end a line and start typing a new one, type <kbd>RET</kbd>.  This
+<p>   To end a line and start typing a new one, type &lt;RET&gt;.  This
 inserts a newline character in the buffer.  If point is in the middle of
-a line, <kbd>RET</kbd> splits the line.  Typing <kbd>DEL</kbd> when the cursor 
is
+a line, &lt;RET&gt; splits the line.  Typing &lt;DEL&gt; when the cursor is
 at the beginning of a line deletes the preceding newline, thus joining
 the line with the preceding line.
 </p>
@@ -156,7 +156,7 @@
 <a name="IDX136"></a>
 <a name="IDX137"></a>
 <a name="IDX138"></a>
-<p>  Direct insertion works for printing characters and <kbd>SPC</kbd>, but 
other
+<p>  Direct insertion works for printing characters and &lt;SPC&gt;, but other
 characters act as editing commands and do not insert themselves.  If you
 need to insert a control character or a character whose code is above 200
 octal, you must <em>quote</em> it by typing the character <kbd>Control-q</kbd>
@@ -172,7 +172,7 @@
 <kbd>C-q</kbd> followed by a sequence of octal digits inserts the character
 with the specified octal character code.  You can use any number of
 octal digits; any non-digit terminates the sequence.  If the terminating
-character is <kbd>RET</kbd>, it serves only to terminate the sequence; any
+character is &lt;RET&gt;, it serves only to terminate the sequence; any
 other non-digit is itself used as input after terminating the sequence.
 (The use of octal sequences is disabled in ordinary non-binary Overwrite
 mode, to give you a convenient way to insert a digit instead of
@@ -185,11 +185,11 @@
 <a name="IDX139"></a>
 <a name="IDX140"></a>
 <a name="IDX141"></a>
-<p>  Customization information: <kbd>DEL</kbd>, in most modes, runs the command
-<code>backward-or-forward-delete-char</code>; <kbd>RET</kbd> runs the command
+<p>  Customization information: &lt;DEL&gt;, in most modes, runs the command
+<code>backward-or-forward-delete-char</code>; &lt;RET&gt; runs the command
 <code>newline</code>, and self-inserting printing characters run the command
 <code>self-insert</code>, which inserts whatever character was typed to invoke
-it.  Some major modes rebind <kbd>DEL</kbd> to other commands.
+it.  Some major modes rebind &lt;DEL&gt; to other commands.
 </p>
 <hr size="6">
 <a name="Moving-Point"></a>
@@ -217,7 +217,7 @@
 clicking the left mouse button where you want to move to.
 </p>
 <p>  NOTE: Many of the following commands have two versions, one that uses
-the function keys (e.g. <kbd>LEFT</kbd> or <kbd>END</kbd>) and one that 
doesn't.
+the function keys (e.g. &lt;LEFT&gt; or &lt;END&gt;) and one that doesn't.
 The former versions may only be available on X terminals (i.e. not on
 TTY's), but the latter are available on all terminals.
 </p>
@@ -385,7 +385,7 @@
 <h2 class="section"> 4.3 Erasing Text </h2>
 
 <dl compact="compact">
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Delete the character before or after point
 (<code>backward-or-forward-delete-char</code>).  You can customize
 this behavior by setting the variable <code>delete-key-deletes-forward</code>.
@@ -399,7 +399,7 @@
 <dt> <kbd>M-d</kbd></dt>
 <dd><p>Kill forward to the end of the next word (<code>kill-word</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to the beginning of the previous word
 (<code>backward-kill-word</code>).
 </p></dd>
@@ -408,7 +408,7 @@
 <a name="IDX183"></a>
 <a name="IDX184"></a>
 <a name="IDX185"></a>
-<p>  You already know about the <kbd>DEL</kbd> key which deletes the character
+<p>  You already know about the &lt;DEL&gt; key which deletes the character
 before point (that is, before the cursor).  Another key, <kbd>Control-d</kbd>
 (<kbd>C-d</kbd> for short), deletes the character after point (that is, the
 character that the cursor is on).  This shifts the rest of the text on
@@ -454,12 +454,12 @@
 <p>  Consider a file named &lsquo;<tt>/usr/rms/foo.c</tt>&rsquo;.  To begin 
editing
 this file from Emacs, type:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-f /usr/rms/foo.c 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-f /usr/rms/foo.c 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>Here the file name is given as an <em>argument</em> to the command <kbd>C-x
 C-f</kbd> (<code>find-file</code>).  That command uses the <em>minibuffer</em> 
to
-read the argument, and you type <kbd>RET</kbd> to terminate the argument
+read the argument, and you type &lt;RET&gt; to terminate the argument
 (see section <a href="xemacs_9.html#SEC60">The Minibuffer</a>).
 </p>
 <p>  You can also use the <b>Open...</b> menu item from the <b>File</b> menu, 
then
@@ -505,7 +505,7 @@
 <h2 class="section"> 4.5 Help </h2>
 
 <p>  If you forget what a key does, you can find out with the Help
-character, which is <kbd>C-h</kbd> (or <kbd>F1</kbd>, which is an alias for
+character, which is <kbd>C-h</kbd> (or &lt;F1&gt;, which is an alias for
 <kbd>C-h</kbd>).  Type <kbd>C-h k</kbd> followed by the key you want to know
 about; for example, <kbd>C-h k C-n</kbd> tells you all about what 
<kbd>C-n</kbd>
 does.  <kbd>C-h</kbd> is a prefix key; <kbd>C-h k</kbd> is just one of its
@@ -553,13 +553,13 @@
 <a name="IDX189"></a>
 <a name="IDX190"></a>
 <p>  When you want to insert a new line of text before an existing line, you
-can do it by typing the new line of text, followed by <kbd>RET</kbd>.
+can do it by typing the new line of text, followed by &lt;RET&gt;.
 However, it may be easier to see what you are doing if you first make a
 blank line and then insert the desired text into it.  This is easy to do
 using the key <kbd>C-o</kbd> (<code>open-line</code>), which inserts a newline
 after point but leaves point in front of the newline.  After <kbd>C-o</kbd>,
 type the text for the new line.  <kbd>C-o F O O</kbd> has the same effect as
-<kbd>F O O <kbd>RET</kbd></kbd>, except for the final location of point.
+<kbd>F O O &lt;RET&gt;</kbd>, except for the final location of point.
 </p>
 <p>  You can make several blank lines by typing <kbd>C-o</kbd> several times, 
or
 by giving it a numeric argument to tell it how many blank lines to make.
@@ -596,7 +596,7 @@
 <h2 class="section"> 4.7 Continuation Lines </h2>
 
 <p>  If you add too many characters to one line without breaking it with
-<kbd>RET</kbd>, the line will grow to occupy two (or more) lines on the
+&lt;RET&gt;, the line will grow to occupy two (or more) lines on the
 screen, with a curved arrow at the extreme right margin of all but the
 last of them.  The curved arrow says that the following screen line is
 not really a distinct line in the text, but just the <em>continuation</em>
@@ -780,10 +780,10 @@
 <a name="IDX202"></a>
 <a name="IDX203"></a>
 <a name="IDX204"></a>
-<p>  If your keyboard has a <kbd>META</kbd> key (labelled with a diamond on
+<p>  If your keyboard has a &lt;META&gt; key (labelled with a diamond on
 Sun-type keyboards and labelled &lsquo;<samp>Alt</samp>&rsquo; on some other 
keyboards), the
 easiest way to specify a numeric argument is to type digits and/or a
-minus sign while holding down the <kbd>META</kbd> key.  For example,
+minus sign while holding down the &lt;META&gt; key.  For example,
 </p><table><tr><td>&nbsp;</td><td><pre class="example">M-5 C-n
 </pre></td></tr></table>
 <p>would move down five lines.  The characters <kbd>Meta-1</kbd>, 
<kbd>Meta-2</kbd>,
Index: texi2html/Tests/xemacs_frame_res/xemacs_9.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_9.html:1.22 
texi2html/Tests/xemacs_frame_res/xemacs_9.html:1.23
--- texi2html/Tests/xemacs_frame_res/xemacs_9.html:1.22 Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_9.html      Sat Apr  8 23:02:08 2006
@@ -78,13 +78,13 @@
 <a name="IDX211"></a>
 <p>  Sometimes a <em>default argument</em> appears in parentheses after the
 colon; it, too, is part of the prompt.  The default is used as the
-argument value if you enter an empty argument (e.g., by just typing 
<kbd>RET</kbd>).
+argument value if you enter an empty argument (e.g., by just typing 
&lt;RET&gt;).
 For example, commands that read buffer names always show a default, which
-is the name of the buffer that will be used if you type just <kbd>RET</kbd>.
+is the name of the buffer that will be used if you type just &lt;RET&gt;.
 </p>
 <a name="IDX212"></a>
 <p>  The simplest way to enter a minibuffer argument is to type the text
-you want, terminated by <kbd>RET</kbd> which exits the minibuffer.  You can
+you want, terminated by &lt;RET&gt; which exits the minibuffer.  You can
 cancel the command that wants the argument, and get out of the
 minibuffer, by typing <kbd>C-g</kbd>.
 </p>
@@ -161,7 +161,7 @@
 nearby directories, use <kbd>..</kbd>; thus, if you type
 <kbd>../lisp/simple.el</kbd>, you will get the file named
 &lsquo;<tt>/u2/emacs/lisp/simple.el</tt>&rsquo;.  Alternatively, you can kill 
with
-<kbd>M-<kbd>DEL</kbd></kbd> the directory names you don't want (see section <a 
href="xemacs_23.html#SEC206">Words</a>).
+<kbd>M-&lt;DEL&gt;</kbd> the directory names you don't want (see section <a 
href="xemacs_23.html#SEC206">Words</a>).
 </p>
 <p>  If you don't want any of the default, you can kill it with <kbd>C-a
 C-k</kbd>.  But you don't need to kill the default; you can simply ignore it.
@@ -212,7 +212,7 @@
 usual XEmacs commands are available for editing the text of an argument
 you are entering.
 </p>
-<p>  Since <kbd>RET</kbd> in the minibuffer is defined to exit the minibuffer,
+<p>  Since &lt;RET&gt; in the minibuffer is defined to exit the minibuffer,
 you can't use it to insert a newline in the minibuffer.  To do that,
 type <kbd>C-o</kbd> or <kbd>C-q C-j</kbd>.  (Recall that a newline is really 
the
 character control-J.)
@@ -290,8 +290,8 @@
 argument, then XEmacs visibly fills in the rest, or as much as
 can be determined from the part you have typed.
 </p>
-<p>  When completion is available, certain keys&mdash;<kbd>TAB</kbd>, 
<kbd>RET</kbd>, and
-<kbd>SPC</kbd>&mdash;are rebound to complete the text present in the
+<p>  When completion is available, certain keys&mdash;&lt;TAB&gt;, 
&lt;RET&gt;, and
+&lt;SPC&gt;&mdash;are rebound to complete the text present in the
 minibuffer into a longer string that it stands for, by matching it
 against a set of <em>completion alternatives</em> provided by the command
 reading the argument.  <kbd>?</kbd> is defined to display a list of possible
@@ -303,8 +303,8 @@
 against all the command names, find any additional name characters
 implied by the ones already present in the minibuffer, and add those
 characters to the ones you have given.  This is what makes it possible
-to type <kbd>M-x inse <kbd>SPC</kbd> b <kbd>RET</kbd></kbd> instead of <kbd>M-x
-insert-buffer <kbd>RET</kbd></kbd> (for example).
+to type <kbd>M-x inse &lt;SPC&gt; b &lt;RET&gt;</kbd> instead of <kbd>M-x
+insert-buffer &lt;RET&gt;</kbd> (for example).
 </p>
 <p>  Case is normally significant in completion because it is significant
 in most of the names that you can complete (buffer names, file names and
@@ -315,7 +315,7 @@
 <p>When a completion list is displayed, the completions will highlight as
 you move the mouse over them.  Clicking the middle mouse button on any 
 highlighted completion will &ldquo;select&rdquo; it just as if you had typed 
it in
-and hit <kbd>RET</kbd>.
+and hit &lt;RET&gt;.
 </p>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#SEC64">6.3.1 Completion 
Example</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -349,23 +349,23 @@
 </tr></table>
 <h3 class="subsection"> 6.3.1 Completion Example </h3>
 
-<p>  A concrete example may help here.  If you type <kbd>M-x au 
<kbd>TAB</kbd></kbd>,
-the <kbd>TAB</kbd> looks for alternatives (in this case, command names) that
+<p>  A concrete example may help here.  If you type <kbd>M-x au 
&lt;TAB&gt;</kbd>,
+the &lt;TAB&gt; looks for alternatives (in this case, command names) that
 start with &lsquo;<samp>au</samp>&rsquo;.  There are several, including
 <code>auto-fill-mode</code> and <code>auto-save-mode</code>&mdash;but they are 
all the
 same as far as <code>auto</code>, so the &lsquo;<samp>au</samp>&rsquo; in the 
minibuffer changes
 to &lsquo;<samp>auto</samp>&rsquo;.
 </p>
-<p>  If you type <kbd>TAB</kbd> again immediately, there are multiple
+<p>  If you type &lt;TAB&gt; again immediately, there are multiple
 possibilities for the very next character&mdash;it could be any of
-&lsquo;<samp>c-</samp>&rsquo;&mdash;so no more characters are added; instead, 
<kbd>TAB</kbd>
+&lsquo;<samp>c-</samp>&rsquo;&mdash;so no more characters are added; instead, 
&lt;TAB&gt;
 displays a list of all possible completions in another window.
 </p>
-<p>  If you go on to type <kbd>-f <kbd>TAB</kbd></kbd>, this <kbd>TAB</kbd> 
sees
+<p>  If you go on to type <kbd>-f &lt;TAB&gt;</kbd>, this &lt;TAB&gt; sees
 &lsquo;<samp>auto-f</samp>&rsquo;.  The only command name starting this way is
 <code>auto-fill-mode</code>, so completion fills in the rest of that.  You now
 have &lsquo;<samp>auto-fill-mode</samp>&rsquo; in the minibuffer after typing 
just <kbd>au
-<kbd>TAB</kbd> f <kbd>TAB</kbd></kbd>.  Note that <kbd>TAB</kbd> has this 
effect because in
+&lt;TAB&gt; f &lt;TAB&gt;</kbd>.  Note that &lt;TAB&gt; has this effect 
because in
 the minibuffer it is bound to the command <code>minibuffer-complete</code>
 when completion is available.
 </p>
@@ -394,15 +394,15 @@
 when completion is available.
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Complete the text in the minibuffer as much as possible
 (<code>minibuffer-complete</code>).
 </p></dd>
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>Complete the minibuffer text, but don't go beyond one word
 (<code>minibuffer-complete-word</code>).
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>Submit the text in the minibuffer as the argument, possibly completing
 first as described below (<code>minibuffer-complete-and-exit</code>).
 </p></dd>
@@ -410,11 +410,11 @@
 <dd><p>Print a list of all possible completions of the text in the minibuffer
 (<code>minibuffer-list-completions</code>).
 </p></dd>
-<dt> <kbd><kbd>button2</kbd></kbd></dt>
+<dt> <kbd>&lt;button2&gt;</kbd></dt>
 <dd><p>Select the highlighted text under the mouse as a minibuffer response.
 When the minibuffer is being used to prompt the user for a completion,
 any valid completions which are visible on the screen will be highlighted
-when the mouse moves over them.  Clicking <kbd>button2</kbd> will select the
+when the mouse moves over them.  Clicking &lt;button2&gt; will select the
 highlighted completion and exit the minibuffer.  
 (<code>minibuf-select-highlighted-completion</code>).
 </p></dd>
@@ -422,12 +422,12 @@
 
 <a name="IDX220"></a>
 <a name="IDX221"></a>
-<p>  <kbd>SPC</kbd> completes much like <kbd>TAB</kbd>, but never goes beyond 
the
+<p>  &lt;SPC&gt; completes much like &lt;TAB&gt;, but never goes beyond the
 next hyphen or space.  If you have &lsquo;<samp>auto-f</samp>&rsquo; in the 
minibuffer and
-type <kbd>SPC</kbd>, it finds that the completion is 
&lsquo;<samp>auto-fill-mode</samp>&rsquo;,
+type &lt;SPC&gt;, it finds that the completion is 
&lsquo;<samp>auto-fill-mode</samp>&rsquo;,
 but it stops completing after &lsquo;<samp>fill-</samp>&rsquo;.  This gives
-&lsquo;<samp>auto-fill-</samp>&rsquo;.  Another <kbd>SPC</kbd> at this point 
completes all the
-way to &lsquo;<samp>auto-fill-mode</samp>&rsquo;.  <kbd>SPC</kbd> in the 
minibuffer when
+&lsquo;<samp>auto-fill-</samp>&rsquo;.  Another &lt;SPC&gt; at this point 
completes all the
+way to &lsquo;<samp>auto-fill-mode</samp>&rsquo;.  &lt;SPC&gt; in the 
minibuffer when
 completion is available runs the command
 <code>minibuffer-complete-word</code>.
 </p>
@@ -445,9 +445,9 @@
 </p>
 <a name="IDX223"></a>
 </dd>
-<dt> <kbd><kbd>PRIOR</kbd></kbd></dt>
+<dt> <kbd>&lt;PRIOR&gt;</kbd></dt>
 <dt> <kbd>M-v</kbd></dt>
-<dd><p>Typing <kbd>PRIOR</kbd> or <kbd>M-v</kbd>, while in the minibuffer, 
selects the
+<dd><p>Typing &lt;PRIOR&gt; or <kbd>M-v</kbd>, while in the minibuffer, 
selects the
 window showing the completion list buffer
 (<code>switch-to-completions</code>).  This paves the way for using the
 commands below.  (Selecting that window in the usual ways has the same
@@ -455,26 +455,26 @@
 </p>
 <a name="IDX224"></a>
 </dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
-<dd><p>Typing <kbd>RET</kbd> <em>in the completion list buffer</em> chooses the
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
+<dd><p>Typing &lt;RET&gt; <em>in the completion list buffer</em> chooses the
 completion that point is in or next to (<code>choose-completion</code>).  To
 use this command, you must first switch windows to the window that shows
 the list of completions.
 </p>
 <a name="IDX225"></a>
 </dd>
-<dt> <kbd><kbd>RIGHT</kbd></kbd></dt>
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;RIGHT&gt;</kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dt> <kbd>C-f</kbd></dt>
-<dd><p>Typing the right-arrow key <kbd>RIGHT</kbd>, <kbd>TAB</kbd> or 
<kbd>C-f</kbd> <em>in
+<dd><p>Typing the right-arrow key &lt;RIGHT&gt;, &lt;TAB&gt; or <kbd>C-f</kbd> 
<em>in
 the completion list buffer</em> moves point to the following completion
 (<code>next-list-mode-item</code>).
 </p>
 <a name="IDX226"></a>
 </dd>
-<dt> <kbd><kbd>LEFT</kbd></kbd></dt>
+<dt> <kbd>&lt;LEFT&gt;</kbd></dt>
 <dt> <kbd>C-b</kbd></dt>
-<dd><p>Typing the left-arrow key <kbd>LEFT</kbd> or <kbd>C-b</kbd> <em>in the
+<dd><p>Typing the left-arrow key &lt;LEFT&gt; or <kbd>C-b</kbd> <em>in the
 completion list buffer</em> moves point toward the beginning of the buffer,
 to the previous completion (<code>previous-list-mode-item</code>).
 </p></dd>
@@ -501,7 +501,7 @@
 </tr></table>
 <h3 class="subsection"> 6.3.3 Strict Completion </h3>
 
-<p>  There are three different ways that <kbd>RET</kbd> can work in completing
+<p>  There are three different ways that &lt;RET&gt; can work in completing
 minibuffers, depending on how the argument will be used.
 </p>
 <ul>
@@ -510,15 +510,15 @@
 argument except one of the known alternatives.  For example, when
 <kbd>C-x k</kbd> reads the name of a buffer to kill, it is meaningless to
 give anything but the name of an existing buffer.  In strict
-completion, <kbd>RET</kbd> refuses to exit if the text in the minibuffer
+completion, &lt;RET&gt; refuses to exit if the text in the minibuffer
 does not complete to an exact match.
 
 </li><li>
 <em>Cautious</em> completion is similar to strict completion, except that
-<kbd>RET</kbd> exits only if the text was an exact match already, not
-needing completion.  If the text is not an exact match, <kbd>RET</kbd> does
+&lt;RET&gt; exits only if the text was an exact match already, not
+needing completion.  If the text is not an exact match, &lt;RET&gt; does
 not exit, but it does complete the text.  If it completes to an exact
-match, a second <kbd>RET</kbd> will exit.
+match, a second &lt;RET&gt; will exit.
 
 <p>Cautious completion is used for reading file names for files that must
 already exist.
@@ -528,7 +528,7 @@
 meaningful, and the list of completion alternatives is just a guide.
 For example, when <kbd>C-x C-f</kbd> reads the name of a file to visit, any
 file name is allowed, in case you want to create a file.  In
-permissive completion, <kbd>RET</kbd> takes the text in the minibuffer
+permissive completion, &lt;RET&gt; takes the text in the minibuffer
 exactly as given, without completing it.
 </li></ul>
 
@@ -579,7 +579,7 @@
 <a name="IDX228"></a>
 <p>If the variable <code>minibuffer-confirm-incomplete</code> is set to 
<code>t</code>,
 then in contexts where <code>completing-read</code> allows answers that are
-not valid completions, an extra <kbd>RET</kbd> must be typed to confirm the
+not valid completions, an extra &lt;RET&gt; must be typed to confirm the
 response.  This is helpful for catching typos.
 </p>
 <a name="IDX229"></a>
@@ -616,21 +616,21 @@
 think of them as moving through the history of previous arguments.
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>UP</kbd></kbd></dt>
+<dt> <kbd>&lt;UP&gt;</kbd></dt>
 <dt> <kbd>M-p</kbd></dt>
 <dd><p>Move to the next earlier argument string saved in the minibuffer history
 (<code>previous-history-element</code>).
 </p></dd>
-<dt> <kbd><kbd>DOWN</kbd></kbd></dt>
+<dt> <kbd>&lt;DOWN&gt;</kbd></dt>
 <dt> <kbd>M-n</kbd></dt>
 <dd><p>Move to the next later argument string saved in the minibuffer history
 (<code>next-history-element</code>).
 </p></dd>
-<dt> <kbd>M-r <var>regexp</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-r <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Move to an earlier saved argument in the minibuffer history that has a
 match for <var>regexp</var> (<code>previous-matching-history-element</code>).
 </p></dd>
-<dt> <kbd>M-s <var>regexp</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-s <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Move to a later saved argument in the minibuffer history that has a
 match for <var>regexp</var> (<code>next-matching-history-element</code>).
 </p></dd>
@@ -649,7 +649,7 @@
 </p>
 <p>  The previous input that you fetch from the history entirely replaces
 the contents of the minibuffer.  To use it as the argument, exit the
-minibuffer as usual with <kbd>RET</kbd>.  You can also edit the text before
+minibuffer as usual with &lt;RET&gt;.  You can also edit the text before
 you reuse it; this does not change the history element that you
 &ldquo;moved&rdquo; to, but your new argument does go at the end of the history
 list in its own right.
@@ -715,33 +715,33 @@
 </p>
 <a name="IDX238"></a>
 <dl compact="compact">
-<dt> <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd></dt>
 <dd><p>Re-execute a recent minibuffer command 
(<code>repeat-complex-command</code>).
 </p></dd>
 <dt> <kbd>M-p</kbd></dt>
-<dd><p>Within <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd>, move to previous 
recorded command
+<dd><p>Within <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd>, move to previous 
recorded command
 (<code>previous-history-element</code>).
 </p></dd>
 <dt> <kbd>M-n</kbd></dt>
-<dd><p>Within <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd>, move to the next 
(more recent)
+<dd><p>Within <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd>, move to the next (more 
recent)
 recorded command (<code>next-history-element</code>).
 </p></dd>
 <dt> <kbd>M-x list-command-history</kbd></dt>
 <dd><p>Display the entire command history, showing all the commands
-<kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> can repeat, most recent first.
+<kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> can repeat, most recent first.
 </p></dd>
 </dl>
 
 <a name="IDX239"></a>
 <a name="IDX240"></a>
-<p>  <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> is used to re-execute a 
recent
+<p>  <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> is used to re-execute a recent
 minibuffer-using command.  With no argument, it repeats the last such
 command.  A numeric argument specifies which command to repeat; one
 means the last one, and larger numbers specify earlier ones.
 </p>
-<p>  <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> works by turning the 
previous command
+<p>  <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> works by turning the previous 
command
 into a Lisp expression and then entering a minibuffer initialized with
-the text for that expression.  If you type just <kbd>RET</kbd>, the command
+the text for that expression.  If you type just &lt;RET&gt;, the command
 is repeated as before.  You can also change the command by editing the
 Lisp expression.  Whatever expression you finally submit is what will be
 executed.  The repeated command is added to the front of the command
@@ -756,17 +756,17 @@
 <a name="IDX242"></a>
 <a name="IDX243"></a>
 <a name="IDX244"></a>
-<p>  If you are in the minibuffer for <kbd>C-x <kbd>ESC</kbd> 
<kbd>ESC</kbd></kbd> and the
+<p>  If you are in the minibuffer for <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> 
and the
 command shown to you is not the one you want to repeat, you can move
 around the list of previous commands using <kbd>M-n</kbd> and <kbd>M-p</kbd>.
 <kbd>M-p</kbd> replaces the contents of the minibuffer with the next earlier
 recorded command, and <kbd>M-n</kbd> replaces it with the next later command.
 After finding the desired previous command, you can edit its expression
-and then resubmit it by typing <kbd>RET</kbd>.  Any editing you have done on
+and then resubmit it by typing &lt;RET&gt;.  Any editing you have done on
 the command to be repeated is lost if you use <kbd>M-n</kbd> or <kbd>M-p</kbd>.
 </p>
-<p><kbd>M-n</kbd> and <kbd>M-p</kbd> are specially defined within <kbd>C-x 
<kbd>ESC</kbd>
-<kbd>ESC</kbd></kbd> to run the commands <code>previous-history-element</code> 
and
+<p><kbd>M-n</kbd> and <kbd>M-p</kbd> are specially defined within <kbd>C-x 
&lt;ESC&gt;
+&lt;ESC&gt;</kbd> to run the commands <code>previous-history-element</code> and
 <code>next-history-element</code>.
 </p>
 <a name="IDX245"></a>
Index: texi2html/Tests/xemacs_frame_res/xemacs_toc.html
diff -u texi2html/Tests/xemacs_frame_res/xemacs_toc.html:1.12 
texi2html/Tests/xemacs_frame_res/xemacs_toc.html:1.13
--- texi2html/Tests/xemacs_frame_res/xemacs_toc.html:1.12       Sat Apr  8 
22:40:20 2006
+++ texi2html/Tests/xemacs_frame_res/xemacs_toc.html    Sat Apr  8 23:02:08 2006
@@ -85,8 +85,8 @@
       <li><a name="TOC23" href="xemacs_5.html#SEC23">2.1.1 Representing 
Keystrokes</a></li>
       <li><a name="TOC24" href="xemacs_5.html#SEC24">2.1.2 Representing Key 
Sequences</a></li>
       <li><a name="TOC25" href="xemacs_5.html#SEC25">2.1.3 String Key 
Sequences</a></li>
-      <li><a name="TOC26" href="xemacs_5.html#SEC26">2.1.4 Assignment of the 
<kbd>META</kbd> Key</a></li>
-      <li><a name="TOC27" href="xemacs_5.html#SEC27">2.1.5 Assignment of the 
<kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></li>
+      <li><a name="TOC26" href="xemacs_5.html#SEC26">2.1.4 Assignment of the 
&lt;META&gt; Key</a></li>
+      <li><a name="TOC27" href="xemacs_5.html#SEC27">2.1.5 Assignment of the 
&lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></li>
     </ul></li>
     <li><a name="TOC28" href="xemacs_5.html#SEC28">2.2 Representation of 
Characters</a></li>
     <li><a name="TOC29" href="xemacs_5.html#SEC29">2.3 Keys and 
Commands</a></li>
Index: texi2html/Tests/xemacs_res/xemacs.html
diff -u texi2html/Tests/xemacs_res/xemacs.html:1.26 
texi2html/Tests/xemacs_res/xemacs.html:1.27
--- texi2html/Tests/xemacs_res/xemacs.html:1.26 Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs.html      Sat Apr  8 23:02:08 2006
@@ -266,9 +266,9 @@
 </td></tr>
 <tr><td align="left" valign="top"><a href="xemacs_5.html#SEC25">2.1.3 String 
Key Sequences</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     
Available for upward compatibility.
 </td></tr>
-<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC26">2.1.4 
Assignment of the <kbd>META</kbd> Key</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">                 Using <kbd>ESC</kbd> to represent 
<kbd>Meta</kbd>
+<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC26">2.1.4 
Assignment of the &lt;META&gt; Key</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">                 Using &lt;ESC&gt; to represent 
&lt;Meta&gt;
 </td></tr>
-<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> 
Keys</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     Adding 
modifier keys on certain keyboards.
+<tr><td align="left" valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the &lt;SUPER&gt; and &lt;HYPER&gt; 
Keys</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     Adding 
modifier keys on certain keyboards.
 </td></tr>
 <tr><td align="left" valign="top"><a href="xemacs_5.html#SEC28">2.2 
Representation of Characters</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top"> How characters appear in XEmacs buffers.
 </td></tr>
Index: texi2html/Tests/xemacs_res/xemacs_10.html
diff -u texi2html/Tests/xemacs_res/xemacs_10.html:1.23 
texi2html/Tests/xemacs_res/xemacs_10.html:1.24
--- texi2html/Tests/xemacs_res/xemacs_10.html:1.23      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_10.html   Sat Apr  8 23:02:08 2006
@@ -76,8 +76,8 @@
 <a name="IDX246"></a>
 <a name="IDX247"></a>
 <p> To run a command by name, start with <kbd>M-x</kbd>, then type the
-command name, and finish with <kbd>RET</kbd>.  <kbd>M-x</kbd> uses the 
minibuffer
-to read the command name.  <kbd>RET</kbd> exits the minibuffer and runs the
+command name, and finish with &lt;RET&gt;.  <kbd>M-x</kbd> uses the minibuffer
+to read the command name.  &lt;RET&gt; exits the minibuffer and runs the
 command.
 </p>
 <p>  Emacs uses the minibuffer for reading input for many different purposes;
@@ -89,10 +89,10 @@
 <p>  You can use completion to enter a command name.  For example, to
 invoke the command <code>forward-char</code>, type:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x forward-char 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x forward-char &lt;RET&gt;
 </pre></td></tr></table>
 <p>or
-</p><table><tr><td>&nbsp;</td><td><pre class="example">M-x fo <kbd>TAB</kbd> c 
<kbd>RET</kbd>
+</p><table><tr><td>&nbsp;</td><td><pre class="example">M-x fo &lt;TAB&gt; c 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>After you type in <code>M-x fo TAB</code> emacs will give you a possible 
list of 
@@ -210,9 +210,9 @@
 &lsquo;<samp>@</samp>&rsquo; and &lsquo;<samp>*</samp>&rsquo;; they are 
processed in the order that they appear.
 </p>
 <p>Normally, when describing a command that is run by name, we omit the
-<kbd>RET</kbd> that is needed to terminate the name.  Thus we may refer to
-<kbd>M-x auto-fill-mode</kbd> rather than <kbd>M-x auto-fill-mode</kbd> 
<kbd>RET</kbd>.
-We mention the <kbd>RET</kbd> only when it is necessary to emphasize its
+&lt;RET&gt; that is needed to terminate the name.  Thus we may refer to
+<kbd>M-x auto-fill-mode</kbd> rather than <kbd>M-x auto-fill-mode</kbd> 
&lt;RET&gt;.
+We mention the &lt;RET&gt; only when it is necessary to emphasize its
 presence, for example, when describing a sequence of input that contains
 a command name and arguments that follow it.
 </p>
Index: texi2html/Tests/xemacs_res/xemacs_11.html
diff -u texi2html/Tests/xemacs_res/xemacs_11.html:1.27 
texi2html/Tests/xemacs_res/xemacs_11.html:1.28
--- texi2html/Tests/xemacs_res/xemacs_11.html:1.27      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_11.html   Sat Apr  8 23:02:08 2006
@@ -66,7 +66,7 @@
 documentation-printing commands.  The characters that you can type after
 <kbd>C-h</kbd> are called <em>help options</em>.  One help option is 
<kbd>C-h</kbd>;
 that is how you ask for help about using <kbd>C-h</kbd>.  To cancel, type
-<kbd>C-g</kbd>.  The function key <kbd>F1</kbd> is equivalent to 
<kbd>C-h</kbd>.
+<kbd>C-g</kbd>.  The function key &lt;F1&gt; is equivalent to <kbd>C-h</kbd>.
 </p>
 <a name="IDX250"></a>
 <a name="IDX251"></a>
@@ -83,7 +83,7 @@
 Emacs still waits for you to type an option.  To cancel, type <kbd>C-g</kbd>.
 </p>
 <p>  Most help buffers use a special major mode, Help mode, which lets you
-scroll conveniently with <kbd>SPC</kbd> and <kbd>DEL</kbd> or <kbd>BS</kbd>.
+scroll conveniently with &lt;SPC&gt; and &lt;DEL&gt; or &lt;BS&gt;.
 </p>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#SEC72">8.1 Help 
Summary</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">        
Brief list of all Help commands.
@@ -126,7 +126,7 @@
 <p>  Here is a summary of the defined help commands.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-h a <var>regexp</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h a <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Display a list of functions and variables whose names match 
<var>regexp</var>
 (<code>hyper-apropos</code>).
 </p></dd>
@@ -144,8 +144,8 @@
 (<code>describe-key-briefly</code>).  Here <kbd>c</kbd> stands for 
`character'.  For more
 extensive information on <var>key</var>, use <kbd>C-h k</kbd>.
 </p></dd>
-<dt> <kbd>C-h d <var>function</var> <kbd>RET</kbd></kbd></dt>
-<dt> <kbd>C-h f <var>function</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h d <var>function</var> &lt;RET&gt;</kbd></dt>
+<dt> <kbd>C-h f <var>function</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Display documentation on the Lisp function named <var>function</var>
 (<code>describe-function</code>).  Since commands are Lisp functions,
 a command name may be used.
@@ -185,31 +185,31 @@
 <dt> <kbd>C-h t</kbd></dt>
 <dd><p>Enter the XEmacs interactive tutorial (<code>help-with-tutorial</code>).
 </p></dd>
-<dt> <kbd>C-h v <var>var</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h v <var>var</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Display the documentation of the Lisp variable <var>var</var>
 (<code>describe-variable</code>).
 </p></dd>
-<dt> <kbd>C-h w <var>command</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h w <var>command</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Print which keys run the command named <var>command</var> 
(<code>where-is</code>).
 </p></dd>
-<dt> <kbd>C-h B <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h B &lt;RET&gt;</kbd></dt>
 <dd><p>Display info on how to deal with Beta versions of XEmacs
 (<code>describe-beta</code>).
 </p></dd>
-<dt> <kbd>C-h C <var>group</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C <var>group</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select customization buffer for <var>group</var> 
(<code>customize</code>).
 </p></dd>
-<dt> <kbd>C-h F <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h F &lt;RET&gt;</kbd></dt>
 <dd><p>View the local copy of the XEmacs FAQ (<code>xemacs-local-faq</code>).
 </p></dd>
-<dt> <kbd>C-h C-i <var>file</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C-i <var>file</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Read Info file <var>file</var> with Info browser 
(<code>Info-query</code>).
 </p></dd>
-<dt> <kbd>C-h C-c <var>command</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C-c <var>command</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Look up an Emacs command <var>command</var> in the Emacs manual in the 
Info
 system (<code>Info-goto-emacs-command-node</code>).
 </p></dd>
-<dt> <kbd>C-h C-f <var>function</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C-f <var>function</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Look up an Emacs Lisp function <var>function</var> in the Elisp manual 
in the
 Info system (<code>Info-elisp-ref</code>).
 </p></dd>
@@ -283,7 +283,7 @@
 you can use the argument <var>function</var> to get the documentation of a
 command that you know by name.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-h f auto-fill-mode 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-h f auto-fill-mode 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>displays the documentation for <code>auto-fill-mode</code>. Using <kbd>C-h 
f</kbd>
@@ -296,7 +296,7 @@
 <p>  <kbd>C-h f</kbd> is also useful for Lisp functions that you are planning 
to
 use in a Lisp program.  For example, if you have just written the
 expression <code>(make-vector len)</code> and want to make sure you are using
-<code>make-vector</code> properly, type <kbd>C-h f make-vector 
<kbd>RET</kbd></kbd>.
+<code>make-vector</code> properly, type <kbd>C-h f make-vector 
&lt;RET&gt;</kbd>.
 Because <kbd>C-h f</kbd> allows all function names, not just command names,
 you may find that some of your favorite abbreviations that work in
 <kbd>M-x</kbd> don't work in <kbd>C-h f</kbd>.  An abbreviation may be unique
@@ -304,7 +304,7 @@
 allowed.
 </p>
 <p>  The function name for <kbd>C-h f</kbd> to describe has a default which is
-used if you type <kbd>RET</kbd> leaving the minibuffer empty.  The default is
+used if you type &lt;RET&gt; leaving the minibuffer empty.  The default is
 the function called by the innermost Lisp expression in the buffer
 around point, <em>provided</em> that is a valid, defined Lisp function
 name.  For example, if point is located following the text
@@ -320,7 +320,7 @@
 </p>
 <a name="IDX254"></a>
 <a name="IDX255"></a>
-<p>  <kbd>C-h w <var>command</var> <kbd>RET</kbd></kbd> 
(<code>where-is</code>) tells you what
+<p>  <kbd>C-h w <var>command</var> &lt;RET&gt;</kbd> (<code>where-is</code>) 
tells you what
 keys are bound to <var>command</var>.  It prints a list of the keys in the
 echo area. Alternatively, it informs you that a command is not bound to
 any keys, which implies that you must use <kbd>M-x</kbd> to call the
@@ -368,7 +368,7 @@
 
 <p>  A more sophisticated sort of question to ask is, &ldquo;What are the
 commands for working with files?&rdquo;  To ask this question, type <kbd>C-h
-a file <kbd>RET</kbd></kbd>, which displays a list of all command names that
+a file &lt;RET&gt;</kbd>, which displays a list of all command names that
 contain &lsquo;<samp>file</samp>&rsquo;, including <code>copy-file</code>, 
<code>find-file</code>, and
 so on.  With each command name appears a brief description of how to use
 the command, and what keys you can currently invoke it with.  For
@@ -381,7 +381,7 @@
 <p>  Because <kbd>C-h A</kbd> looks only for functions whose names contain the
 string you specify, you must use ingenuity in choosing the string.  If
 you are looking for commands for killing backwards and <kbd>C-h a
-kill-backwards <kbd>RET</kbd></kbd> doesn't reveal any, don't give up.  Try 
just
+kill-backwards &lt;RET&gt;</kbd> doesn't reveal any, don't give up.  Try just
 <kbd>kill</kbd>, or just <kbd>backwards</kbd>, or just <kbd>back</kbd>.  Be 
persistent.
 Pretend you are playing Adventure.  Also note that you can use a regular
 expression as the argument, for more flexibility (see section <a 
href="xemacs_15.html#SEC121">Syntax of Regular Expressions</a>).
@@ -423,7 +423,7 @@
 </p>
 <p>  If you want more information about a function definition, variable or
 symbol property listed in the Apropos buffer, you can click on it with
-<kbd>Mouse-2</kbd> or move there and type <kbd>RET</kbd>.
+<kbd>Mouse-2</kbd> or move there and type &lt;RET&gt;.
 </p>
 <hr size="6">
 <a name="Library-Keywords"></a>
@@ -512,11 +512,11 @@
 <p>  Help buffers provide the commands of View mode (see section <a 
href="xemacs_17.html#SEC168">Miscellaneous File Operations</a>), plus a few 
special commands of their own.
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>Scroll forward.
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
-<dt> <kbd><kbd>BS</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
+<dt> <kbd>&lt;BS&gt;</kbd></dt>
 <dd><p>Scroll backward.
 </p></dd>
 </dl>
@@ -563,7 +563,7 @@
 <a name="IDX264"></a>
 <a name="IDX265"></a>
 <p>  There are two special help commands for accessing XEmacs documentation
-through Info.  <kbd>C-h C-f <var>function</var> <kbd>RET</kbd></kbd> enters 
Info and
+through Info.  <kbd>C-h C-f <var>function</var> &lt;RET&gt;</kbd> enters Info 
and
 goes straight to the documentation of the XEmacs function
 <var>function</var>.  <kbd>C-h C-k <var>key</var></kbd> enters Info and goes 
straight
 to the documentation of the key <var>key</var>.  These two keys run the
@@ -596,7 +596,7 @@
 <p>  You can get a similar list for a particular prefix key by typing
 <kbd>C-h</kbd> after the prefix key.  (There are a few prefix keys for which
 this does not work&mdash;those that provide their own bindings for
-<kbd>C-h</kbd>.  One of these is <kbd>ESC</kbd>, because <kbd><kbd>ESC</kbd> 
C-h</kbd> is
+<kbd>C-h</kbd>.  One of these is &lt;ESC&gt;, because <kbd>&lt;ESC&gt; 
C-h</kbd> is
 actually <kbd>C-M-h</kbd>, which marks a defun.)
 </p>
 <a name="IDX272"></a>
Index: texi2html/Tests/xemacs_res/xemacs_12.html
diff -u texi2html/Tests/xemacs_res/xemacs_12.html:1.29 
texi2html/Tests/xemacs_res/xemacs_12.html:1.30
--- texi2html/Tests/xemacs_res/xemacs_12.html:1.29      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_12.html   Sat Apr  8 23:02:08 2006
@@ -149,7 +149,7 @@
 <p>  Here are some commands for setting the mark:
 </p>
 <dl compact="compact">
-<dt> <kbd>C-<kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>C-&lt;SPC&gt;</kbd></dt>
 <dd><p>Set the mark where point is (<code>set-mark-command</code>).
 </p></dd>
 <dt> <kbd>C-@</kbd></dt>
@@ -169,7 +169,7 @@
 <p>  For example, to convert part of the buffer to all
 upper-case, you can use the <kbd>C-x C-u</kbd> (<code>upcase-region</code>)
 command, which operates on the text in the region.  First go to the
-beginning of the text you want to capitalize and type 
<kbd>C-<kbd>SPC</kbd></kbd> to
+beginning of the text you want to capitalize and type <kbd>C-&lt;SPC&gt;</kbd> 
to
 put the mark there, then move to the end, and then type <kbd>C-x C-u</kbd> to
 capitalize the selected region.  You can also set the mark at the end of the
 text, move to the beginning, and then type <kbd>C-x C-u</kbd>.  Most commands
@@ -178,16 +178,16 @@
 </p>
 <a name="IDX284"></a>
 <a name="IDX285"></a>
-<p>  The most common way to set the mark is with the 
<kbd>C-<kbd>SPC</kbd></kbd>
+<p>  The most common way to set the mark is with the <kbd>C-&lt;SPC&gt;</kbd>
 command (<code>set-mark-command</code>).  This command sets the mark where
 point is. You can then move point away, leaving the mark behind.  It is
-actually incorrect to speak of the character <kbd>C-<kbd>SPC</kbd></kbd>; 
there is
-no such character.  When you type <kbd>SPC</kbd> while holding down
-<kbd>CTRL</kbd>, you get the character <kbd>C-@</kbd> on most terminals. This
+actually incorrect to speak of the character <kbd>C-&lt;SPC&gt;</kbd>; there is
+no such character.  When you type &lt;SPC&gt; while holding down
+&lt;CTRL&gt;, you get the character <kbd>C-@</kbd> on most terminals. This
 character is actually bound to <code>set-mark-command</code>.  But unless you 
are
-unlucky enough to have a terminal where typing <kbd>C-<kbd>SPC</kbd></kbd> does
+unlucky enough to have a terminal where typing <kbd>C-&lt;SPC&gt;</kbd> does
 not produce <kbd>C-@</kbd>, you should think of this character as
-<kbd>C-<kbd>SPC</kbd></kbd>.
+<kbd>C-&lt;SPC&gt;</kbd>.
 </p>
 <a name="IDX286"></a>
 <a name="IDX287"></a>
@@ -262,7 +262,7 @@
 </li><li>
 Print hardcopy with <kbd>M-x print-region</kbd> (see section <a 
href="xemacs_29.html#SEC345">Hardcopy Output</a>).
 </li><li>
-Indent it with <kbd>C-x <kbd>TAB</kbd></kbd> or <kbd>C-M-\</kbd> (see section 
<a href="xemacs_22.html#SEC192">Indentation</a>).
+Indent it with <kbd>C-x &lt;TAB&gt;</kbd> or <kbd>C-M-\</kbd> (see section <a 
href="xemacs_22.html#SEC192">Indentation</a>).
 </li></ul>
 
 <hr size="6">
@@ -367,7 +367,7 @@
 a spot that you may want to go back to.  To make this feature more
 useful, Emacs remembers 16 previous locations of the mark in the
 <em>mark ring</em>.  Most commands that set the mark push the old mark onto
-this ring.  To return to a marked location, use <kbd>C-u C-<kbd>SPC</kbd></kbd>
+this ring.  To return to a marked location, use <kbd>C-u C-&lt;SPC&gt;</kbd>
 (or <kbd>C-u C-@</kbd>); this is the command <code>set-mark-command</code> 
given a
 numeric argument.  The command moves point to where the mark was, and
 restores the mark from the ring of former marks. Repeated use of this
@@ -375,7 +375,7 @@
 The marks you have seen go to the end of the ring, so no marks are lost.
 </p>
 <p>  Each buffer has its own mark ring.  All editing commands use the current
-buffer's mark ring.  In particular, <kbd>C-u C-<kbd>SPC</kbd></kbd> always 
stays in
+buffer's mark ring.  In particular, <kbd>C-u C-&lt;SPC&gt;</kbd> always stays 
in
 the same buffer.
 </p>
 <p>  Many commands that can move long distances, such as <kbd>M-&lt;</kbd>
@@ -389,7 +389,7 @@
 <p>  The variable <code>mark-ring-max</code> is the maximum number of entries 
to
 keep in the mark ring.  If that many entries exist and another entry is
 added, the last entry in the list is discarded.  Repeating <kbd>C-u
-C-<kbd>SPC</kbd></kbd> circulates through the entries that are currently in the
+C-&lt;SPC&gt;</kbd> circulates through the entries that are currently in the
 ring.
 </p>
 <a name="IDX305"></a>
@@ -492,7 +492,7 @@
 <p>XEmacs also provides the following mouse functions.  Most of these are
 not bound to mouse gestures by default, but they are provided for your
 customization pleasure.  For example, if you wanted <kbd>shift-left</kbd>
-(that is, holding down the <kbd>Shift</kbd> key and clicking the left mouse
+(that is, holding down the &lt;Shift&gt; key and clicking the left mouse
 button) to delete the character at which you are pointing, then you
 could do this:
 </p>
@@ -550,22 +550,22 @@
 </p></dd>
 <dt> <kbd>mouse-track</kbd></dt>
 <dd><p>Make a selection with the mouse.   This is the default binding of 
-the left mouse button (<kbd>button1</kbd>).
+the left mouse button (&lt;button1&gt;).
 </p></dd>
 <dt> <kbd>mouse-track-adjust</kbd></dt>
 <dd><p>Extend the existing selection.  This is the default binding of
-<kbd>Shift-button1</kbd>.
+&lt;Shift-button1&gt;.
 </p></dd>
 <dt> <kbd>mouse-track-and-copy-to-cutbuffer</kbd></dt>
 <dd><p>Make a selection like <code>mouse-track</code>, but also copy it to the 
cut buffer.
 </p></dd>
 <dt> <kbd>mouse-track-delete-and-insert</kbd></dt>
 <dd><p>Make a selection with the mouse and insert it at point.  This is the
-default binding of <kbd>control-shift-button1</kbd>.
+default binding of &lt;control-shift-button1&gt;.
 </p></dd>
 <dt> <kbd>mouse-track-insert</kbd></dt>
 <dd><p>Make a selection with the mouse and insert it at point.
-This is the default binding of <kbd>control-button1</kbd>.
+This is the default binding of &lt;control-button1&gt;.
 </p></dd>
 <dt> <kbd>mouse-window-to-region</kbd></dt>
 <dd><p>Narrow a window to the region between the cursor and the mouse pointer.
@@ -598,15 +598,15 @@
 <p>The <kbd>M-x mouse-track-adjust</kbd> command should be bound to a mouse
 button.  The selection will be enlarged or shrunk so that the point of
 the mouse click is one of its endpoints.  This is only meaningful
-after the <code>mouse-track</code> command (<kbd>button1</kbd>) has been 
executed.
+after the <code>mouse-track</code> command (&lt;button1&gt;) has been executed.
 </p>
 <p>The <kbd>M-x mouse-track-delete-and-insert</kbd> command is exactly the same
-as the <code>mouse-track</code> command on <kbd>button1</kbd>, except that 
point is
+as the <code>mouse-track</code> command on &lt;button1&gt;, except that point 
is
 not moved; the selected text is immediately inserted after being
 selected; and the text of the selection is deleted.
 </p>
 <p>The <kbd>M-x mouse-track-insert</kbd> command is exactly the same as the
-<code>mouse-track</code> command on <kbd>button1</kbd>, except that point is 
not moved;
+<code>mouse-track</code> command on &lt;button1&gt;, except that point is not 
moved;
 the selected text is immediately inserted after being selected; and the
 selection is immediately disowned afterwards.
 </p>
@@ -643,7 +643,7 @@
 &lsquo;<samp>kill</samp>&rsquo; and &lsquo;<samp>delete</samp>&rsquo; to 
indicate what they do.  If you perform
 a kill or delete command by mistake, use the <kbd>C-x u</kbd> 
(<code>undo</code>)
 command to undo it (see section <a href="xemacs_8.html#SEC59">Undoing 
Changes</a>). The delete commands include <kbd>C-d</kbd>
-(<code>delete-char</code>) and <kbd>DEL</kbd> 
(<code>delete-backward-char</code>), which
+(<code>delete-char</code>) and &lt;DEL&gt; 
(<code>delete-backward-char</code>), which
 delete only one character at a time, and those commands that delete only
 spaces or newlines.  Commands that can destroy significant amounts of
 nontrivial data usually kill.
@@ -672,13 +672,13 @@
 <dt> <kbd>C-d</kbd></dt>
 <dd><p>Delete next character (<code>delete-char</code>).
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Delete previous character (<code>delete-backward-char</code>).
 </p></dd>
 <dt> <kbd>M-\</kbd></dt>
 <dd><p>Delete spaces and tabs around point 
(<code>delete-horizontal-space</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>M-&lt;SPC&gt;</kbd></dt>
 <dd><p>Delete spaces and tabs around point, leaving one space
 (<code>just-one-space</code>).
 </p></dd>
@@ -692,12 +692,12 @@
 </dl>
 
 <p>  The most basic delete commands are <kbd>C-d</kbd> 
(<code>delete-char</code>) and
-<kbd>DEL</kbd> (<code>delete-backward-char</code>).  <kbd>C-d</kbd> deletes the
+&lt;DEL&gt; (<code>delete-backward-char</code>).  <kbd>C-d</kbd> deletes the
 character after point, the one the cursor is &ldquo;on top of&rdquo;.  Point
-doesn't move.  <kbd>DEL</kbd> deletes the character before the cursor, and
+doesn't move.  &lt;DEL&gt; deletes the character before the cursor, and
 moves point back.  You can delete newlines like any other characters in
 the buffer; deleting a newline joins two lines.  Actually, <kbd>C-d</kbd> and
-<kbd>DEL</kbd> aren't always delete commands; if you give them an argument,
+&lt;DEL&gt; aren't always delete commands; if you give them an argument,
 they kill instead, since they can erase more than one character this
 way.
 </p>
@@ -712,7 +712,7 @@
 <p>  The other delete commands delete only formatting characters: spaces,
 tabs and newlines.  <kbd>M-\</kbd> (<code>delete-horizontal-space</code>) 
deletes
 all spaces and tab characters before and after point.
-<kbd>M-<kbd>SPC</kbd></kbd> (<code>just-one-space</code>) does the same but 
leaves a
+<kbd>M-&lt;SPC&gt;</kbd> (<code>just-one-space</code>) does the same but 
leaves a
 single space after point, regardless of the number of spaces that
 existed previously (even zero).
 </p>
@@ -804,10 +804,10 @@
 <dt> <kbd>M-d</kbd></dt>
 <dd><p>Kill word (<code>kill-word</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill word backwards (<code>backward-kill-word</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to beginning of sentence 
(<code>backward-kill-sentence</code>).
 See section <a href="xemacs_23.html#SEC207">Sentences</a>.
 </p></dd>
@@ -837,9 +837,9 @@
 argument acts as a repeat count.  A negative argument means to search
 backward and kill text before point.
 </p>
-<p>  Other syntactic units can be killed: words, with 
<kbd>M-<kbd>DEL</kbd></kbd> and
+<p>  Other syntactic units can be killed: words, with <kbd>M-&lt;DEL&gt;</kbd> 
and
 <kbd>M-d</kbd> (see section <a href="xemacs_23.html#SEC206">Words</a>); sexps, 
with <kbd>C-M-k</kbd> (see section <a href="xemacs_24.html#SEC217">Lists and 
Sexps</a>); and
-sentences, with <kbd>C-x <kbd>DEL</kbd></kbd> and <kbd>M-k</kbd>
+sentences, with <kbd>C-x &lt;DEL&gt;</kbd> and <kbd>M-k</kbd>
 (see section <a href="xemacs_23.html#SEC207">Sentences</a>).
 </p>
 <hr size="6">
@@ -988,12 +988,12 @@
 </pre></td></tr></table>
 
 <p>with point at the beginning of the second line.  If you type <kbd>C-k C-u 2
-M-<kbd>DEL</kbd> C-k</kbd>, the first <kbd>C-k</kbd> kills the text 
&lsquo;<samp>line of sample
-text</samp>&rsquo;, <kbd>C-u 2 M-<kbd>DEL</kbd></kbd> kills &lsquo;<samp>the 
first</samp>&rsquo; with the newline that
+M-&lt;DEL&gt; C-k</kbd>, the first <kbd>C-k</kbd> kills the text 
&lsquo;<samp>line of sample
+text</samp>&rsquo;, <kbd>C-u 2 M-&lt;DEL&gt;</kbd> kills &lsquo;<samp>the 
first</samp>&rsquo; with the newline that
 followed it, and the second <kbd>C-k</kbd> kills the newline after the second
 line.  The result is that the buffer contains &lsquo;<samp>This is and here is 
the
-third.</samp>&rsquo; and a single kill entry contains &lsquo;<samp>the 
first<kbd>RET</kbd>line of
-sample text<kbd>RET</kbd></samp>&rsquo;&mdash;all the killed text, in its 
original order.
+third.</samp>&rsquo; and a single kill entry contains &lsquo;<samp>the 
first&lt;RET&gt;line of
+sample text&lt;RET&gt;</samp>&rsquo;&mdash;all the killed text, in its 
original order.
 </p>
 <a name="IDX338"></a>
 <a name="IDX339"></a>
@@ -1382,7 +1382,7 @@
 </p>
 <p>When <code>zmacs-regions</code> is <code>t</code>, there is no distinction 
between
 the primary X selection and the active region selected by point and the
-mark.  To see this, set the mark (<kbd>C-SPC</kbd>) and move the cursor
+mark.  To see this, set the mark (&lt;C-SPC&gt;) and move the cursor
 with any cursor-motion command: the region between point and mark is
 highlighted, and you can watch it grow and shrink as you move the
 cursor.
@@ -1395,7 +1395,7 @@
 <p>Commands that require a region (such as <kbd>C-w</kbd>) signal an error if
 the region is not active.  Certain commands cause the region to be in
 its active state.  The most common ones are <code>push-mark</code>
-(<kbd>C-SPC</kbd>) and <code>exchange-point-and-mark</code> (<kbd>C-x 
C-x</kbd>).
+(&lt;C-SPC&gt;) and <code>exchange-point-and-mark</code> (<kbd>C-x C-x</kbd>).
 </p>
 <a name="IDX342"></a>
 <p>When <code>zmacs-regions</code> is <code>t</code>, programs can be 
non-intrusive
Index: texi2html/Tests/xemacs_res/xemacs_13.html
diff -u texi2html/Tests/xemacs_res/xemacs_13.html:1.26 
texi2html/Tests/xemacs_res/xemacs_13.html:1.27
--- texi2html/Tests/xemacs_res/xemacs_13.html:1.26      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_13.html   Sat Apr  8 23:02:08 2006
@@ -77,7 +77,7 @@
 view-register</kbd>.
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x view-register <kbd>RET</kbd> <var>r</var></kbd></dt>
+<dt> <kbd>M-x view-register &lt;RET&gt; <var>r</var></kbd></dt>
 <dd><p>Display a description of what register <var>r</var> contains.
 </p></dd>
 </dl>
@@ -129,7 +129,7 @@
 and moves point to that place in it.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x r <kbd>SPC</kbd> <var>r</var></kbd></dt>
+<dt> <kbd>C-x r &lt;SPC&gt; <var>r</var></kbd></dt>
 <dd><p>Save position of point in register <var>r</var> 
(<code>point-to-register</code>).
 </p></dd>
 <dt> <kbd>C-x r j <var>r</var></kbd></dt>
@@ -140,7 +140,7 @@
 <a name="IDX352"></a>
 <a name="IDX353"></a>
 <p>  To save the current position of point in a register, choose a name
-<var>r</var> and type <kbd>C-x r <kbd>SPC</kbd> <var>r</var></kbd>.  The 
register <var>r</var>
+<var>r</var> and type <kbd>C-x r &lt;SPC&gt; <var>r</var></kbd>.  The register 
<var>r</var>
 retains the position thus saved until you store something else in that
 register.
 </p>
@@ -287,7 +287,7 @@
 <dd><p>Save the state of the selected frame's windows in register <var>r</var>
 (<code>window-configuration-to-register</code>).
 </p></dd>
-<dt> <kbd>M-x frame-configuration-to-register <kbd>RET</kbd> 
<var>r</var></kbd></dt>
+<dt> <kbd>M-x frame-configuration-to-register &lt;RET&gt; 
<var>r</var></kbd></dt>
 <dd><p>Save the state of all frames, including all their windows, in register
 <var>r</var> (<code>frame-configuration-to-register</code>).
 </p></dd>
@@ -414,16 +414,16 @@
 install that to use bookmark facility (see section <a 
href="xemacs_25.html#SEC262">Packages</a>).
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x r m <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x r m &lt;RET&gt;</kbd></dt>
 <dd><p>Set the bookmark for the visited file, at point.
 </p>
 </dd>
-<dt> <kbd>C-x r m <var>bookmark</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x r m <var>bookmark</var> &lt;RET&gt;</kbd></dt>
 <dd><a name="IDX367"></a>
 <p>Set the bookmark named <var>bookmark</var> at point 
(<code>bookmark-set</code>).
 </p>
 </dd>
-<dt> <kbd>C-x r b <var>bookmark</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x r b <var>bookmark</var> &lt;RET&gt;</kbd></dt>
 <dd><a name="IDX368"></a>
 <p>Jump to the bookmark named <var>bookmark</var> (<code>bookmark-jump</code>).
 </p>
@@ -481,7 +481,7 @@
 <p>  Here are some additional commands for working with bookmarks:
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x bookmark-load <kbd>RET</kbd> <var>filename</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-load &lt;RET&gt; <var>filename</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX378"></a>
 <p>Load a file named <var>filename</var> that contains a list of bookmark
 values.  You can use this command, as well as <code>bookmark-write</code>, to
@@ -489,23 +489,23 @@
 bookmark file.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-write <kbd>RET</kbd> <var>filename</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-write &lt;RET&gt; <var>filename</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX379"></a>
 <p>Save all the current bookmark values in the file <var>filename</var>.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-delete <kbd>RET</kbd> <var>bookmark</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-delete &lt;RET&gt; <var>bookmark</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX380"></a>
 <p>Delete the bookmark named <var>bookmark</var>.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-insert-location <kbd>RET</kbd> <var>bookmark</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-insert-location &lt;RET&gt; <var>bookmark</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX381"></a>
 <p>Insert in the buffer the name of the file that bookmark <var>bookmark</var>
 points to.
 </p>
 </dd>
-<dt> <kbd>M-x bookmark-insert <kbd>RET</kbd> <var>bookmark</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x bookmark-insert &lt;RET&gt; <var>bookmark</var> 
&lt;RET&gt;</kbd></dt>
 <dd><a name="IDX382"></a>
 <p>Insert in the buffer the <em>contents</em> of the file that bookmark
 <var>bookmark</var> points to.
Index: texi2html/Tests/xemacs_res/xemacs_14.html
diff -u texi2html/Tests/xemacs_res/xemacs_14.html:1.25 
texi2html/Tests/xemacs_res/xemacs_14.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_14.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_14.html   Sat Apr  8 23:02:08 2006
@@ -396,7 +396,7 @@
 controlled by the variable <code>tab-width</code>, which is made local by
 changing it, just like <code>ctl-arrow</code>.  Note that how the tab character
 in the buffer is displayed has nothing to do with the definition of
-<kbd>TAB</kbd> as a command.
+&lt;TAB&gt; as a command.
 </p>
 <a name="IDX406"></a>
 <p>  If you set the variable <code>selective-display-ellipses</code> to 
<code>nil</code>,
Index: texi2html/Tests/xemacs_res/xemacs_15.html
diff -u texi2html/Tests/xemacs_res/xemacs_15.html:1.31 
texi2html/Tests/xemacs_res/xemacs_15.html:1.32
--- texi2html/Tests/xemacs_res/xemacs_15.html:1.31      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_15.html   Sat Apr  8 23:02:08 2006
@@ -117,7 +117,7 @@
 shows you where the string (as you have typed it so far) is found.
 When you have typed enough characters to identify the place you want, you
 can stop.  Depending on what you do next, you may or may not need to
-terminate the search explicitly with a <kbd>RET</kbd>.
+terminate the search explicitly with a &lt;RET&gt;.
 </p>
 <dl compact="compact">
 <dt> <kbd>C-s</kbd></dt>
@@ -146,26 +146,26 @@
 (On slow terminals, the three dots are not displayed.)
 </p>
 <p>  If you make a mistake in typing the search string, you can erase
-characters with <kbd>DEL</kbd>.  Each <kbd>DEL</kbd> cancels the last 
character of the
+characters with &lt;DEL&gt;.  Each &lt;DEL&gt; cancels the last character of 
the
 search string.  This does not happen until Emacs is ready to read another
 input character; first it must either find, or fail to find, the character
 you want to erase.  If you do not want to wait for this to happen, use
 <kbd>C-g</kbd> as described below.
 </p>
 <p>  When you are satisfied with the place you have reached, you can type
-<kbd>RET</kbd> (or <kbd>C-m</kbd>), which stops searching, leaving the cursor 
where 
+&lt;RET&gt; (or &lt;C-m&gt;), which stops searching, leaving the cursor where 
 the search brought it.  Any command not specially meaningful in searches also
 stops the search and is then executed.  Thus, typing <kbd>C-a</kbd> exits the
-search and then moves to the beginning of the line.  <kbd>RET</kbd> is 
necessary
+search and then moves to the beginning of the line.  &lt;RET&gt; is necessary
 only if the next command you want to type is a printing character,
-<kbd>DEL</kbd>, <kbd>ESC</kbd>, or another control character that is special
+&lt;DEL&gt;, &lt;ESC&gt;, or another control character that is special
 within searches (<kbd>C-q</kbd>, <kbd>C-w</kbd>, <kbd>C-r</kbd>, 
<kbd>C-s</kbd>, or <kbd>C-y</kbd>).
 </p>
 <p>  Sometimes you search for &lsquo;<samp>FOO</samp>&rsquo; and find it, but 
were actually
 looking for a different occurrence of it.  To move to the next occurrence
 of the search string, type another <kbd>C-s</kbd>.  Do this as often as
 necessary.  If you overshoot, you can cancel some <kbd>C-s</kbd>
-characters with <kbd>DEL</kbd>.
+characters with &lt;DEL&gt;.
 </p>
 <p>  After you exit a search, you can search for the same string again by
 typing just <kbd>C-s C-s</kbd>: the first <kbd>C-s</kbd> is the key that 
invokes
@@ -177,7 +177,7 @@
 &lsquo;<samp>FOOT</samp>&rsquo;, and there is no 
&lsquo;<samp>FOOT</samp>&rsquo;, the cursor may be after the
 &lsquo;<samp>FOO</samp>&rsquo; in &lsquo;<samp>FOOL</samp>&rsquo;.  At this 
point there are several things you
 can do.  If you mistyped the search string, correct it.  If you like the
-place you have found, you can type <kbd>RET</kbd> or some other Emacs command
+place you have found, you can type &lt;RET&gt; or some other Emacs command
 to &ldquo;accept what the search offered&rdquo;.  Or you can type 
<kbd>C-g</kbd>, which
 removes from the search string the characters that could not be found
 (the &lsquo;<samp>T</samp>&rsquo; in &lsquo;<samp>FOOT</samp>&rsquo;), leaving 
those that were found (the
@@ -203,8 +203,8 @@
 search is now successful and waiting for more input, so a second <kbd>C-g</kbd>
 cancels the entire search.
 </p>
-<p>  To search for a control character such as <kbd>C-s</kbd> or 
<kbd>DEL</kbd> or
-<kbd>ESC</kbd>, you must quote it by typing <kbd>C-q</kbd> first.  This 
function
+<p>  To search for a control character such as <kbd>C-s</kbd> or &lt;DEL&gt; or
+&lt;ESC&gt;, you must quote it by typing <kbd>C-q</kbd> first.  This function
 of <kbd>C-q</kbd> is analogous to its meaning as an Emacs command: it causes
 the following character to be treated the way a graphic character would
 normally be treated in the same context.
@@ -216,7 +216,7 @@
 this if a search fails because the place you started was too far down in the
 file.  Repeated <kbd>C-r</kbd> keeps looking for more occurrences backwards.
 <kbd>C-s</kbd> starts going forward again.  You can cancel <kbd>C-r</kbd> in a
-search with <kbd>DEL</kbd>.
+search with &lt;DEL&gt;.
 </p>
 <p>  The characters <kbd>C-y</kbd> and <kbd>C-w</kbd> can be used in 
incremental search
 to grab text from the buffer into the search string.  This makes it
@@ -231,10 +231,10 @@
 list of the last 16 things you have searched for is retained, and 
 <kbd>M-p</kbd> and <kbd>M-n</kbd> let you cycle through that ring.
 </p>
-<p>The character <kbd>M-<kbd>TAB</kbd></kbd> does completion on the elements 
in 
+<p>The character <kbd>M-&lt;TAB&gt;</kbd> does completion on the elements in 
 the search history ring.  For example, if you know that you have
 recently searched for the string <code>POTATOE</code>, you could type
-<kbd>C-s P O M-<kbd>TAB</kbd></kbd>.  If you had searched for other strings
+<kbd>C-s P O M-&lt;TAB&gt;</kbd>.  If you had searched for other strings
 beginning with <code>PO</code> then you would be shown a list of them, and
 would need to type more to select one. 
 </p>
@@ -306,7 +306,7 @@
 <dd><p>Recall the next element in the isearch history ring 
 (<code>isearch-ring-advance</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>M-&lt;TAB&gt;</kbd></dt>
 <dd><p>Do completion on the elements in the isearch history ring 
 (<code>isearch-complete</code>).
 </p>
@@ -384,34 +384,34 @@
 you type the entire search string before searching begins.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-s <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-s &lt;RET&gt; <var>string</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search for <var>string</var>.
 </p></dd>
-<dt> <kbd>C-r <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-r &lt;RET&gt; <var>string</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search backward for <var>string</var>.
 </p></dd>
 </dl>
 
-<p>  To do a non-incremental search, first type <kbd>C-s <kbd>RET</kbd></kbd>
+<p>  To do a non-incremental search, first type <kbd>C-s &lt;RET&gt;</kbd>
 (or <kbd>C-s C-m</kbd>).  This enters the minibuffer to read the search string.
-Terminate the string with <kbd>RET</kbd> to start the search.  If the string
+Terminate the string with &lt;RET&gt; to start the search.  If the string
 is not found, the search command gets an error.
 </p>
 <p> By default, <kbd>C-s</kbd> invokes incremental search, but if you give it 
an
 empty argument, which would otherwise be useless, it invokes non-incremental
-search.  Therefore, <kbd>C-s <kbd>RET</kbd></kbd> invokes non-incremental 
search. 
-<kbd>C-r <kbd>RET</kbd></kbd> also works this way.
+search.  Therefore, <kbd>C-s &lt;RET&gt;</kbd> invokes non-incremental search. 
+<kbd>C-r &lt;RET&gt;</kbd> also works this way.
 </p>
 <a name="IDX436"></a>
 <a name="IDX437"></a>
 <p>  Forward and backward non-incremental searches are implemented by the
 commands <code>search-forward</code> and <code>search-backward</code>.  You 
can bind
 these commands to keys.  The reason that incremental
-search is programmed to invoke them as well is that <kbd>C-s 
<kbd>RET</kbd></kbd>
+search is programmed to invoke them as well is that <kbd>C-s &lt;RET&gt;</kbd>
 is the traditional sequence of characters used in Emacs to invoke
 non-incremental search.
 </p>
-<p> Non-incremental searches performed using <kbd>C-s <kbd>RET</kbd></kbd> do
+<p> Non-incremental searches performed using <kbd>C-s &lt;RET&gt;</kbd> do
 not call <code>search-forward</code> right away.  They first check
 if the next character is <kbd>C-w</kbd>, which requests a word search.
 See section <a href="#SEC119">Word Search</a>.
@@ -448,28 +448,28 @@
 to search  without having to know the line breaks.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-s <kbd>RET</kbd> C-w <var>words</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-s &lt;RET&gt; C-w <var>words</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search for <var>words</var>, ignoring differences in punctuation.
 </p></dd>
-<dt> <kbd>C-r <kbd>RET</kbd> C-w <var>words</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-r &lt;RET&gt; C-w <var>words</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search backward for <var>words</var>, ignoring differences in 
punctuation.
 </p></dd>
 </dl>
 
 <p>  Word search is a special case of non-incremental search.  It is invoked
-with <kbd>C-s <kbd>RET</kbd> C-w</kbd> followed by the search string, which
-must always be terminated with another <kbd>RET</kbd>.  Being non-incremental, 
this
+with <kbd>C-s &lt;RET&gt; C-w</kbd> followed by the search string, which
+must always be terminated with another &lt;RET&gt;.  Being non-incremental, 
this
 search does not start until the argument is terminated.  It works by
 constructing a regular expression and searching for that.  See section <a 
href="#SEC120">Regular Expression Search</a>.
 </p>
-<p> You can do a backward word search with <kbd>C-r <kbd>RET</kbd> C-w</kbd>.
+<p> You can do a backward word search with <kbd>C-r &lt;RET&gt; C-w</kbd>.
 </p>
 <a name="IDX438"></a>
 <a name="IDX439"></a>
 <p>  Forward and backward word searches are implemented by the commands
 <code>word-search-forward</code> and <code>word-search-backward</code>.  You 
can
 bind these commands to keys.  The reason that incremental
-search is programmed to invoke them as well is that <kbd>C-s <kbd>RET</kbd> 
C-w</kbd>
+search is programmed to invoke them as well is that <kbd>C-s &lt;RET&gt; 
C-w</kbd>
 is the traditional Emacs sequence of keys for word search.
 </p>
 <hr size="6">
@@ -540,8 +540,8 @@
 <code>re-search-forward</code> and <code>re-search-backward</code>.  You can 
invoke
 them with <kbd>M-x</kbd> or bind them to keys.  You can also call
 <code>re-search-forward</code> by way of incremental regexp search with
-<kbd>M-C-s <kbd>RET</kbd></kbd>; similarly for <code>re-search-backward</code> 
with
-<kbd>M-C-r <kbd>RET</kbd></kbd>.
+<kbd>M-C-s &lt;RET&gt;</kbd>; similarly for <code>re-search-backward</code> 
with
+<kbd>M-C-r &lt;RET&gt;</kbd>.
 </p>
 <hr size="6">
 <a name="Regexps"></a>
@@ -1062,10 +1062,10 @@
 <h3 class="subsection"> 12.7.1 Unconditional Replacement </h3>
 
 <dl compact="compact">
-<dt> <kbd>M-x replace-string <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd> 
<var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x replace-string &lt;RET&gt; <var>string</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace every occurrence of <var>string</var> with <var>newstring</var>.
 </p></dd>
-<dt> <kbd>M-x replace-regexp <kbd>RET</kbd> <var>regexp</var> <kbd>RET</kbd> 
<var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x replace-regexp &lt;RET&gt; <var>regexp</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace every match for <var>regexp</var> with <var>newstring</var>.
 </p></dd>
 </dl>
@@ -1080,7 +1080,7 @@
 </p>
 <p>  When <code>replace-string</code> exits, point is left at the last 
occurrence
 replaced.  The value of point when the <code>replace-string</code> command was
-issued is remembered on the mark ring; <kbd>C-u C-<kbd>SPC</kbd></kbd> moves 
back
+issued is remembered on the mark ring; <kbd>C-u C-&lt;SPC&gt;</kbd> moves back
 there.
 </p>
 <p>  A numeric argument restricts replacement to matches that are surrounded
@@ -1118,13 +1118,13 @@
 whatever matched the <var>d</var>'th parenthesized grouping in 
<var>regexp</var>.
 For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
<kbd>RET</kbd> c[ad]+r <kbd>RET</kbd> \&amp;-safe <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
&lt;RET&gt; c[ad]+r &lt;RET&gt; \&amp;-safe &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>would replace (for example) &lsquo;<samp>cadr</samp>&rsquo; with 
&lsquo;<samp>cadr-safe</samp>&rsquo; and &lsquo;<samp>cddr</samp>&rsquo;
 with &lsquo;<samp>cddr-safe</samp>&rsquo;.
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
<kbd>RET</kbd> \(c[ad]+r\)-safe <kbd>RET</kbd> \1 <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-regexp 
&lt;RET&gt; \(c[ad]+r\)-safe &lt;RET&gt; \1 &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>would perform exactly the opposite replacements.  To include a 
&lsquo;<samp>\</samp>&rsquo;
@@ -1154,7 +1154,7 @@
 <p>  If the arguments to a replace command are in lower case, the command
 preserves case when it makes a replacement.  Thus, the following command:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-string 
<kbd>RET</kbd> foo <kbd>RET</kbd> bar <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x replace-string 
&lt;RET&gt; foo &lt;RET&gt; bar &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>replaces a lower-case &lsquo;<samp>foo</samp>&rsquo; with a lower case 
&lsquo;<samp>bar</samp>&rsquo;, &lsquo;<samp>FOO</samp>&rsquo;
@@ -1190,11 +1190,11 @@
 <h3 class="subsection"> 12.7.4 Query Replace </h3>
 
 <dl compact="compact">
-<dt> <kbd>M-% <var>string</var> <kbd>RET</kbd> <var>newstring</var> 
<kbd>RET</kbd></kbd></dt>
-<dt> <kbd>M-x query-replace <kbd>RET</kbd> <var>string</var> <kbd>RET</kbd> 
<var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-% <var>string</var> &lt;RET&gt; <var>newstring</var> 
&lt;RET&gt;</kbd></dt>
+<dt> <kbd>M-x query-replace &lt;RET&gt; <var>string</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace some occurrences of <var>string</var> with <var>newstring</var>.
 </p></dd>
-<dt> <kbd>M-x query-replace-regexp <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd> <var>newstring</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x query-replace-regexp &lt;RET&gt; <var>regexp</var> &lt;RET&gt; 
<var>newstring</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Replace some matches for <var>regexp</var> with <var>newstring</var>.
 </p></dd>
 </dl>
@@ -1228,27 +1228,27 @@
 <a name="IDX492"></a>
 
 <dl compact="compact">
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>to replace the occurrence with <var>newstring</var>.  This preserves 
case, just
 like <code>replace-string</code>, provided <code>case-replace</code> is 
non-<code>nil</code>,
 as it normally is.
 </p>
 </dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>to skip to the next occurrence without replacing this one.
 </p>
 </dd>
 <dt> <kbd>, <span class="roman">(Comma)</span></kbd></dt>
 <dd><p>to replace this occurrence and display the result.  You are then
 prompted for another input character.  However, since the replacement has
-already been made, <kbd>DEL</kbd> and <kbd>SPC</kbd> are equivalent.  At this
+already been made, &lt;DEL&gt; and &lt;SPC&gt; are equivalent.  At this
 point, you can type <kbd>C-r</kbd> (see below) to alter the replaced text.  To
 undo the replacement, you can type <kbd>C-x u</kbd>. 
 This exits the <code>query-replace</code>.  If you want to do further
-replacement you must use <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> to 
restart (see section <a href="xemacs_9.html#SEC69">Repeating Minibuffer 
Commands</a>).
+replacement you must use <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> to restart 
(see section <a href="xemacs_9.html#SEC69">Repeating Minibuffer Commands</a>).
 </p>
 </dd>
-<dt> <kbd><kbd>ESC</kbd></kbd></dt>
+<dt> <kbd>&lt;ESC&gt;</kbd></dt>
 <dd><p>to exit without doing any more replacements.
 </p>
 </dd>
@@ -1294,7 +1294,7 @@
 
 <p>  If you type any other character, Emacs exits the 
<code>query-replace</code>, and
 executes the character as a command.  To restart the 
<code>query-replace</code>,
-use <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd>, which repeats the 
<code>query-replace</code> because it
+use <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd>, which repeats the 
<code>query-replace</code> because it
 used the minibuffer to read its arguments.  See section <a 
href="xemacs_9.html#SEC69">C-x ESC ESC</a>.
 </p>
 <hr size="6">
Index: texi2html/Tests/xemacs_res/xemacs_16.html
diff -u texi2html/Tests/xemacs_res/xemacs_16.html:1.24 
texi2html/Tests/xemacs_res/xemacs_16.html:1.25
--- texi2html/Tests/xemacs_res/xemacs_16.html:1.24      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_16.html   Sat Apr  8 23:02:08 2006
@@ -98,20 +98,20 @@
 <h2 class="section"> 13.1 Killing Your Mistakes </h2>
 
 <dl compact="compact">
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Delete last character (<code>delete-backward-char</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill last word (<code>backward-kill-word</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd></dt>
 <dd><p>Kill to beginning of sentence (<code>backward-kill-sentence</code>).
 </p></dd>
 </dl>
 
 <a name="IDX499"></a>
 <a name="IDX500"></a>
-<p>  The <kbd>DEL</kbd> character (<code>delete-backward-char</code>) is the 
most
+<p>  The &lt;DEL&gt; character (<code>delete-backward-char</code>) is the most
 important correction command.  When used among graphic (self-inserting)
 characters, it can be thought of as canceling the last character typed.
 </p>
@@ -120,18 +120,18 @@
 <a name="IDX503"></a>
 <a name="IDX504"></a>
 <p>  When your mistake is longer than a couple of characters, it might be more
-convenient to use <kbd>M-<kbd>DEL</kbd></kbd> or <kbd>C-x <kbd>DEL</kbd></kbd>.
-<kbd>M-<kbd>DEL</kbd></kbd> kills back to the start of the last word, and 
<kbd>C-x
-<kbd>DEL</kbd></kbd> kills back to the start of the last sentence.  <kbd>C-x
-<kbd>DEL</kbd></kbd> is particularly useful when you are thinking of what to 
write as
+convenient to use <kbd>M-&lt;DEL&gt;</kbd> or <kbd>C-x &lt;DEL&gt;</kbd>.
+<kbd>M-&lt;DEL&gt;</kbd> kills back to the start of the last word, and <kbd>C-x
+&lt;DEL&gt;</kbd> kills back to the start of the last sentence.  <kbd>C-x
+&lt;DEL&gt;</kbd> is particularly useful when you are thinking of what to 
write as
 you type it, in case you change your mind about phrasing.
-<kbd>M-<kbd>DEL</kbd></kbd> and <kbd>C-x <kbd>DEL</kbd></kbd> save the killed 
text for
+<kbd>M-&lt;DEL&gt;</kbd> and <kbd>C-x &lt;DEL&gt;</kbd> save the killed text 
for
 <kbd>C-y</kbd> and <kbd>M-y</kbd> to retrieve.  See section <a 
href="xemacs_12.html#SEC91">Yanking</a>.
 </p>
-<p>  <kbd>M-<kbd>DEL</kbd></kbd> is often useful even when you have typed only 
a few
+<p>  <kbd>M-&lt;DEL&gt;</kbd> is often useful even when you have typed only a 
few
 characters wrong, if you know you are confused in your typing and aren't
 sure exactly what you typed.  At such a time, you cannot correct with
-<kbd>DEL</kbd> except by looking at the screen to see what you did.  It 
requires
+&lt;DEL&gt; except by looking at the screen to see what you did.  It requires
 less thought to kill the whole word and start over.
 </p>
 <hr size="6">
Index: texi2html/Tests/xemacs_res/xemacs_17.html
diff -u texi2html/Tests/xemacs_res/xemacs_17.html:1.28 
texi2html/Tests/xemacs_res/xemacs_17.html:1.29
--- texi2html/Tests/xemacs_res/xemacs_17.html:1.28      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_17.html   Sat Apr  8 23:02:08 2006
@@ -136,7 +136,7 @@
 specify long file names.  See section <a 
href="xemacs_9.html#SEC63">Completion</a>.
 </p>
 <p>  There is always a <em>default file name</em> which is used if you
-enter an empty argument by typing just <kbd>RET</kbd>.  Normally the default
+enter an empty argument by typing just &lt;RET&gt;.  Normally the default
 file name is the name of the file visited in the current buffer; this
 makes it easy to operate on that file with any of the Emacs file
 commands.
@@ -187,7 +187,7 @@
 displayed in the minibuffer when the function is called; you can delete
 the old directory name and supply a new directory name. For example, if
 the current directory is &lsquo;<tt>/u/rms/gnu</tt>&rsquo;, you can delete 
&lsquo;<tt>gnu</tt>&rsquo;
-and type &lsquo;<tt>oryx</tt>&rsquo; and <kbd>RET</kbd> to create 
&lsquo;<tt>/u/rms/oryx</tt>&rsquo;.
+and type &lsquo;<tt>oryx</tt>&rsquo; and &lt;RET&gt; to create 
&lsquo;<tt>/u/rms/oryx</tt>&rsquo;.
 Removing a directory is similar to creating one.  To remove a directory,
 use <code>remove-directory</code>; it takes one argument, a file name string.
 </p>
@@ -300,7 +300,7 @@
 <a name="IDX542"></a>
 <p>  To visit a file, use the command <kbd>C-x C-f</kbd> 
(<code>find-file</code>).  Follow
 the command with the name of the file you wish to visit, terminated by a
-<kbd>RET</kbd>.  If you are using XEmacs under X, you can also use the
+&lt;RET&gt;.  If you are using XEmacs under X, you can also use the
 <b>Open...</b> command from the <b>File</b> menu bar item. 
 </p>
 <p>  The file name is read using the minibuffer (see section <a 
href="xemacs_9.html#SEC60">The Minibuffer</a>), with
@@ -1083,14 +1083,14 @@
 <h3 class="subsection"> 14.5.3 Recovering Data from Auto-Saves </h3>
 
 <p>  If you want to use the contents of an auto-save file to recover from a
-loss of data, use the command <kbd>M-x recover-file <kbd>RET</kbd> 
<var>file</var>
-<kbd>RET</kbd></kbd>.  Emacs visits <var>file</var> and then (after your 
confirmation)
+loss of data, use the command <kbd>M-x recover-file &lt;RET&gt; <var>file</var>
+&lt;RET&gt;</kbd>.  Emacs visits <var>file</var> and then (after your 
confirmation)
 restores the contents from the auto-save file 
&lsquo;<tt>#<var>file</var>#</tt>&rsquo;.  You
 can then save the file with <kbd>C-x C-s</kbd> to put the recovered text into
 <var>file</var> itself.  For example, to recover file 
&lsquo;<tt>foo.c</tt>&rsquo; from its
 auto-save file &lsquo;<tt>#foo.c#</tt>&rsquo;, do:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x recover-file 
<kbd>RET</kbd> foo.c <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x recover-file 
&lt;RET&gt; foo.c &lt;RET&gt;
 C-x C-s
 </pre></td></tr></table>
 
@@ -1617,7 +1617,7 @@
 <h3 class="subsection"> 14.6.6 Examining And Comparing Old Versions </h3>
 
 <dl compact="compact">
-<dt> <kbd>C-x v ~ <var>version</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x v ~ <var>version</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Examine version <var>version</var> of the visited file, in a buffer of 
its
 own (<code>vc-version-other-window</code>).
 </p>
@@ -1627,7 +1627,7 @@
 of the file.
 </p>
 </dd>
-<dt> <kbd>C-u C-x v = <var>file</var> <kbd>RET</kbd> <var>oldvers</var> 
<kbd>RET</kbd> <var>newvers</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-u C-x v = <var>file</var> &lt;RET&gt; <var>oldvers</var> 
&lt;RET&gt; <var>newvers</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Compare the specified two versions of <var>file</var>.
 </p></dd>
 </dl>
@@ -1635,7 +1635,7 @@
 <a name="IDX607"></a>
 <a name="IDX608"></a>
 <p>  You can examine any version of a file by first visiting it, and then
-using <kbd>C-x v ~ <var>version</var> <kbd>RET</kbd></kbd>
+using <kbd>C-x v ~ <var>version</var> &lt;RET&gt;</kbd>
 (<code>vc-version-other-window</code>).  This puts the text of version
 <var>version</var> in a file named 
&lsquo;<tt><var>filename</var>.~<var>version</var>~</tt>&rsquo;,
 then visits it in a separate window.
@@ -1811,7 +1811,7 @@
 <dd><a name="IDX613"></a>
 <a name="IDX614"></a>
 </dd>
-<dt> <code>C-x v s <var>name</var> <kbd>RET</kbd></code></dt>
+<dt> <code>C-x v s <var>name</var> &lt;RET&gt;</code></dt>
 <dd><p>Define the last saved versions of every registered file in or under the
 current directory as a snapshot named <var>name</var>
 (<code>vc-create-snapshot</code>).
@@ -1819,7 +1819,7 @@
 <a name="IDX615"></a>
 <a name="IDX616"></a>
 </dd>
-<dt> <code>C-x v r <var>name</var> <kbd>RET</kbd></code></dt>
+<dt> <code>C-x v r <var>name</var> &lt;RET&gt;</code></dt>
 <dd><p>Check out all registered files at or below the current directory level
 using whatever versions correspond to the snapshot <var>name</var>
 (<code>vc-retrieve-snapshot</code>).
@@ -2023,13 +2023,13 @@
 file name which is either a  directory to be listed or pattern
 containing wildcards for the files to be listed.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/etc 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/etc 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>lists all the files in directory &lsquo;<tt>/u2/emacs/etc</tt>&rsquo;.  An 
example of
 specifying a file name pattern is:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/src/*.c 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-d /u2/emacs/src/*.c 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>  Normally, <kbd>C-x C-d</kbd> prints a brief directory listing containing 
just
@@ -2086,8 +2086,8 @@
 you can use <kbd>C-x `</kbd> to visit successive changed locations in the two
 source files.  You can also move to a particular hunk of changes and
 type <kbd>C-c C-c</kbd> to find the corresponding source location.  You can
-also use the other special commands of Compilation mode: <kbd>SPC</kbd> and
-<kbd>DEL</kbd> for scrolling, and <kbd>M-p</kbd> and <kbd>M-n</kbd> for cursor 
motion.
+also use the other special commands of Compilation mode: &lt;SPC&gt; and
+&lt;DEL&gt; for scrolling, and <kbd>M-p</kbd> and <kbd>M-n</kbd> for cursor 
motion.
 See section <a href="xemacs_25.html#SEC252">Running &ldquo;make&rdquo;, or 
Compilers Generally</a>.
 </p>
 <a name="IDX626"></a>
@@ -2224,9 +2224,9 @@
 the cursor at the beginning of the filename on the line, rather than
 at the beginning of the line.
 </p>
-<p>  For extra convenience, <kbd>SPC</kbd> and <kbd>n</kbd> in Dired are 
equivalent to
+<p>  For extra convenience, &lt;SPC&gt; and <kbd>n</kbd> in Dired are 
equivalent to
 <kbd>C-n</kbd>.  <kbd>p</kbd> is equivalent to <kbd>C-p</kbd>.  Moving by 
lines is done so
-often in Dired that it deserves to be easy to type.  <kbd>DEL</kbd> (move up 
and
+often in Dired that it deserves to be easy to type.  &lt;DEL&gt; (move up and
 unflag) is often useful simply for moving up.
 </p>
 <p>  The <kbd>g</kbd> command in Dired runs <code>revert-buffer</code> to 
reinitialize
@@ -2265,7 +2265,7 @@
 <dt> <kbd>u</kbd></dt>
 <dd><p>Remove deletion-flag on this line.
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Remove deletion-flag on previous line, moving point to that line.
 </p></dd>
 <dt> <kbd>x</kbd></dt>
@@ -2293,8 +2293,8 @@
 <p>  The files are flagged for deletion rather than deleted immediately to
 avoid the danger of deleting a file accidentally.  Until you direct Dired
 to delete the flagged files, you can remove deletion flags using the
-commands <kbd>u</kbd> and <kbd>DEL</kbd>.  <kbd>u</kbd> works just like 
<kbd>d</kbd>, but
-removes flags rather than making flags.  <kbd>DEL</kbd> moves upward, removing
+commands <kbd>u</kbd> and &lt;DEL&gt;.  <kbd>u</kbd> works just like 
<kbd>d</kbd>, but
+removes flags rather than making flags.  &lt;DEL&gt; moves upward, removing
 flags; it is like <kbd>u</kbd> with numeric argument automatically negated.
 </p>
 <p>  To delete the flagged files, type <kbd>x</kbd>.  This command first 
displays a
@@ -2455,8 +2455,8 @@
 <p>  <kbd>M-x view-file</kbd> allows you to scan or read a file by sequential
 screenfuls.  It reads a file name argument using the minibuffer.  After
 reading the file into an Emacs buffer, <code>view-file</code> reads and 
displays
-one windowful.  You can then type <kbd>SPC</kbd> to scroll forward one window,
-or <kbd>DEL</kbd> to scroll backward.  Various other commands are provided for
+one windowful.  You can then type &lt;SPC&gt; to scroll forward one window,
+or &lt;DEL&gt; to scroll backward.  Various other commands are provided for
 moving around in the file, but none for changing it; type <kbd>C-h</kbd> while
 viewing a file for a list of them.  Most commands are the default Emacs
 cursor motion commands.  To exit from viewing, type <kbd>C-c</kbd>.
Index: texi2html/Tests/xemacs_res/xemacs_18.html
diff -u texi2html/Tests/xemacs_res/xemacs_18.html:1.25 
texi2html/Tests/xemacs_res/xemacs_18.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_18.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_18.html   Sat Apr  8 23:02:08 2006
@@ -130,10 +130,10 @@
 <h2 class="section"> 15.1 Creating and Selecting Buffers </h2>
 
 <dl compact="compact">
-<dt> <kbd>C-x b <var>buffer</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x b <var>buffer</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select or create a buffer named <var>buffer</var> 
(<code>switch-to-buffer</code>).
 </p></dd>
-<dt> <kbd>C-x 4 b <var>buffer</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 b <var>buffer</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Similar, but select a buffer named <var>buffer</var> in another window
 (<code>switch-to-buffer-other-window</code>).
 </p></dd>
@@ -149,7 +149,7 @@
 <a name="IDX650"></a>
 <a name="IDX651"></a>
 <p>  To select a buffer named <var>bufname</var>, type <kbd>C-x b 
<var>bufname</var>
-<kbd>RET</kbd></kbd>.  This is the command <code>switch-to-buffer</code> with 
argument
+&lt;RET&gt;</kbd>.  This is the command <code>switch-to-buffer</code> with 
argument
 <var>bufname</var>.  You can use completion on an abbreviation for the buffer
 name you want (see section <a href="xemacs_9.html#SEC63">Completion</a>).  An 
empty argument to <kbd>C-x b</kbd>
 specifies the most recently selected buffer that is not displayed in any
@@ -157,7 +157,7 @@
 </p>
 <p>  Most buffers are created when you visit files, or use Emacs commands
 that display text.  You can also create a buffer explicitly by typing
-<kbd>C-x b <var>bufname</var> <kbd>RET</kbd></kbd>, which creates a new, empty 
buffer
+<kbd>C-x b <var>bufname</var> &lt;RET&gt;</kbd>, which creates a new, empty 
buffer
 that is not visiting any file, and selects it for editing.  The new
 buffer's major mode is determined by the value of
 <code>default-major-mode</code> (see section <a 
href="xemacs_21.html#SEC190">Major Modes</a>).  Buffers not visiting
@@ -339,7 +339,7 @@
 <a name="IDX663"></a>
  
 <p>  <kbd>C-x k</kbd> (<code>kill-buffer</code>) kills one buffer, whose name 
you
-specify in the minibuffer.  If you type just <kbd>RET</kbd> in the
+specify in the minibuffer.  If you type just &lt;RET&gt; in the
 minibuffer, the default, killing the current buffer, is used.  If the
 current buffer is killed, the buffer that has been selected recently but
 does not appear in any window now is selected.  If the buffer being
@@ -421,7 +421,7 @@
 <dt> <kbd>u</kbd></dt>
 <dd><p>Remove any request made for the current line, and move down.
 </p></dd>
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Move to previous line and remove any request made for that line.
 </p></dd>
 </dl>
Index: texi2html/Tests/xemacs_res/xemacs_19.html
diff -u texi2html/Tests/xemacs_res/xemacs_19.html:1.23 
texi2html/Tests/xemacs_res/xemacs_19.html:1.24
--- texi2html/Tests/xemacs_res/xemacs_19.html:1.23      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_19.html   Sat Apr  8 23:02:08 2006
@@ -319,15 +319,15 @@
 <a name="IDX682"></a>
 <a name="IDX683"></a>
 <dl compact="compact">
-<dt> <kbd>C-x 4 b <var>bufname</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 b <var>bufname</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select buffer <var>bufname</var> in another window.  This runs
 <code>switch-to-buffer-other-window</code>.
 </p></dd>
-<dt> <kbd>C-x 4 f <var>filename</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 f <var>filename</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Visit file <var>filename</var> and select its buffer in another window. 
 This
 runs <code>find-file-other-window</code>.  See section <a 
href="xemacs_17.html#SEC136">Visiting Files</a>.
 </p></dd>
-<dt> <kbd>C-x 4 d <var>directory</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x 4 d <var>directory</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select a Dired buffer for directory <var>directory</var> in another 
window.
 This runs <code>dired-other-window</code>.  See section <a 
href="xemacs_17.html#SEC163">Dired, the Directory Editor</a>.
 </p></dd>
Index: texi2html/Tests/xemacs_res/xemacs_20.html
diff -u texi2html/Tests/xemacs_res/xemacs_20.html:1.29 
texi2html/Tests/xemacs_res/xemacs_20.html:1.30
--- texi2html/Tests/xemacs_res/xemacs_20.html:1.29      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_20.html   Sat Apr  8 23:02:08 2006
@@ -177,7 +177,7 @@
 language, to make it convenient to type them.
 </p>
 <a name="IDX700"></a>
-<p>  The prefix key <kbd>C-x <kbd>RET</kbd></kbd> is used for commands that 
pertain
+<p>  The prefix key <kbd>C-x &lt;RET&gt;</kbd> is used for commands that 
pertain
 to world scripts, coding systems, and input methods.
 </p>
 
@@ -237,7 +237,7 @@
 <a name="IDX703"></a>
 <p>  To display information about the effects of a certain language
 environment <var>lang-env</var>, use the command <kbd>C-h L <var>lang-env</var>
-<kbd>RET</kbd></kbd> (<code>describe-language-environment</code>).  This tells 
you which
+&lt;RET&gt;</kbd> (<code>describe-language-environment</code>).  This tells 
you which
 languages this language environment is useful for, and lists the
 character sets, coding systems, and input methods that go with it.  It
 also shows some sample text to illustrate scripts used in this language
@@ -294,7 +294,7 @@
 corresponds to many different Chinese characters, you must select one of
 the alternatives using special XEmacs commands.  Keys such as <kbd>C-f</kbd>,
 <kbd>C-b</kbd>, <kbd>C-n</kbd>, <kbd>C-p</kbd>, and digits have special 
definitions in
-this situation, used for selecting among the alternatives.  <kbd>TAB</kbd>
+this situation, used for selecting among the alternatives.  &lt;TAB&gt;
 displays a buffer showing all the possibilities.
 </p>
 <p>   In Japanese input methods, first you input a whole word using
@@ -314,7 +314,7 @@
 entering the separate letter and accent.  For example, <kbd>e ' '</kbd> gives
 you the two characters &lsquo;<samp>e'</samp>&rsquo;.  Another way is to type 
another letter
 after the <kbd>e</kbd>&mdash;something that won't combine with that&mdash;and
-immediately delete it.  For example, you could type <kbd>e e <kbd>DEL</kbd>
+immediately delete it.  For example, you could type <kbd>e e &lt;DEL&gt;
 '</kbd> to get separate &lsquo;<samp>e</samp>&rsquo; and 
&lsquo;<samp>'</samp>&rsquo;.
 </p>
 <p>  Another method, more general but not quite as easy to type, is to use
@@ -362,12 +362,12 @@
 <dd><p>Enable or disable use of the selected input method.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> C-\ <var>method</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; C-\ <var>method</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Select a new input method for the current buffer.
 </p>
 </dd>
-<dt> <kbd>C-h I <var>method</var> <kbd>RET</kbd></kbd></dt>
-<dt> <kbd>C-h C-\ <var>method</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h I <var>method</var> &lt;RET&gt;</kbd></dt>
+<dt> <kbd>C-h C-\ <var>method</var> &lt;RET&gt;</kbd></dt>
 <dd><a name="IDX706"></a>
 <a name="IDX707"></a>
 <a name="IDX708"></a>
@@ -384,7 +384,7 @@
 <a name="IDX710"></a>
 <a name="IDX711"></a>
 <p>  To choose an input method for the current buffer, use <kbd>C-x
-<kbd>RET</kbd> C-\</kbd> (<code>select-input-method</code>).  This command 
reads the
+&lt;RET&gt; C-\</kbd> (<code>select-input-method</code>).  This command reads 
the
 input method name with the minibuffer; the name normally starts with the
 language environment that it is meant to be used with.  The variable
 <code>current-input-method</code> records which input method is selected.
@@ -399,7 +399,7 @@
 </p>
 <p>  If you type <kbd>C-\</kbd> and you have not yet selected an input method,
 it prompts for you to specify one.  This has the same effect as using
-<kbd>C-x <kbd>RET</kbd> C-\</kbd> to specify an input method.
+<kbd>C-x &lt;RET&gt; C-\</kbd> to specify an input method.
 </p>
 <a name="IDX714"></a>
 <p>  Selecting a language environment specifies a default input method for
@@ -537,11 +537,11 @@
 newline, carriage-return linefeed, and just carriage-return.
 </p>
 <dl compact="compact">
-<dt> <kbd>C-h C <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Describe coding system <var>coding</var>.
 </p>
 </dd>
-<dt> <kbd>C-h C <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-h C &lt;RET&gt;</kbd></dt>
 <dd><p>Describe the coding systems currently in use.
 </p>
 </dd>
@@ -740,26 +740,26 @@
 system, you can use these commands to specify one:
 </p>
 <dl compact="compact">
-<dt> <kbd>C-x <kbd>RET</kbd> f <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; f <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for the visited file
 in the current buffer.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> c <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; c <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Specify coding system <var>coding</var> for the immediately following
 command.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> k <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; k <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for keyboard input.  (This feature 
is
 non-functional and is temporarily disabled.)
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> t <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; t <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for terminal output.
 </p>
 </dd>
-<dt> <kbd>C-x <kbd>RET</kbd> p <var>coding</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;RET&gt; p <var>coding</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Use coding system <var>coding</var> for subprocess input and output
 in the current buffer.
 </p></dd>
@@ -777,7 +777,7 @@
 <a name="IDX726"></a>
 <a name="IDX727"></a>
 <p>  Another way to specify the coding system for a file is when you visit
-the file.  First use the command <kbd>C-x <kbd>RET</kbd> c</kbd>
+the file.  First use the command <kbd>C-x &lt;RET&gt; c</kbd>
 (<code>universal-coding-system-argument</code>); this command uses the
 minibuffer to read a coding system name.  After you exit the minibuffer,
 the specified coding system is used for <em>the immediately following
@@ -809,7 +809,7 @@
 </p>
 <a name="IDX729"></a>
 <a name="IDX730"></a>
-<p>  The command <kbd>C-x <kbd>RET</kbd> t</kbd> 
(<code>set-terminal-coding-system</code>)
+<p>  The command <kbd>C-x &lt;RET&gt; t</kbd> 
(<code>set-terminal-coding-system</code>)
 specifies the coding system for terminal output.  If you specify a
 character code for terminal output, all characters output to the
 terminal are translated into that coding system.
@@ -822,7 +822,7 @@
 </p>
 <a name="IDX731"></a>
 <a name="IDX732"></a>
-<p>  The command <kbd>C-x <kbd>RET</kbd> k</kbd> 
(<code>set-keyboard-coding-system</code>)
+<p>  The command <kbd>C-x &lt;RET&gt; k</kbd> 
(<code>set-keyboard-coding-system</code>)
 specifies the coding system for keyboard input.  Character-code
 translation of keyboard input is useful for terminals with keys that
 send non-ASCII graphic characters&mdash;for example, some terminals designed
@@ -842,7 +842,7 @@
 </p>
 <a name="IDX733"></a>
 <a name="IDX734"></a>
-<p>  The command <kbd>C-x <kbd>RET</kbd> p</kbd> 
(<code>set-buffer-process-coding-system</code>)
+<p>  The command <kbd>C-x &lt;RET&gt; p</kbd> 
(<code>set-buffer-process-coding-system</code>)
 specifies the coding system for input and output to a subprocess.  This
 command applies to the current buffer; normally, each subprocess has its
 own buffer, and thus you can use this command to specify translation to
Index: texi2html/Tests/xemacs_res/xemacs_21.html
diff -u texi2html/Tests/xemacs_res/xemacs_21.html:1.21 
texi2html/Tests/xemacs_res/xemacs_21.html:1.22
--- texi2html/Tests/xemacs_res/xemacs_21.html:1.21      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_21.html   Sat Apr  8 23:02:08 2006
@@ -75,8 +75,8 @@
 mode or Text mode.
 </p>
 <p>  Selecting a major mode changes the meanings of a few keys to become
-more specifically adapted to the language being edited.  <kbd>TAB</kbd>,
-<kbd>DEL</kbd>, and <kbd>LFD</kbd> are changed frequently.  In addition, 
commands
+more specifically adapted to the language being edited.  &lt;TAB&gt;,
+&lt;DEL&gt;, and &lt;LFD&gt; are changed frequently.  In addition, commands
 which handle comments use the mode to determine how to delimit comments.
 Many major modes redefine the syntactical properties of characters
 appearing in the buffer.  See section <a href="xemacs_30.html#SEC374">The 
Syntax Table</a>.
@@ -94,7 +94,7 @@
 <p>  Most programming language major modes specify that only blank lines
 separate paragraphs.  This is so that the paragraph commands remain useful.
 See section <a href="xemacs_23.html#SEC208">Paragraphs</a>.  They also cause 
Auto Fill mode to use the definition of
-<kbd>TAB</kbd> to indent the new lines it creates.  This is because most lines
+&lt;TAB&gt; to indent the new lines it creates.  This is because most lines
 in a program are usually indented.  See section <a 
href="xemacs_22.html#SEC192">Indentation</a>.
 </p>
 <table class="menu" border="0" cellspacing="0">
Index: texi2html/Tests/xemacs_res/xemacs_22.html
diff -u texi2html/Tests/xemacs_res/xemacs_22.html:1.25 
texi2html/Tests/xemacs_res/xemacs_22.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_22.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_22.html   Sat Apr  8 23:02:08 2006
@@ -62,15 +62,15 @@
 <h1 class="chapter"> 19. Indentation </h1>
 
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Indent current line &ldquo;appropriately&rdquo; in a mode-dependent 
fashion.
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
-<dd><p>Perform <kbd>RET</kbd> followed by <kbd>TAB</kbd> 
(<code>newline-and-indent</code>).
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
+<dd><p>Perform &lt;RET&gt; followed by &lt;TAB&gt; 
(<code>newline-and-indent</code>).
 </p></dd>
 <dt> <kbd>M-^</kbd></dt>
 <dd><p>Merge two lines (<code>delete-indentation</code>).  This would cancel 
out
-the effect of <kbd>LFD</kbd>.
+the effect of &lt;LFD&gt;.
 </p></dd>
 <dt> <kbd>C-M-o</kbd></dt>
 <dd><p>Split line at point; text on the line after point becomes a new line
@@ -83,7 +83,7 @@
 <dt> <kbd>C-M-\</kbd></dt>
 <dd><p>Indent several lines to same column (<code>indent-region</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;TAB&gt;</kbd></dt>
 <dd><p>Shift block of lines rigidly right or left 
(<code>indent-rigidly</code>).
 </p></dd>
 <dt> <kbd>M-i</kbd></dt>
@@ -101,16 +101,16 @@
 code, lines are indented according to their nesting in parentheses.  The
 same general idea is used for C code, though details differ.
 </p>
-<p>   Use the <kbd>TAB</kbd> command to indent a line whatever the language.
+<p>   Use the &lt;TAB&gt; command to indent a line whatever the language.
 Each major mode defines this command to perform indentation appropriate
-for the particular language.  In Lisp mode, <kbd>TAB</kbd> aligns a line
+for the particular language.  In Lisp mode, &lt;TAB&gt; aligns a line
 according to its depth in parentheses.  No matter where in the line you
-are when you type <kbd>TAB</kbd>, it aligns the line as a whole.  In C mode,
-<kbd>TAB</kbd> implements a subtle and sophisticated indentation style that
+are when you type &lt;TAB&gt;, it aligns the line as a whole.  In C mode,
+&lt;TAB&gt; implements a subtle and sophisticated indentation style that
 knows about many aspects of C syntax.
 </p>
 <a name="IDX740"></a>
-<p>  In Text mode, <kbd>TAB</kbd> runs the command 
<code>tab-to-tab-stop</code>, which
+<p>  In Text mode, &lt;TAB&gt; runs the command <code>tab-to-tab-stop</code>, 
which
 indents to the next tab stop column.  You can set the tab stops with
 <kbd>M-x edit-tab-stops</kbd>.
 </p>
@@ -146,7 +146,7 @@
 <h2 class="section"> 19.1 Indentation Commands and Techniques </h2>
 
 <p>  If you just want to insert a tab character in the buffer, you can type
-<kbd>C-q <kbd>TAB</kbd></kbd>.
+<kbd>C-q &lt;TAB&gt;</kbd>.
 </p>
 <a name="IDX741"></a>
 <a name="IDX742"></a>
@@ -155,8 +155,8 @@
 positions point at the first non-blank character on the line.
 </p>
 <p>  To insert an indented line before the current line, type <kbd>C-a C-o
-<kbd>TAB</kbd></kbd>.  To make an indented line after the current line, use
-<kbd>C-e <kbd>LFD</kbd></kbd>.
+&lt;TAB&gt;</kbd>.  To make an indented line after the current line, use
+<kbd>C-e &lt;LFD&gt;</kbd>.
 </p>
 <a name="IDX743"></a>
 <a name="IDX744"></a>
@@ -186,10 +186,10 @@
 <a name="IDX752"></a>
 <p>  There are also commands for changing the indentation of several lines at
 once.  <kbd>Control-Meta-\</kbd> (<code>indent-region</code>) gives each line 
which
-begins in the region the &ldquo;usual&rdquo; indentation by invoking 
<kbd>TAB</kbd> at the
+begins in the region the &ldquo;usual&rdquo; indentation by invoking 
&lt;TAB&gt; at the
 beginning of the line.  A numeric argument specifies the column to indent
 to.  Each line is shifted left or right so that its first non-blank
-character appears in that column.  <kbd>C-x <kbd>TAB</kbd></kbd>
+character appears in that column.  <kbd>C-x &lt;TAB&gt;</kbd>
 (<code>indent-rigidly</code>) moves all the lines in the region right by its
 argument (left, for negative arguments).  The whole group of lines moves
 rigidly sideways, which is how the command gets its name.
@@ -204,7 +204,7 @@
 indentation point then applicable is used.  If no indentation point is
 applicable even then, <code>tab-to-tab-stop</code> is run (see next section).
 </p>
-<p>  <code>indent-relative</code> is the definition of <kbd>TAB</kbd> in 
Indented Text
+<p>  <code>indent-relative</code> is the definition of &lt;TAB&gt; in Indented 
Text
 mode.  See section <a href="xemacs_23.html#SEC196">Commands for Human 
Languages</a>.
 </p>
 <hr size="6">
@@ -228,7 +228,7 @@
 </tr></table>
 <h2 class="section"> 19.2 Tab Stops </h2>
 
-<p>  For typing in tables, you can use Text mode's definition of 
<kbd>TAB</kbd>,
+<p>  For typing in tables, you can use Text mode's definition of &lt;TAB&gt;,
 <code>tab-to-tab-stop</code>.  This command inserts indentation before point,
 enough to reach the next tab stop column.  Even if you are not in Text mode,
 this function is associated with <kbd>M-i</kbd> anyway.
Index: texi2html/Tests/xemacs_res/xemacs_23.html
diff -u texi2html/Tests/xemacs_res/xemacs_23.html:1.28 
texi2html/Tests/xemacs_res/xemacs_23.html:1.29
--- texi2html/Tests/xemacs_res/xemacs_23.html:1.28      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_23.html   Sat Apr  8 23:02:08 2006
@@ -130,7 +130,7 @@
 
 <p>  You should use Text mode&mdash;rather than Fundamental or Lisp 
mode&mdash;to
 edit files of text in a human language.  Invoke <kbd>M-x text-mode</kbd> to
-enter Text mode.  In Text mode, <kbd>TAB</kbd> runs the function
+enter Text mode.  In Text mode, &lt;TAB&gt; runs the function
 <code>tab-to-tab-stop</code>, which allows you to use arbitrary tab stops set
 with <kbd>M-x edit-tab-stops</kbd> (see section <a 
href="xemacs_22.html#SEC194">Tab Stops</a>).  Features concerned
 with comments in programs are turned off unless they are explicitly invoked.
@@ -139,10 +139,10 @@
 </p>
 <a name="IDX760"></a>
 <p>  A similar variant mode is Indented Text mode, intended for editing
-text in which most lines are indented.  This mode defines <kbd>TAB</kbd> to
+text in which most lines are indented.  This mode defines &lt;TAB&gt; to
 run <code>indent-relative</code> (see section <a 
href="xemacs_22.html#SEC192">Indentation</a>), and makes Auto Fill
 indent the lines it creates.  As a result, a line made by Auto Filling,
-or by <kbd>LFD</kbd>, is normally indented just like the previous line.  Use
+or by &lt;LFD&gt;, is normally indented just like the previous line.  Use
 <kbd>M-x indented-text-mode</kbd> to select this mode.
 </p>
 <a name="IDX761"></a>
@@ -227,11 +227,11 @@
 <p>  The other feature of Nroff mode is Electric Nroff newline mode.  
 This is a minor mode that you can turn on or off with
 <kbd>M-x electric-nroff-mode</kbd> (see section <a 
href="xemacs_30.html#SEC352">Minor Modes</a>).  When the mode is
-on and you use <kbd>RET</kbd> to end a line containing an nroff command
+on and you use &lt;RET&gt; to end a line containing an nroff command
 that opens a kind of grouping, Emacs automatically inserts the matching
 nroff command to close that grouping on the following line.  For
 example, if you are at the beginning of a line and type <kbd>.(b
-<kbd>RET</kbd></kbd>, the matching command &lsquo;<samp>.)b</samp>&rsquo; will 
be inserted on a new
+&lt;RET&gt;</kbd>, the matching command &lsquo;<samp>.)b</samp>&rsquo; will be 
inserted on a new
 line following point.
 </p>
 <a name="IDX769"></a>
@@ -342,7 +342,7 @@
 <dd><p>Insert, according to context, either &lsquo;<samp>``</samp>&rsquo; or 
&lsquo;<samp>&quot;</samp>&rsquo; or
 &lsquo;<samp>''</samp>&rsquo; (<code>TeX-insert-quote</code>).
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
 <dd><p>Insert a paragraph break (two newlines) and check the previous
 paragraph for unbalanced braces or dollar signs
 (<code>tex-terminate-<br>paragraph</code>).
@@ -394,7 +394,7 @@
 <a name="IDX776"></a>
 <a name="IDX777"></a>
 <a name="IDX778"></a>
-<p>  There are two commands for checking the matching of braces.  
<kbd>LFD</kbd>
+<p>  There are two commands for checking the matching of braces.  &lt;LFD&gt;
 (<code>tex-terminate-paragraph</code>) checks the paragraph before point, and
 inserts two newlines to start a new paragraph.  It prints a message in the
 echo area if any mismatch is found.  <kbd>M-x validate-tex-buffer</kbd> checks
@@ -879,7 +879,7 @@
 <dt> <kbd>M-d</kbd></dt>
 <dd><p>Kill up to the end of a word (<code>kill-word</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to the beginning of a word (<code>backward-kill-word</code>).
 </p></dd>
 <dt> <kbd>M-@</kbd></dt>
@@ -893,8 +893,8 @@
 
 <p>  Notice how these keys form a series that parallels the
 character-based <kbd>C-f</kbd>, <kbd>C-b</kbd>, <kbd>C-d</kbd>, <kbd>C-t</kbd> 
and
-<kbd>DEL</kbd>.  <kbd>M-@</kbd> is related to <kbd>C-@</kbd>, which is an 
alias for
-<kbd>C-<kbd>SPC</kbd></kbd>.
+&lt;DEL&gt;.  <kbd>M-@</kbd> is related to <kbd>C-@</kbd>, which is an alias 
for
+<kbd>C-&lt;SPC&gt;</kbd>.
 </p>
 <a name="IDX823"></a>
 <a name="IDX824"></a>
@@ -917,16 +917,16 @@
 just the part after point.  If some punctuation comes between point and the
 next word, it is killed along with the word.  (To kill only the
 next word but not the punctuation before it, simply type <kbd>Meta-f</kbd> to 
get
-to the end and kill the word backwards with <kbd>Meta-<kbd>DEL</kbd></kbd>.)
+to the end and kill the word backwards with <kbd>Meta-&lt;DEL&gt;</kbd>.)
 <kbd>Meta-d</kbd> takes arguments just like <kbd>Meta-f</kbd>.
 </p>
 <a name="IDX829"></a>
 <a name="IDX830"></a>
-<p>  <kbd>Meta-<kbd>DEL</kbd></kbd> (<code>backward-kill-word</code>) kills 
the word before
+<p>  <kbd>Meta-&lt;DEL&gt;</kbd> (<code>backward-kill-word</code>) kills the 
word before
 point.  It kills everything from point back to where <kbd>Meta-b</kbd> would
 move to.  If point is after the space in &lsquo;<samp>FOO, BAR</samp>&rsquo;, 
then
 &lsquo;<samp>FOO, </samp>&rsquo; is killed.   To kill just 
&lsquo;<samp>FOO</samp>&rsquo;, type
-<kbd>Meta-b Meta-d</kbd> instead of <kbd>Meta-<kbd>DEL</kbd></kbd>.
+<kbd>Meta-b Meta-d</kbd> instead of <kbd>Meta-&lt;DEL&gt;</kbd>.
 </p>
 <a name="IDX831"></a>
 <a name="IDX832"></a>
@@ -985,7 +985,7 @@
 <dt> <kbd>M-k</kbd></dt>
 <dd><p>Kill forward to the end of the sentence (<code>kill-sentence</code>).
 </p></dd>
-<dt> <kbd>C-x <kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to the beginning of the sentence 
<br>(<code>backward-kill-sentence</code>).
 </p></dd>
 </dl>
@@ -1019,7 +1019,7 @@
 sentence.  With minus one as an argument it kills back to the beginning
 of the sentence.  Larger arguments serve as repeat counts.
 </p>
-<p>  There is a special command, <kbd>C-x <kbd>DEL</kbd></kbd>
+<p>  There is a special command, <kbd>C-x &lt;DEL&gt;</kbd>
 (<code>backward-kill-sentence</code>), for killing back to the beginning of a
 sentence, which is useful when you change your mind in the middle of
 composing text.
@@ -1136,7 +1136,7 @@
 example, if a file is printed on a line printer, each &ldquo;page&rdquo; of the
 file starts on a new page of paper.  Emacs treats a page-separator
 character just like any other character.  It can be inserted with
-<kbd>C-q C-l</kbd> or deleted with <kbd>DEL</kbd>.  You are free to
+<kbd>C-q C-l</kbd> or deleted with &lt;DEL&gt;.  You are free to
 paginate your file or not.  However, since pages are often meaningful
 divisions of the file, commands are provided to move over them and
 operate on them.
@@ -1259,14 +1259,14 @@
 
 <p>  <em>Auto Fill</em> mode is a minor mode in which lines are broken
 automatically when they become too wide.  Breaking happens only when
-you type a <kbd>SPC</kbd> or <kbd>RET</kbd>.
+you type a &lt;SPC&gt; or &lt;RET&gt;.
 </p>
 <dl compact="compact">
 <dt> <kbd>M-x auto-fill-mode</kbd></dt>
 <dd><p>Enable or disable Auto Fill mode.
 </p></dd>
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>In Auto Fill mode, break lines when appropriate.
 </p></dd>
 </dl>
@@ -1282,13 +1282,13 @@
 </p>
 <p>  In Auto Fill mode, lines are broken automatically at spaces when they get
 longer than desired.  Line breaking and rearrangement takes place
-only when you type <kbd>SPC</kbd> or <kbd>RET</kbd>.  To insert a space
-or newline without permitting line-breaking, type <kbd>C-q 
<kbd>SPC</kbd></kbd> or
-<kbd>C-q <kbd>LFD</kbd></kbd> (recall that a newline is really a linefeed).
+only when you type &lt;SPC&gt; or &lt;RET&gt;.  To insert a space
+or newline without permitting line-breaking, type <kbd>C-q &lt;SPC&gt;</kbd> or
+<kbd>C-q &lt;LFD&gt;</kbd> (recall that a newline is really a linefeed).
 <kbd>C-o</kbd> inserts a newline without line breaking.
 </p>
 <p>  Auto Fill mode works well with Lisp mode: when it makes a new line in
-Lisp mode, it indents that line with <kbd>TAB</kbd>.  If a line ending in a
+Lisp mode, it indents that line with &lt;TAB&gt;.  If a line ending in a
 Lisp comment gets too long, the text of the comment is split into two
 comment lines.  Optionally, new comment delimiters are inserted at the
 end of the first line and the beginning of the second, so that each line
Index: texi2html/Tests/xemacs_res/xemacs_24.html
diff -u texi2html/Tests/xemacs_res/xemacs_24.html:1.30 
texi2html/Tests/xemacs_res/xemacs_24.html:1.31
--- texi2html/Tests/xemacs_res/xemacs_24.html:1.30      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_24.html   Sat Apr  8 23:02:08 2006
@@ -157,17 +157,17 @@
 <p>  There are several variants of Lisp mode, which differ in the way they
 interface to Lisp execution.  See section <a 
href="xemacs_25.html#SEC253">Major Modes for Lisp</a>.
 </p>
-<p>  Each of the programming language modes defines the <kbd>TAB</kbd> key to 
run
+<p>  Each of the programming language modes defines the &lt;TAB&gt; key to run
 an indentation function that knows the indentation conventions of that
 language and updates the current line's indentation accordingly.  For
-example, in C mode <kbd>TAB</kbd> is bound to <code>c-indent-line</code>.  
<kbd>LFD</kbd>
-is normally defined to do <kbd>RET</kbd> followed by <kbd>TAB</kbd>; thus it, 
too,
+example, in C mode &lt;TAB&gt; is bound to <code>c-indent-line</code>.  
&lt;LFD&gt;
+is normally defined to do &lt;RET&gt; followed by &lt;TAB&gt;; thus it, too,
 indents in a mode-specific fashion.
 </p>
 <a name="IDX889"></a>
 <a name="IDX890"></a>
 <p>  In most programming languages, indentation is likely to vary from line to
-line.  So the major modes for those languages rebind <kbd>DEL</kbd> to treat a
+line.  So the major modes for those languages rebind &lt;DEL&gt; to treat a
 tab as if it were the equivalent number of spaces (using the command
 <code>backward-delete-char-untabify</code>).  This makes it possible to rub out
 indentation one column at a time without worrying whether it is made up of
@@ -512,43 +512,43 @@
 <h3 class="subsection"> 21.4.1 Basic Program Indentation Commands </h3>
 
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Adjust indentation of current line.
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
-<dd><p>Equivalent to <kbd>RET</kbd> followed by <kbd>TAB</kbd> 
(<code>newline-and-indent</code>).
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
+<dd><p>Equivalent to &lt;RET&gt; followed by &lt;TAB&gt; 
(<code>newline-and-indent</code>).
 </p></dd>
 </dl>
 
 <a name="IDX927"></a>
 <a name="IDX928"></a>
 <a name="IDX929"></a>
-<p>  The basic indentation command is <kbd>TAB</kbd>, which gives the current
+<p>  The basic indentation command is &lt;TAB&gt;, which gives the current
 line the correct indentation as determined from the previous lines.  The
-function that <kbd>TAB</kbd> runs depends on the major mode; it is
+function that &lt;TAB&gt; runs depends on the major mode; it is
 <code>lisp-indent-line</code> in Lisp mode, <code>c-indent-line</code> in C 
mode,
 etc.  These functions understand different syntaxes for different
-languages, but they all do about the same thing.  <kbd>TAB</kbd> in any
+languages, but they all do about the same thing.  &lt;TAB&gt; in any
 programming language major mode inserts or deletes whitespace at the
 beginning of the current line, independent of where point is in the
 line.  If point is inside the whitespace at the beginning of the line,
-<kbd>TAB</kbd> leaves it at the end of that whitespace; otherwise, 
<kbd>TAB</kbd>
+&lt;TAB&gt; leaves it at the end of that whitespace; otherwise, &lt;TAB&gt;
 leaves point fixed with respect to the characters around it.
 </p>
-<p>  Use <kbd>C-q <kbd>TAB</kbd></kbd> to insert a tab at point.
+<p>  Use <kbd>C-q &lt;TAB&gt;</kbd> to insert a tab at point.
 </p>
 <a name="IDX930"></a>
 <a name="IDX931"></a>
-<p>  When entering a large amount of new code, use <kbd>LFD</kbd>
-(<code>newline-and-indent</code>), which is equivalent to a <kbd>RET</kbd> 
followed
-by a <kbd>TAB</kbd>.  <kbd>LFD</kbd> creates a blank line, then gives it the
+<p>  When entering a large amount of new code, use &lt;LFD&gt;
+(<code>newline-and-indent</code>), which is equivalent to a &lt;RET&gt; 
followed
+by a &lt;TAB&gt;.  &lt;LFD&gt; creates a blank line, then gives it the
 appropriate indentation.
 </p>
-<p>  <kbd>TAB</kbd> indents the second and following lines of the body of a
+<p>  &lt;TAB&gt; indents the second and following lines of the body of a
 parenthetical grouping each under the preceding one; therefore, if you
 alter one line's indentation to be nonstandard, the lines below tend
 to follow it.  This is the right behavior in cases where the standard
-result of <kbd>TAB</kbd> does not look good.
+result of &lt;TAB&gt; does not look good.
 </p>
 <p>  Remember that Emacs assumes that an open-parenthesis, open-brace, or
 other opening delimiter at the left margin (including the indentation
@@ -588,7 +588,7 @@
 <dt> <kbd>C-M-q</kbd></dt>
 <dd><p>Re-indent all the lines within one list (<code>indent-sexp</code>).
 </p></dd>
-<dt> <kbd>C-u <kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>C-u &lt;TAB&gt;</kbd></dt>
 <dd><p>Shift an entire list rigidly sideways so that its first line
 is properly indented.
 </p></dd>
@@ -606,12 +606,12 @@
 bound to other suitable functions in other modes.  The indentation of
 the line the sexp starts on is not changed; therefore, only the relative
 indentation within the list, and not its position, is changed.  To
-correct the position as well, type a <kbd>TAB</kbd> before <kbd>C-M-q</kbd>.
+correct the position as well, type a &lt;TAB&gt; before <kbd>C-M-q</kbd>.
 </p>
 <a name="IDX935"></a>
 <p>  If the relative indentation within a list is correct but the
 indentation of its beginning is not, go to the line on which the list
-begins and type <kbd>C-u <kbd>TAB</kbd></kbd>.  When you give <kbd>TAB</kbd> a 
numeric
+begins and type <kbd>C-u &lt;TAB&gt;</kbd>.  When you give &lt;TAB&gt; a 
numeric
 argument, it moves all the lines in the group, starting on the current
 line, sideways the same amount that the current line moves.  The command
 does not move lines that start inside strings, or C
@@ -620,7 +620,7 @@
 <a name="IDX936"></a>
 <a name="IDX937"></a>
 <p>  Another way to specify a range to be re-indented is with point and
-mark.  The command <kbd>C-M-\</kbd> (<code>indent-region</code>) applies 
<kbd>TAB</kbd>
+mark.  The command <kbd>C-M-\</kbd> (<code>indent-region</code>) applies 
&lt;TAB&gt;
 to every line whose first character is between point and mark.
 </p>
 <hr size="6">
@@ -748,11 +748,11 @@
 Correct C indentation is done on all the lines that are made this way.
 </p>
 <a name="IDX941"></a>
-<p>  If <code>c-tab-always-indent</code> is non-<code>nil</code>, the 
<kbd>TAB</kbd> command
+<p>  If <code>c-tab-always-indent</code> is non-<code>nil</code>, the 
&lt;TAB&gt; command
 in C mode does indentation only if point is at the left margin or within
 the line's indentation.  If there is non-whitespace to the left of point,
-<kbd>TAB</kbd> just inserts a tab character in the buffer.  Normally,
-this variable is <code>nil</code>, and <kbd>TAB</kbd> always reindents the 
current line.
+&lt;TAB&gt; just inserts a tab character in the buffer.  Normally,
+this variable is <code>nil</code>, and &lt;TAB&gt; always reindents the 
current line.
 </p>
 <p>  C does not have anything analogous to particular function names for which
 special forms of indentation are desirable.  However, it has a different
@@ -987,8 +987,8 @@
 <dt> <kbd>C-u - C-x ;</kbd></dt>
 <dd><p>Kill comment on current line (<code>kill-comment</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>LFD</kbd></kbd></dt>
-<dd><p>Like <kbd>RET</kbd> followed by inserting and aligning a comment
+<dt> <kbd>M-&lt;LFD&gt;</kbd></dt>
+<dd><p>Like &lt;RET&gt; followed by inserting and aligning a comment
 (<code>indent-new-comment-line</code>).
 </p></dd>
 </dl>
@@ -1014,7 +1014,7 @@
 start with two semicolons are indented as if they were lines of code,
 instead of at the comment column.  Comments which start with three
 semicolons are supposed to start at the left margin.  Emacs understands
-these conventions by indenting a double-semicolon comment using <kbd>TAB</kbd>
+these conventions by indenting a double-semicolon comment using &lt;TAB&gt;
 and by not changing the indentation of a triple-semicolon comment at all.
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">;; This function is just an 
example.
@@ -1065,12 +1065,12 @@
 <h3 class="subsection"> 21.6.1 Multiple Lines of Comments </h3>
 
 <p>  If you are typing a comment and want to continue it on another line,
-use the command <kbd>Meta-<kbd>LFD</kbd></kbd> 
(<code>indent-new-comment-line</code>),
+use the command <kbd>Meta-&lt;LFD&gt;</kbd> 
(<code>indent-new-comment-line</code>),
 which terminates the comment you are typing, creates a new blank line
 afterward, and begins a new comment indented under the old one.  If
 Auto Fill mode is on and you go past the fill column while typing, the 
 comment is continued in just this fashion.  If point is
-not at the end of the line when you type <kbd>M-<kbd>LFD</kbd></kbd>, the text 
on
+not at the end of the line when you type <kbd>M-&lt;LFD&gt;</kbd>, the text on
 the rest of the line becomes part of the new comment line.
 </p>
 <hr size="6">
@@ -1125,12 +1125,12 @@
 <code>&quot;/* &quot;</code> and <code>comment-end</code> has the value 
<code>&quot; */&quot;</code>.
 </p>
 <a name="IDX955"></a>
-<p>  <code>comment-multi-line</code> controls how <kbd>M-<kbd>LFD</kbd></kbd>
+<p>  <code>comment-multi-line</code> controls how <kbd>M-&lt;LFD&gt;</kbd>
 (<code>indent-new-comment-line</code>) behaves when used inside a comment.  If
 <code>comment-multi-line</code> is <code>nil</code>, as it normally is, then
-<kbd>M-<kbd>LFD</kbd></kbd> terminates the comment on the starting line and 
starts
+<kbd>M-&lt;LFD&gt;</kbd> terminates the comment on the starting line and starts
 a new comment on the new following line.  If <code>comment-multi-line</code>
-is not <code>nil</code>, then <kbd>M-<kbd>LFD</kbd></kbd> sets up the new 
following line
+is not <code>nil</code>, then <kbd>M-&lt;LFD&gt;</kbd> sets up the new 
following line
 as part of the same comment that was found on the starting line.  This
 is done by not inserting a terminator on the old line and not inserting
 a starter on the new line.  In languages where multi-line comments are legal,
@@ -1191,7 +1191,7 @@
 O</kbd>, which has the same effect except for leaving the cursor before the
 close parenthesis.  You can then type <kbd>M-)</kbd>, which moves past the
 close parenthesis, deletes any indentation preceding it (in this example
-there is none), and indents with <kbd>LFD</kbd> after it.
+there is none), and indents with &lt;LFD&gt; after it.
 </p>
 <hr size="6">
 <a name="Lisp-Completion"></a>
@@ -1219,7 +1219,7 @@
 </p>
 <a name="IDX961"></a>
 <a name="IDX962"></a>
-<p>  The command <kbd>M-<kbd>TAB</kbd></kbd> 
(<code>lisp-complete-symbol</code>) takes the
+<p>  The command <kbd>M-&lt;TAB&gt;</kbd> (<code>lisp-complete-symbol</code>) 
takes the
 partial Lisp symbol before point to be an abbreviation, and compares it
 against all non-trivial Lisp symbols currently known to Emacs.  Any
 additional characters that they all have in common are inserted at point.
@@ -1319,7 +1319,7 @@
 change log file yourself.
 </p>
 <p>  The change log file is always visited in Indented Text mode, which means
-that <kbd>LFD</kbd> and auto-filling indent each new line like the previous
+that &lt;LFD&gt; and auto-filling indent each new line like the previous
 line.  This is convenient for entering the contents of an entry, which must
 be indented.  See section <a href="xemacs_23.html#SEC197">Text Mode</a>.
 </p>
@@ -1982,7 +1982,7 @@
 ever-increasing distances away for the text that should appear at
 the beginning of the definition.
 </p>
-<p>  If an empty argument is given (by typing <kbd>RET</kbd>), the sexp in the
+<p>  If an empty argument is given (by typing &lt;RET&gt;), the sexp in the
 buffer before or around point is used as the name of the tag to find.
 See section <a href="#SEC217">Lists and Sexps</a>, for information on sexps.
 </p>
@@ -1994,7 +1994,7 @@
 the substring, give <code>find-tag</code> a numeric argument, as in <kbd>C-u
 M-.</kbd>.  This does not read a tag name, but continues searching the tag
 table's text for another tag containing the same substring last used.
-If your keyboard has a real <kbd>META</kbd> key, <kbd>M-0 M-.</kbd> is an 
easier
+If your keyboard has a real &lt;META&gt; key, <kbd>M-0 M-.</kbd> is an easier
 alternative to <kbd>C-u M-.</kbd>.
 </p>
 <p>If the optional second argument <var>other-window</var> is 
non-<code>nil</code>, it uses
@@ -2071,11 +2071,11 @@
 <kbd>M-x grep</kbd> (see section <a href="xemacs_25.html#SEC252">Running 
&ldquo;make&rdquo;, or Compilers Generally</a>).
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x tags-search <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x tags-search &lt;RET&gt; <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Search for <var>regexp</var> through the files in the selected tags
 table.
 </p></dd>
-<dt> <kbd>M-x tags-query-replace <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd> <var>replacement</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x tags-query-replace &lt;RET&gt; <var>regexp</var> &lt;RET&gt; 
<var>replacement</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Perform a <code>query-replace-regexp</code> on each file in the 
selected tags table.
 </p></dd>
 <dt> <kbd>M-,</kbd></dt>
@@ -2358,10 +2358,10 @@
 <h4 class="subsubsection"> 21.12.2.1 Fortran Indentation Commands </h4>
 
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Indent the current line (<code>fortran-indent-line</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>LFD</kbd></kbd></dt>
+<dt> <kbd>M-&lt;LFD&gt;</kbd></dt>
 <dd><p>Break the current line and set up a continuation line.
 </p></dd>
 <dt> <kbd>C-M-q</kbd></dt>
@@ -2371,7 +2371,7 @@
 </dl>
 
 <a name="IDX999"></a>
-<p>  <kbd>TAB</kbd> is redefined by Fortran mode to reindent the current line 
for
+<p>  &lt;TAB&gt; is redefined by Fortran mode to reindent the current line for
 Fortran (<code>fortran-indent-line</code>).  Line numbers and continuation
 markers are indented to their required columns, and the body of the
 statement is independently indented, based on its nesting in the program.
@@ -2384,7 +2384,7 @@
 </p>
 <a name="IDX1002"></a>
 <a name="IDX1003"></a>
-<p>  The key <kbd>M-<kbd>LFD</kbd></kbd> is redefined as 
<code>fortran-split-line</code>, a
+<p>  The key <kbd>M-&lt;LFD&gt;</kbd> is redefined as 
<code>fortran-split-line</code>, a
 command to split a line in the appropriate fashion for Fortran.  In a
 non-comment line, the second half becomes a continuation line and is
 indented accordingly.  In a comment line, both halves become separate
@@ -2756,10 +2756,10 @@
 defines these commands:
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p><code>tab-to-tab-stop</code>.
 </p></dd>
-<dt> <kbd><kbd>LFD</kbd></kbd></dt>
+<dt> <kbd>&lt;LFD&gt;</kbd></dt>
 <dd><p>Insert a newline and then indent using <code>tab-to-tab-stop</code>.
 </p></dd>
 <dt> <kbd>:</kbd></dt>
Index: texi2html/Tests/xemacs_res/xemacs_25.html
diff -u texi2html/Tests/xemacs_res/xemacs_25.html:1.32 
texi2html/Tests/xemacs_res/xemacs_25.html:1.33
--- texi2html/Tests/xemacs_res/xemacs_25.html:1.32      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_25.html   Sat Apr  8 23:02:08 2006
@@ -141,7 +141,7 @@
 <a name="IDX1020"></a>
 <p>  When the shell command line is read, the minibuffer appears containing a
 default command line (the command you used the last time you typed
-<kbd>M-x compile</kbd>).  If you type just <kbd>RET</kbd>, the same command 
line is used
+<kbd>M-x compile</kbd>).  If you type just &lt;RET&gt;, the same command line 
is used
 again.  The first <kbd>M-x compile</kbd> provides <code>make -k</code> as the 
default.
 The default is taken from the variable <code>compile-command</code>; if the
 appropriate compilation command for a file is something other than
@@ -242,7 +242,7 @@
 </p></dd>
 <dt> Lisp Interaction mode</dt>
 <dd><p>The mode for an interactive session with Emacs Lisp.  It defines
-<kbd>LFD</kbd> to evaluate the sexp before point and insert its value in the
+&lt;LFD&gt; to evaluate the sexp before point and insert its value in the
 buffer.  See section <a href="#SEC260">Lisp Interaction Buffers</a>.
 </p></dd>
 <dt> Lisp mode</dt>
@@ -791,14 +791,14 @@
 the expressions you evaluate and their output goes in the buffer.
 </p>
 <p>  The &lsquo;<samp>*scratch*</samp>&rsquo; buffer's major mode is Lisp 
Interaction mode, which
-is the same as Emacs-Lisp mode except for one command, <kbd>LFD</kbd>.  In
-Emacs-Lisp mode, <kbd>LFD</kbd> is an indentation command.  In Lisp
-Interaction mode, <kbd>LFD</kbd> is bound to 
<code>eval-print-last-sexp</code>.  This
+is the same as Emacs-Lisp mode except for one command, &lt;LFD&gt;.  In
+Emacs-Lisp mode, &lt;LFD&gt; is an indentation command.  In Lisp
+Interaction mode, &lt;LFD&gt; is bound to <code>eval-print-last-sexp</code>.  
This
 function reads the Lisp expression before point, evaluates it, and inserts
 the value in printed representation before point.
 </p>
 <p> The way to use the &lsquo;<samp>*scratch*</samp>&rsquo; buffer is to 
insert Lisp
-expressions at the end, ending each one with <kbd>LFD</kbd> so that it will
+expressions at the end, ending each one with &lt;LFD&gt; so that it will
 be evaluated.  The result is a complete typescript of the expressions
 you have evaluated and their values.
 </p>
@@ -844,7 +844,7 @@
 Emacs buffer named &lsquo;<samp>*lisp*</samp>&rsquo;.  In other words, any 
&ldquo;terminal output&rdquo;
 from Lisp will go into the buffer, advancing point, and any &ldquo;terminal
 input&rdquo; for Lisp comes from text in the buffer.  To give input to Lisp, go
-to the end of the buffer and type the input, terminated by <kbd>RET</kbd>.  The
+to the end of the buffer and type the input, terminated by &lt;RET&gt;.  The
 &lsquo;<samp>*lisp*</samp>&rsquo; buffer is in Inferior Lisp mode, which has 
all the
 special characteristics of Lisp mode and Shell mode (see section <a 
href="xemacs_29.html#SEC340">Shell Mode</a>).
 </p>
@@ -1285,7 +1285,7 @@
 installed and is up to date.
 </p>
 <p>From here, you can select or unselect packages for installation using
-the <kbd>RET</kbd> key, the <kbd>Mouse-2</kbd> button or selecting 
&quot;Select&quot; from
+the &lt;RET&gt; key, the <kbd>Mouse-2</kbd> button or selecting 
&quot;Select&quot; from
 the (Popup) Menu.
 Once you've finished selecting the packages, you can
 press the <kbd>x</kbd> key (or use the menu) to actually install the
@@ -1298,14 +1298,14 @@
 <dt> <kbd>?</kbd></dt>
 <dd><p>Display simple help.
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
-<dt> <kbd><kbd>Mouse-2</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
+<dt> <kbd>&lt;Mouse-2&gt;</kbd></dt>
 <dd><p>Toggle between selecting and unselecting a package for installation.
 </p></dd>
 <dt> <kbd>x</kbd></dt>
 <dd><p>Install selected packages.
 </p></dd>
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>View, in the minibuffer, additional information about the package, such
 as the package date (not the build date) and the package author.  Moving 
 the mouse over a package name will also do the same thing.
Index: texi2html/Tests/xemacs_res/xemacs_26.html
diff -u texi2html/Tests/xemacs_res/xemacs_26.html:1.25 
texi2html/Tests/xemacs_res/xemacs_26.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_26.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_26.html   Sat Apr  8 23:02:08 2006
@@ -65,7 +65,7 @@
 different text.  Abbrevs are defined by the user to expand in specific
 ways.  For example, you might define &lsquo;<samp>foo</samp>&rsquo; as an 
abbrev expanding to
 &lsquo;<samp>find outer otter</samp>&rsquo;.  With this abbrev defined, you 
would be able to
-get &lsquo;<samp>find outer otter </samp>&rsquo; into the buffer by typing 
<kbd>f o o <kbd>SPC</kbd></kbd>.
+get &lsquo;<samp>find outer otter </samp>&rsquo; into the buffer by typing 
<kbd>f o o &lt;SPC&gt;</kbd>.
 </p>
 <a name="IDX1060"></a>
 <a name="IDX1061"></a>
@@ -158,7 +158,7 @@
 before point.  Use a numeric argument to say how many words before point
 should be taken as the expansion.  For example, to define the abbrev
 &lsquo;<samp>foo</samp>&rsquo; as in the example above, insert the text 
&lsquo;<samp>find outer
-otter</samp>&rsquo;, then type <br><kbd>C-u 3 C-x a g f o o 
<kbd>RET</kbd></kbd>.
+otter</samp>&rsquo;, then type <br><kbd>C-u 3 C-x a g f o o &lt;RET&gt;</kbd>.
 </p>
 <p>  An argument of zero to <kbd>C-x a g</kbd> means to use the contents of the
 region as the expansion of the abbrev being defined.
@@ -214,7 +214,7 @@
 <h2 class="section"> 23.2 Controlling Abbrev Expansion </h2>
 
 <p>  An abbrev expands whenever it is in a buffer just before point and you
-type a self-inserting punctuation character (<kbd>SPC</kbd>, comma,
+type a self-inserting punctuation character (&lt;SPC&gt;, comma,
 etc.).  Most often an abbrev is used by inserting the abbrev followed
 by punctuation.
 </p>
Index: texi2html/Tests/xemacs_res/xemacs_27.html
diff -u texi2html/Tests/xemacs_res/xemacs_27.html:1.25 
texi2html/Tests/xemacs_res/xemacs_27.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_27.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_27.html   Sat Apr  8 23:02:08 2006
@@ -151,14 +151,14 @@
 <p>  Insertion of text is adapted to the quarter-plane screen model through
 the use of Overwrite mode (see section <a href="xemacs_30.html#SEC352">Minor 
Modes</a>).  Self-inserting characters
 replace existing text, column by column, rather than pushing existing text
-to the right.  <kbd>RET</kbd> runs <code>picture-newline</code>, which just 
moves to
+to the right.  &lt;RET&gt; runs <code>picture-newline</code>, which just moves 
to
 the beginning of the following line so that new text will replace that
 line.
 </p>
 <a name="IDX1092"></a>
 <a name="IDX1093"></a>
 <a name="IDX1094"></a>
-<p>  Text is erased instead of deleted and killed.  <kbd>DEL</kbd>
+<p>  Text is erased instead of deleted and killed.  &lt;DEL&gt;
 (<code>picture-backward-clear-column</code>) replaces the preceding character
 with a space rather than removing it.  <kbd>C-d</kbd>
 (<code>picture-clear-column</code>) does the same in a forward direction.
@@ -169,7 +169,7 @@
 <p>  To do actual insertion, you must use special commands.  <kbd>C-o</kbd>
 (<code>picture-open-line</code>) creates a blank line, but does so after
 the current line; it never splits a line.  <kbd>C-M-o</kbd>, 
<code>split-line</code>,
-makes sense in Picture mode, so it remains unchanged.  <kbd>LFD</kbd>
+makes sense in Picture mode, so it remains unchanged.  &lt;LFD&gt;
 (<code>picture-duplicate-line</code>) inserts another line
 with the same contents below the current line.
 </p>
@@ -269,20 +269,20 @@
 <h2 class="section"> 24.3 Picture Mode Tabs </h2>
  
 <p>  Two kinds of tab-like action are provided in Picture mode.
-Context-based tabbing is done with <kbd>M-<kbd>TAB</kbd></kbd>
+Context-based tabbing is done with <kbd>M-&lt;TAB&gt;</kbd>
 (<code>picture-tab-search</code>).  With no argument, it moves to a point
 underneath the next &ldquo;interesting&rdquo; character that follows 
whitespace in
 the previous non-blank line.  &ldquo;Next&rdquo; here means &ldquo;appearing 
at a
 horizontal position greater than the one point starts out at&rdquo;.  With an
-argument, as in <kbd>C-u M-<kbd>TAB</kbd></kbd>, the command moves to the next 
such
-interesting character in the current line.  <kbd>M-<kbd>TAB</kbd></kbd> does 
not
+argument, as in <kbd>C-u M-&lt;TAB&gt;</kbd>, the command moves to the next 
such
+interesting character in the current line.  <kbd>M-&lt;TAB&gt;</kbd> does not
 change the text; it only moves point.  &ldquo;Interesting&rdquo; characters are
 defined by the variable <code>picture-tab-chars</code>, which contains a string
 of characters considered interesting.  Its default value is
 <code>&quot;!-~&quot;</code>.
 </p>
 <a name="IDX1102"></a>
-<p>  <kbd>TAB</kbd> itself runs <code>picture-tab</code>, which operates based 
on the
+<p>  &lt;TAB&gt; itself runs <code>picture-tab</code>, which operates based on 
the
 current tab stop settings; it is the Picture mode equivalent of
 <code>tab-to-tab-stop</code>.  Without arguments it just moves point, but with
 a numeric argument it clears the text that it moves over.
@@ -290,11 +290,11 @@
 <a name="IDX1103"></a>
 <a name="IDX1104"></a>
 <p>  The context-based and tab-stop-based forms of tabbing are brought
-together by the command <kbd>C-c <kbd>TAB</kbd></kbd> 
(<code>picture-set-tab-stops</code>.)
-This command sets the tab stops to the positions which 
<kbd>M-<kbd>TAB</kbd></kbd>
+together by the command <kbd>C-c &lt;TAB&gt;</kbd> 
(<code>picture-set-tab-stops</code>.)
+This command sets the tab stops to the positions which <kbd>M-&lt;TAB&gt;</kbd>
 would consider significant in the current line.  If you use this command
-with <kbd>TAB</kbd>, you can get the effect of context-based tabbing.  But
-<kbd>M-<kbd>TAB</kbd></kbd> is more convenient in the cases where it is 
sufficient.
+with &lt;TAB&gt;, you can get the effect of context-based tabbing.  But
+<kbd>M-&lt;TAB&gt;</kbd> is more convenient in the cases where it is 
sufficient.
 </p>
 <hr size="6">
 <a name="Rectangles-in-Picture"></a>
Index: texi2html/Tests/xemacs_res/xemacs_28.html
diff -u texi2html/Tests/xemacs_res/xemacs_28.html:1.25 
texi2html/Tests/xemacs_res/xemacs_28.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_28.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_28.html   Sat Apr  8 23:02:08 2006
@@ -401,7 +401,7 @@
 <dd><p>Fill all paragraphs of yanked old messages, each individually
 (<code>mail-fill-yanked-message</code>).
 </p></dd>
-<dt> <kbd><kbd>button3</kbd></kbd></dt>
+<dt> <kbd>&lt;button3&gt;</kbd></dt>
 <dd><p>Pops up a menu of useful mail-mode commands.
 </p></dd>
 </dl>
Index: texi2html/Tests/xemacs_res/xemacs_29.html
diff -u texi2html/Tests/xemacs_res/xemacs_29.html:1.30 
texi2html/Tests/xemacs_res/xemacs_29.html:1.31
--- texi2html/Tests/xemacs_res/xemacs_29.html:1.30      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_29.html   Sat Apr  8 23:02:08 2006
@@ -439,12 +439,12 @@
 <dd><p>Scroll calendar one month backward (<code>scroll-calendar-right</code>).
 </p></dd>
 <dt> <kbd>C-v</kbd></dt>
-<dt> <kbd><kbd>NEXT</kbd></kbd></dt>
+<dt> <kbd>&lt;NEXT&gt;</kbd></dt>
 <dd><p>Scroll calendar three months forward
 (<code>scroll-calendar-left-three-months</code>).
 </p></dd>
 <dt> <kbd>M-v</kbd></dt>
-<dt> <kbd><kbd>PRIOR</kbd></kbd></dt>
+<dt> <kbd>&lt;PRIOR&gt;</kbd></dt>
 <dd><p>Scroll calendar three months backward
 (<code>scroll-calendar-right-three-months</code>).
 </p></dd>
@@ -473,7 +473,7 @@
 by four, typing <kbd>C-u C-v</kbd> scrolls the calendar forward by a year and
 typing <kbd>C-u M-v</kbd> scrolls the calendar backward by a year.
 </p>
-<p>  The function keys <kbd>NEXT</kbd> and <kbd>PRIOR</kbd> are equivalent to
+<p>  The function keys &lt;NEXT&gt; and &lt;PRIOR&gt; are equivalent to
 <kbd>C-v</kbd> and <kbd>M-v</kbd>, just as they are in other modes.
 </p>
 
@@ -789,7 +789,7 @@
 <a name="IDX1214"></a>
 <p>  To get even more detailed information, use the <kbd>a</kbd> command, which
 displays a separate buffer containing a list of all holidays in the
-current three-month range.  You can use <kbd>SPC</kbd> in the calendar window
+current three-month range.  You can use &lt;SPC&gt; in the calendar window
 to scroll that list.
 </p>
 <a name="IDX1215"></a>
@@ -3353,7 +3353,7 @@
 to that buffer.  That is to say, any &ldquo;terminal output&rdquo; from the 
subshell
 will go into the buffer, advancing point, and any &ldquo;terminal input&rdquo; 
for
 the subshell comes from text in the buffer.  To give input to the subshell,
-go to the end of the buffer and type the input, terminated by <kbd>RET</kbd>.
+go to the end of the buffer and type the input, terminated by &lt;RET&gt;.
 </p>
 <p>  XEmacs does not wait for the subshell to do anything.  You can switch
 windows or buffers and edit them while the shell is waiting, or while it is
@@ -3403,15 +3403,15 @@
 <a name="IDX1399"></a>
 <p>XEmacs keeps a history of the most recent commands you have typed in the
 &lsquo;<samp>*shell*</samp>&rsquo; buffer.  If you are at the beginning of a 
shell command
-line and type <kbd>M-p</kbd>, the previous shell input is inserted into the
-buffer before point.  Immediately typing <kbd>M-p</kbd> again deletes that
-input and inserts the one before it.  By repeating <kbd>M-p</kbd> you can
+line and type &lt;M-p&gt;, the previous shell input is inserted into the
+buffer before point.  Immediately typing &lt;M-p&gt; again deletes that
+input and inserts the one before it.  By repeating &lt;M-p&gt; you can
 move backward through your commands until you find one you want to
-repeat.  You may then edit the command before typing <kbd>RET</kbd> if you
-wish. <kbd>M-n</kbd> moves forward through the command history, in case you
-moved backward past the one you wanted while using <kbd>M-p</kbd>.  If you
+repeat.  You may then edit the command before typing &lt;RET&gt; if you
+wish. &lt;M-n&gt; moves forward through the command history, in case you
+moved backward past the one you wanted while using &lt;M-p&gt;.  If you
 type the first few characters of a previous command and then type
-<kbd>M-p</kbd>, the most recent shell input starting with those characters is
+&lt;M-p&gt;, the most recent shell input starting with those characters is
 inserted.  This can be very convenient when you are repeating a sequence
 of shell commands.  The variable <code>input-ring-size</code> controls how
 many commands are saved in your input history.  The default is 30.
@@ -3472,7 +3472,7 @@
 <a name="IDX1425"></a>
 <a name="IDX1426"></a>
 <dl compact="compact">
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>At end of buffer send line as input; otherwise, copy current line to 
end of
 buffer and send it (<code>send-shell-input</code>).  When a line is copied, any
 text at the beginning of the line that matches the variable
@@ -3517,7 +3517,7 @@
 <dd><p>Copy the previous bunch of shell input and insert it into the
 buffer before point (<code>copy-last-shell-input</code>).  No final newline
 is inserted, and the input copied is not resubmitted until you type
-<kbd>RET</kbd>.
+&lt;RET&gt;.
 </p></dd>
 <dt> <kbd>M-p</kbd></dt>
 <dd><p>Move backward through the input history.  Search for a matching command
@@ -3525,10 +3525,10 @@
 </p></dd>
 <dt> <kbd>M-n</kbd></dt>
 <dd><p>Move forward through the input history.  Useful when you are
-using <kbd>M-p</kbd> quickly and go past the desired command 
+using &lt;M-p&gt; quickly and go past the desired command 
 (<code>comint-next-input</code>).
 </p></dd>
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Complete the file name preceding point 
(<code>comint-dynamic-complete</code>).
 </p></dd>
 </dl>
@@ -3643,11 +3643,11 @@
 <p>The following commands are only available in Char mode:
 </p><dl compact="compact">
 <dt> <kbd>C-c C-c</kbd></dt>
-<dd><p>Send a literal <kbd>C-c</kbd> to the sub-shell.
+<dd><p>Send a literal &lt;C-c&gt; to the sub-shell.
 </p>
 </dd>
 <dt> <kbd>C-c C-x</kbd></dt>
-<dd><p>A prefix command to conveniently access the global <kbd>C-x</kbd> 
commands.
+<dd><p>A prefix command to conveniently access the global &lt;C-x&gt; commands.
 For example, <kbd>C-c C-x o</kbd> invokes the global binding of
 <kbd>C-x o</kbd>, which is normally &lsquo;<samp>other-window</samp>&rsquo;.
 </p></dd>
@@ -4020,7 +4020,7 @@
 
 <p>Copy text from a buffer using <kbd>M-x conx-buffer</kbd> or <kbd>M-x 
conx-region</kbd>
 and then type <kbd>M-x conx</kbd>.  Output is continuously generated until you
-type <kbd>^G</kbd>. You can save the <code>conx</code> database to a file with
+type &lt;^G&gt;. You can save the <code>conx</code> database to a file with
 <kbd>M-x conx-save</kbd>, which you can retrieve with <code>M-x 
conx-load</code>. 
 To clear the database, use <code>M-x conx-init</code>.
 </p>
Index: texi2html/Tests/xemacs_res/xemacs_30.html
diff -u texi2html/Tests/xemacs_res/xemacs_30.html:1.32 
texi2html/Tests/xemacs_res/xemacs_30.html:1.33
--- texi2html/Tests/xemacs_res/xemacs_30.html:1.32      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_30.html   Sat Apr  8 23:02:08 2006
@@ -125,7 +125,7 @@
 <h2 class="section"> 27.1 Minor Modes </h2>
 
 <p>  Minor modes are options which you can use or not.  For example, Auto
-Fill mode is a minor mode in which <kbd>SPC</kbd> breaks lines between words
+Fill mode is a minor mode in which &lt;SPC&gt; breaks lines between words
 as you type.  All the minor modes are independent of each other and of
 the selected major mode.  Most minor modes inform you in the mode line
 when they are on; for example, &lsquo;<samp>Fill</samp>&rsquo; in the mode 
line means that
@@ -259,7 +259,7 @@
 minibuffer, with completion.  It prints both the value and the
 documentation of the variable.
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-h v fill-column 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-h v fill-column 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>prints something like:
@@ -282,7 +282,7 @@
 minibuffer (with completion), and then prompts for a Lisp expression for the
 new value using the minibuffer a second time.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x set-variable 
<kbd>RET</kbd> fill-column <kbd>RET</kbd> 75 <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x set-variable 
&lt;RET&gt; fill-column &lt;RET&gt; 75 &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>sets <code>fill-column</code> to 75, as if you had executed the Lisp 
expression
@@ -393,7 +393,7 @@
 typically includes some <em>editable fields</em> that you can edit.  There
 are also <em>active fields</em>; this means a field that does something
 when you <em>invoke</em> it.  To invoke an active field, either click on it
-with <kbd>Mouse-1</kbd>, or move point to it and type <kbd>RET</kbd>.
+with <kbd>Mouse-1</kbd>, or move point to it and type &lt;RET&gt;.
 </p>
 <p>  For example, the phrase &lsquo;<samp>[Open]</samp>&rsquo; that appears in 
a second-level
 group is an active field.  Invoking the &lsquo;<samp>[Open]</samp>&rsquo; 
field for a group
@@ -460,7 +460,7 @@
 of the option: in the example above, it says you have not changed the
 option yet.  The word &lsquo;<samp>[State]</samp>&rsquo; at the beginning of 
this line is
 active; you can get a menu of various operations by invoking it with
-<kbd>Mouse-1</kbd> or <kbd>RET</kbd>.  These operations are essential for
+<kbd>Mouse-1</kbd> or &lt;RET&gt;.  These operations are essential for
 customizing the variable.
 </p>
 <p>  The line after the &lsquo;<samp>[State]</samp>&rsquo; line displays the 
beginning of the
@@ -496,7 +496,7 @@
 <a name="IDX1482"></a>
 <p>  While editing a value or field that is a file name, directory name,
 command name, or anything else for which completion is defined, you can
-type <kbd>M-<kbd>TAB</kbd></kbd> (<code>widget-complete</code>) to do 
completion.
+type <kbd>M-&lt;TAB&gt;</kbd> (<code>widget-complete</code>) to do completion.
 </p>
 <p>  Some options have a small fixed set of possible legitimate values.
 These options don't let you edit the value textually.  Instead, an
@@ -538,15 +538,15 @@
 <a name="IDX1484"></a>
 <a name="IDX1485"></a>
 <a name="IDX1486"></a>
-<p>  Two special commands, <kbd>TAB</kbd> and <kbd>S-<kbd>TAB</kbd></kbd>, are 
useful for
-moving through the customization buffer.  <kbd>TAB</kbd>
+<p>  Two special commands, &lt;TAB&gt; and <kbd>S-&lt;TAB&gt;</kbd>, are 
useful for
+moving through the customization buffer.  &lt;TAB&gt;
 (<code>widget-forward</code>) moves forward to the next active or editable
-field; <kbd>S-<kbd>TAB</kbd></kbd> (<code>widget-backward</code>) moves 
backward to the
+field; <kbd>S-&lt;TAB&gt;</kbd> (<code>widget-backward</code>) moves backward 
to the
 previous active or editable field.
 </p>
-<p>  Typing <kbd>RET</kbd> on an editable field also moves forward, just like
-<kbd>TAB</kbd>.  The reason for this is that people have a tendency to type
-<kbd>RET</kbd> when they are finished editing a field.  If you have occasion
+<p>  Typing &lt;RET&gt; on an editable field also moves forward, just like
+&lt;TAB&gt;.  The reason for this is that people have a tendency to type
+&lt;RET&gt; when they are finished editing a field.  If you have occasion
 to insert a newline in an editable field, use <kbd>C-o</kbd> or <kbd>C-q
 C-j</kbd>,
 </p>
@@ -684,16 +684,16 @@
 face or group that you want to customize.
 </p>
 <dl compact="compact">
-<dt> <kbd>M-x customize-option <kbd>RET</kbd> <var>option</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-option &lt;RET&gt; <var>option</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with just one option, <var>option</var>.
 </p></dd>
-<dt> <kbd>M-x customize-face <kbd>RET</kbd> <var>face</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-face &lt;RET&gt; <var>face</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with just one face, <var>face</var>.
 </p></dd>
-<dt> <kbd>M-x customize-group <kbd>RET</kbd> <var>group</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-group &lt;RET&gt; <var>group</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with just one group, <var>group</var>.
 </p></dd>
-<dt> <kbd>M-x customize-apropos <kbd>RET</kbd> <var>regexp</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x customize-apropos &lt;RET&gt; <var>regexp</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Set up a customization buffer with all the options, faces and groups
 that match <var>regexp</var>.
 </p></dd>
@@ -1204,7 +1204,7 @@
 You can then use it in another editing session.  First visit the file
 you want to save the definition in.  Then use the command:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x insert-kbd-macro 
<kbd>RET</kbd> <var>macroname</var> <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x insert-kbd-macro 
&lt;RET&gt; <var>macroname</var> &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>This inserts some Lisp code that, when executed later, will define the same
@@ -1249,10 +1249,10 @@
 <kbd>C-x q</kbd> reads a character from the terminal to decide whether to
 continue.
 </p>
-<p>  The special answers to a <kbd>C-x q</kbd> query are <kbd>SPC</kbd>, 
<kbd>DEL</kbd>,
+<p>  The special answers to a <kbd>C-x q</kbd> query are &lt;SPC&gt;, 
&lt;DEL&gt;,
 <kbd>C-d</kbd>, <kbd>C-l</kbd>, and <kbd>C-r</kbd>.  Any other character 
terminates
 execution of the keyboard macro and is then read as a command.
-<kbd>SPC</kbd> means to continue.  <kbd>DEL</kbd> means to skip the remainder 
of
+&lt;SPC&gt; means to continue.  &lt;DEL&gt; means to skip the remainder of
 this repetition of the macro, starting again from the beginning in the
 next repetition.  <kbd>C-d</kbd> means to skip the remainder of this
 repetition and cancel further repetition.  <kbd>C-l</kbd> redraws the frame
@@ -1260,7 +1260,7 @@
 a recursive editing level, in which you can perform editing that is not
 part of the macro.  When you exit the recursive edit using <kbd>C-M-c</kbd>,
 you are asked again how to continue with the keyboard macro.  If you
-type a <kbd>SPC</kbd> at this time, the rest of the macro definition is
+type a &lt;SPC&gt; at this time, the rest of the macro definition is
 executed.  It is up to you to leave point and the text in a state such
 that the rest of the macro will do what you want.
 </p>
@@ -1371,15 +1371,15 @@
 <li>
 <code>minibuffer-local-map</code> is used for ordinary input (no completion).
 </li><li>
-<code>minibuffer-local-ns-map</code> is similar, except that <kbd>SPC</kbd> 
exits
-just like <kbd>RET</kbd>.  This is used mainly for Mocklisp compatibility.
+<code>minibuffer-local-ns-map</code> is similar, except that &lt;SPC&gt; exits
+just like &lt;RET&gt;.  This is used mainly for Mocklisp compatibility.
 </li><li>
 <code>minibuffer-local-completion-map</code> is for permissive completion.
 </li><li>
 <code>minibuffer-local-must-match-map</code> is for strict completion and
 for cautious completion.
 </li><li>
-<code>repeat-complex-command-map</code> is for use in <kbd>C-x <kbd>ESC</kbd> 
<kbd>ESC</kbd></kbd>.
+<code>repeat-complex-command-map</code> is for use in <kbd>C-x &lt;ESC&gt; 
&lt;ESC&gt;</kbd>.
 </li><li>
 <code>isearch-mode-map</code> contains the bindings of the special keys which
 are bound in the pseudo-mode entered with <kbd>C-s</kbd> and <kbd>C-r</kbd>.
@@ -1399,7 +1399,7 @@
 </li><li>
 <code>help-map</code> is used for characters that follow <kbd>C-h</kbd>.
 </li><li>
-<code>esc-map</code> is for characters that follow <kbd>ESC</kbd>. All Meta
+<code>esc-map</code> is for characters that follow &lt;ESC&gt;. All Meta
 characters are actually defined by this map.
 </li><li>
 <code>ctl-x-4-map</code> is for characters that follow <kbd>C-x 4</kbd>.
@@ -1418,7 +1418,7 @@
 </p>
 <p>  Prefix key definitions can appear in either the global
 map or a local map.  The definitions of <kbd>C-c</kbd>, <kbd>C-x</kbd>, 
<kbd>C-h</kbd>,
-and <kbd>ESC</kbd> as prefix keys appear in the global map, so these prefix
+and &lt;ESC&gt; as prefix keys appear in the global map, so these prefix
 keys are always available.  Major modes can locally redefine a key as a
 prefix by putting a prefix key definition for it in the local
 map.
@@ -1490,14 +1490,14 @@
 <h4 class="subsubsection"> 27.4.2.1 Changing Key Bindings Interactively </h4>
 
 <dl compact="compact">
-<dt> <kbd>M-x global-set-key <kbd>RET</kbd> <var>key</var> <var>cmd</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x global-set-key &lt;RET&gt; <var>key</var> <var>cmd</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Defines <var>key</var> globally to run <var>cmd</var>.
 </p></dd>
-<dt> <kbd>M-x local-set-key <kbd>RET</kbd> <var>keys</var> <var>cmd</var> 
<kbd>RET</kbd></kbd> </dt>
+<dt> <kbd>M-x local-set-key &lt;RET&gt; <var>keys</var> <var>cmd</var> 
&lt;RET&gt;</kbd> </dt>
 <dd><p>Defines <var>key</var> locally (in the major mode now in effect) to run
 <var>cmd</var>.
 </p></dd>
-<dt> <kbd>M-x local-unset-key <kbd>RET</kbd> <var>keys</var> 
<kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-x local-unset-key &lt;RET&gt; <var>keys</var> 
&lt;RET&gt;</kbd></dt>
 <dd><p>Removes the local binding of <var>key</var>.
 </p></dd>
 </dl>
@@ -1513,7 +1513,7 @@
 </p>
 <p>The following example:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
<kbd>RET</kbd> C-f next-line <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
&lt;RET&gt; C-f next-line &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>redefines <kbd>C-f</kbd> to move down a line.  The fact that <var>cmd</var> 
is
@@ -1528,7 +1528,7 @@
 <kbd>C-x</kbd>, another character is read; if that character is <kbd>4</kbd>,
 another character is read, and so on.  For example,
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
<kbd>RET</kbd> C-x 4 $ spell-other-window <kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">M-x global-set-key 
&lt;RET&gt; C-x 4 $ spell-other-window &lt;RET&gt;
 </pre></td></tr></table>
 
 <p>redefines <kbd>C-x 4 $</kbd> to run the (fictitious) command
@@ -1634,7 +1634,7 @@
 <p>Here are some examples of programmatically binding keys:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">
-;;;  Bind <code>my-command</code> to <kbd>f1</kbd>
+;;;  Bind <code>my-command</code> to &lt;f1&gt;
 (global-set-key 'f1 'my-command)                
 
 ;;;  Bind <code>my-command</code> to <kbd>Shift-f1</kbd>
@@ -1646,7 +1646,7 @@
 ;;; Bind <code>my-command</code> to the middle mouse button.
 (global-set-key 'button2 'my-command)
 
-;;; Bind <code>my-command</code> to <kbd><kbd>META</kbd> <kbd>CTL</kbd> 
<kbd>Right Mouse Button</kbd></kbd>
+;;; Bind <code>my-command</code> to <kbd>&lt;META&gt; &lt;CTL&gt; &lt;Right 
Mouse Button&gt;</kbd>
 ;;; in the keymap that is in force when you are running <code>dired</code>.
 (define-key dired-mode-map '(meta control button3) 'my-command)
 
@@ -1683,13 +1683,13 @@
 
 <p>Note, however, that in some cases you may be binding more than one
 key sequence by using a single command.  This situation can 
-arise because in ASCII, <kbd>C-i</kbd> and <kbd>TAB</kbd> have
+arise because in ASCII, <kbd>C-i</kbd> and &lt;TAB&gt; have
 the same representation.  Therefore, when Emacs sees:
 </p>
 <table><tr><td>&nbsp;</td><td><pre class="example">(global-set-key 
&quot;\C-i&quot; 'end-of-line)
 </pre></td></tr></table>
 
-<p>it is unclear whether the user intended to bind <kbd>C-i</kbd> or 
<kbd>TAB</kbd>.
+<p>it is unclear whether the user intended to bind <kbd>C-i</kbd> or 
&lt;TAB&gt;.
 The solution XEmacs adopts is to bind both of these key
 sequences.
 </p>
@@ -2185,7 +2185,7 @@
 </p>
 <ul>
 <li>
-Make <kbd>TAB</kbd> in C mode just insert a tab if point is in the middle of a
+Make &lt;TAB&gt; in C mode just insert a tab if point is in the middle of a
 line.
 
 <table><tr><td>&nbsp;</td><td><pre class="example">(setq c-tab-always-indent 
nil)
@@ -2279,14 +2279,14 @@
 </pre></td></tr></table>
 
 </li><li>
-Bind the function key <kbd>F1</kbd> to a command in C mode.
+Bind the function key &lt;F1&gt; to a command in C mode.
 Note that the names of function keys must be lower case.
 
 <table><tr><td>&nbsp;</td><td><pre class="example">(define-key c-mode-map 'f1 
'make-symbolic-link)
 </pre></td></tr></table>
 
 </li><li>
-Bind the shifted version of <kbd>F1</kbd> to a command.
+Bind the shifted version of &lt;F1&gt; to a command.
 
 <table><tr><td>&nbsp;</td><td><pre class="example">(define-key c-mode-map 
'(shift f1) 'make-symbolic-link)
 </pre></td></tr></table>
@@ -3635,7 +3635,7 @@
 Abort (and dump core)? (y or n)
 </pre></td></tr></table>
 
-<p>Answer each one with <kbd>y</kbd> or <kbd>n</kbd> followed by 
<kbd>RET</kbd>.
+<p>Answer each one with <kbd>y</kbd> or <kbd>n</kbd> followed by &lt;RET&gt;.
 </p>
 <p>  Saying <kbd>y</kbd> to &lsquo;<samp>Auto-save?</samp>&rsquo; causes 
immediate auto-saving of all
 modified buffers in which auto-saving is enabled.
@@ -3687,10 +3687,10 @@
 <kbd>C-g C-g</kbd> to get out of it and then start a new one.
 </p>
 <a name="IDX1559"></a>
-<p>  Second, type <kbd>M-x doctor <kbd>RET</kbd></kbd>.
+<p>  Second, type <kbd>M-x doctor &lt;RET&gt;</kbd>.
 </p>
 <p>  The doctor will make you feel better.  Each time you say something to
-the doctor, you must end it by typing <kbd>RET</kbd> <kbd>RET</kbd>.  This 
lets the
+the doctor, you must end it by typing &lt;RET&gt; &lt;RET&gt;.  This lets the
 doctor know you are finished.
 </p>
 <hr size="6">
@@ -3819,7 +3819,7 @@
 impossible.  But in any case, it is unnecessary work for us.
 </p>
 <p>  For example, suppose that you type <kbd>C-x C-f /glorp/baz.ugh
-<kbd>RET</kbd></kbd>, visiting a file which (you know) happens to be rather 
large,
+&lt;RET&gt;</kbd>, visiting a file which (you know) happens to be rather large,
 and Emacs prints out &lsquo;<samp>I feel pretty today</samp>&rsquo;.  The best 
way to report
 the bug is with a sentence like the preceding one, because it gives all the
 facts and nothing but the facts.
@@ -3843,7 +3843,7 @@
 <p>  You should not even say &ldquo;visit a file&rdquo; instead of <kbd>C-x 
C-f</kbd> unless
 you <i>know</i> that it makes no difference which visiting command is used.
 Similarly, rather than saying &ldquo;if I have three characters on the 
line,&rdquo;
-say &ldquo;after I type <kbd><kbd>RET</kbd> A B C <kbd>RET</kbd> 
C-p</kbd>,&rdquo; if that is
+say &ldquo;after I type <kbd>&lt;RET&gt; A B C &lt;RET&gt; C-p</kbd>,&rdquo; 
if that is
 the way you entered the text.
 </p>
 <p>  If you are not in Fundamental mode when the problem occurs, you should
@@ -3891,7 +3891,7 @@
 <table><tr><td>&nbsp;</td><td><pre class="example">(open-dribble-file 
&quot;~/dribble&quot;)
 </pre></td></tr></table>
 
-<p>using <kbd>Meta-<kbd>ESC</kbd></kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer just after starting
+<p>using <kbd>Meta-&lt;ESC&gt;</kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer just after starting
 Emacs.  From then on, all Emacs input will be written in the specified
 dribble file until the Emacs process is killed.
 </p>
@@ -3906,7 +3906,7 @@
 <table><tr><td>&nbsp;</td><td><pre class="example">(open-termscript 
&quot;~/termscript&quot;)
 </pre></td></tr></table>
 
-<p>using <kbd>Meta-<kbd>ESC</kbd></kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer
+<p>using <kbd>Meta-&lt;ESC&gt;</kbd> or from the 
&lsquo;<samp>*scratch*</samp>&rsquo; buffer
 just after starting Emacs.  From then on, all output from Emacs to the
 terminal will be written in the specified termscript file as well, until
 the Emacs process is killed.  If the problem happens when Emacs starts
Index: texi2html/Tests/xemacs_res/xemacs_31.html
diff -u texi2html/Tests/xemacs_res/xemacs_31.html:1.25 
texi2html/Tests/xemacs_res/xemacs_31.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_31.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_31.html   Sat Apr  8 23:02:08 2006
@@ -194,7 +194,7 @@
 entire name, that process is called completion.  Completion is done for
 minibuffer (q.v.) arguments when the set of possible valid inputs is
 known; for example, on command names, buffer names, and file names.
-Completion occurs when you type <kbd>TAB</kbd>, <kbd>SPC</kbd>, or 
<kbd>RET</kbd>.
+Completion occurs when you type &lt;TAB&gt;, &lt;SPC&gt;, or &lt;RET&gt;.
 See section <a href="xemacs_9.html#SEC63">Completion</a>.
 </p>
 </dd>
@@ -209,9 +209,9 @@
 <dd><p>ASCII characters with octal codes 0 through 037, and also code 0177,
 do not have graphic images assigned to them.  These are the control
 characters.  Any control character can be typed by holding down the
-<kbd>CTRL</kbd> key and typing some other character; some have special keys
-on the keyboard.  <kbd>RET</kbd>, <kbd>TAB</kbd>, <kbd>ESC</kbd>, 
<kbd>LFD</kbd>, and
-<kbd>DEL</kbd> are all control characters.  See section <a 
href="xemacs_5.html#SEC21">Keystrokes, Key Sequences, and Key Bindings</a>.
+&lt;CTRL&gt; key and typing some other character; some have special keys
+on the keyboard.  &lt;RET&gt;, &lt;TAB&gt;, &lt;ESC&gt;, &lt;LFD&gt;, and
+&lt;DEL&gt; are all control characters.  See section <a 
href="xemacs_5.html#SEC21">Keystrokes, Key Sequences, and Key Bindings</a>.
 </p>
 </dd>
 <dt> Copyleft</dt>
@@ -258,7 +258,7 @@
 <dt> Default Argument</dt>
 <dd><p>The default for an argument is the value that is used if you do not
 specify one.  When Emacs prompts you in the minibuffer for an argument,
-the default argument is used if you just type <kbd>RET</kbd>.
+the default argument is used if you just type &lt;RET&gt;.
 See section <a href="xemacs_9.html#SEC60">The Minibuffer</a>.
 </p>
 </dd>
@@ -274,8 +274,8 @@
 are calls to the Lisp function <code>defun</code>.  See section <a 
href="xemacs_24.html#SEC218">Defuns</a>.
 </p>
 </dd>
-<dt> <kbd>DEL</kbd></dt>
-<dd><p>The <kbd>DEL</kbd> character runs the command that deletes one 
character of
+<dt> &lt;DEL&gt;</dt>
+<dd><p>The &lt;DEL&gt; character runs the command that deletes one character of
 text.  See section <a href="xemacs_7.html#SEC49">Basic Editing</a>.
 </p>
 </dd>
@@ -360,11 +360,11 @@
 echo area, accompanied by a beep.
 </p>
 </dd>
-<dt> <kbd>ESC</kbd></dt>
-<dd><p><kbd>ESC</kbd> is a character used as a prefix for typing Meta 
characters on
-keyboards lacking a <kbd>META</kbd> key.  Unlike the <kbd>META</kbd> key 
(which,
-like the <kbd>SHIFT</kbd> key, is held down while another character is
-typed), the <kbd>ESC</kbd> key is pressed and released, and applies to the
+<dt> &lt;ESC&gt;</dt>
+<dd><p>&lt;ESC&gt; is a character used as a prefix for typing Meta characters 
on
+keyboards lacking a &lt;META&gt; key.  Unlike the &lt;META&gt; key (which,
+like the &lt;SHIFT&gt; key, is held down while another character is
+typed), the &lt;ESC&gt; key is pressed and released, and applies to the
 next character typed.
 </p>
 </dd>
@@ -422,7 +422,7 @@
 just names.  All the non-Meta (q.v.) characters except for the
 Control (q.v.) character are graphic characters.  These include
 letters, digits, punctuation, and spaces; they do not include
-<kbd>RET</kbd> or <kbd>ESC</kbd>.  In Emacs, typing a graphic character inserts
+&lt;RET&gt; or &lt;ESC&gt;.  In Emacs, typing a graphic character inserts
 that character (in ordinary editing modes).  See section <a 
href="xemacs_7.html#SEC49">Basic Editing</a>.
 </p>
 </dd>
@@ -436,9 +436,9 @@
 listings of text in Emacs buffers.  See section <a 
href="xemacs_29.html#SEC345">Hardcopy Output</a>.
 </p>
 </dd>
-<dt> <kbd>HELP</kbd></dt>
-<dd><p>You can type <kbd>HELP</kbd> at any time to ask what options you have, 
or
-to ask what any command does.  <kbd>HELP</kbd> is really <kbd>Control-h</kbd>.
+<dt> &lt;HELP&gt;</dt>
+<dd><p>You can type &lt;HELP&gt; at any time to ask what options you have, or
+to ask what any command does.  &lt;HELP&gt; is really <kbd>Control-h</kbd>.
 See section <a href="xemacs_11.html#SEC71">Help</a>.
 </p>
 </dd>
@@ -540,7 +540,7 @@
 </p>
 </dd>
 <dt> M-</dt>
-<dd><p><kbd>M-</kbd> in the name of a character is an abbreviation for 
<kbd>META</kbd>,
+<dd><p><kbd>M-</kbd> in the name of a character is an abbreviation for 
&lt;META&gt;,
 one of the modifier keys that can accompany any character.
 See section <a href="xemacs_5.html#SEC21">Keystrokes, Key Sequences, and Key 
Bindings</a>.
 </p>
@@ -548,8 +548,8 @@
 <dt> M-C-</dt>
 <dd><p>&lsquo;<samp>M-C-</samp>&rsquo; in the name of a character is an 
abbreviation for
 Control-Meta; it means the same thing as &lsquo;<samp>C-M-</samp>&rsquo;.  If 
your
-terminal lacks a real <kbd>META</kbd> key, you type a Control-Meta character by
-typing <kbd>ESC</kbd> and then typing the corresponding Control character.
+terminal lacks a real &lt;META&gt; key, you type a Control-Meta character by
+typing &lt;ESC&gt; and then typing the corresponding Control character.
 See section <a href="xemacs_5.html#SEC21">C-M-</a>.
 </p>
 </dd>
@@ -591,10 +591,10 @@
 <dt> Meta</dt>
 <dd><p>Meta is the name of a modifier bit which a command character may have.
 It is present in a character if the character is typed with the
-<kbd>META</kbd> key held down.  Such characters are given names that start
+&lt;META&gt; key held down.  Such characters are given names that start
 with <kbd>Meta-</kbd>.  For example, <kbd>Meta-&lt;</kbd> is typed by holding 
down
-<kbd>META</kbd> and at the same time typing <kbd>&lt;</kbd> (which itself is 
done,
-on most terminals, by holding down <kbd>SHIFT</kbd> and typing <kbd>,</kbd>).
+&lt;META&gt; and at the same time typing <kbd>&lt;</kbd> (which itself is done,
+on most terminals, by holding down &lt;SHIFT&gt; and typing <kbd>,</kbd>).
 See section <a href="xemacs_5.html#SEC21">Meta</a>.
 </p>
 </dd>
@@ -647,7 +647,7 @@
 </p>
 </dd>
 <dt> Newline</dt>
-<dd><p><kbd>LFD</kbd> characters in the buffer terminate lines of text and are
+<dd><p>&lt;LFD&gt; characters in the buffer terminate lines of text and are
 called newlines.  See section <a href="xemacs_5.html#SEC21">Newline</a>.
 </p>
 </dd>
@@ -721,7 +721,7 @@
 significance depends on the context and on convention.  For example,
 an &ldquo;ordinary&rdquo; character as an Emacs command inserts itself; so in
 this context, a special character is any character that does not
-normally insert itself (such as <kbd>DEL</kbd>, for example), and quoting
+normally insert itself (such as &lt;DEL&gt;, for example), and quoting
 it makes it insert itself as if it were not special.  Not all contexts
 allow quoting.  See section <a href="xemacs_7.html#SEC49">Basic Editing</a>.
 </p>
@@ -779,8 +779,8 @@
 (q.v.).  See section <a href="xemacs_29.html#SEC344">Narrowing</a>.
 </p>
 </dd>
-<dt> <kbd>RET</kbd></dt>
-<dd><p><kbd>RET</kbd> is the character than runs the command to insert a
+<dt> &lt;RET&gt;</dt>
+<dd><p>&lt;RET&gt; is the character than runs the command to insert a
 newline into the text.  It is also used to terminate most arguments
 read in the minibuffer (q.v.).  See section <a 
href="xemacs_5.html#SEC21">Return</a>.
 </p>
Index: texi2html/Tests/xemacs_res/xemacs_33.html
diff -u texi2html/Tests/xemacs_res/xemacs_33.html:1.25 
texi2html/Tests/xemacs_res/xemacs_33.html:1.26
--- texi2html/Tests/xemacs_res/xemacs_33.html:1.25      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_33.html   Sat Apr  8 23:02:08 2006
@@ -411,7 +411,7 @@
 <tr><td></td><td valign="top"><a href="xemacs_13.html#SEC106"><code>C-x r 
w</code></a></td><td valign="top"><a href="xemacs_13.html#SEC106">10.4 Saving 
Window Configurations in Registers</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX700"><code>C-x 
RET</code></a></td><td valign="top"><a href="xemacs_20.html#SEC182">17.1 What 
is Mule?</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX726"><code>C-x RET 
c</code></a></td><td valign="top"><a href="xemacs_20.html#SEC189">17.8 
Specifying a Coding System</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_20.html#IDX717"><code>C-x 
<kbd>RET</kbd> C</code></a></td><td valign="top"><a 
href="xemacs_20.html#SEC187">17.6 Coding Systems</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_20.html#IDX717"><code>C-x 
&lt;RET&gt; C</code></a></td><td valign="top"><a 
href="xemacs_20.html#SEC187">17.6 Coding Systems</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX711"><code>C-x RET 
C-\</code></a></td><td valign="top"><a href="xemacs_20.html#SEC185">17.4 
Selecting an Input Method</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX724"><code>C-x RET 
f</code></a></td><td valign="top"><a href="xemacs_20.html#SEC189">17.8 
Specifying a Coding System</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_20.html#IDX731"><code>C-x RET 
k</code></a></td><td valign="top"><a href="xemacs_20.html#SEC189">17.8 
Specifying a Coding System</a></td></tr>
Index: texi2html/Tests/xemacs_res/xemacs_34.html
diff -u texi2html/Tests/xemacs_res/xemacs_34.html:1.15 
texi2html/Tests/xemacs_res/xemacs_34.html:1.16
--- texi2html/Tests/xemacs_res/xemacs_34.html:1.15      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_34.html   Sat Apr  8 23:02:08 2006
@@ -130,7 +130,7 @@
 <tr><th><a name="INDEX0_1">E</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_7.html#IDX160"><code>END</code></a></td><td valign="top"><a 
href="xemacs_7.html#SEC51">4.2 Changing the Location of Point</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX36"><code>ESC</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC24">2.1.2 Representing Key Sequences</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>ESC</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the <kbd>META</kbd> 
Key</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>ESC</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the &lt;META&gt; 
Key</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_15.html#IDX486"><code>ESC 
(query-replace)</code></a></td><td valign="top"><a 
href="xemacs_15.html#SEC127">12.7.4 Query Replace</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX0_2">F</a></th><td></td><td></td></tr>
@@ -147,7 +147,7 @@
 <tr><td></td><td valign="top"><a 
href="xemacs_7.html#IDX159"><code>HOME</code></a></td><td valign="top"><a 
href="xemacs_7.html#SEC51">4.2 Changing the Location of Point</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX22"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 
Keystrokes as Building Blocks of Key Sequences</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#SEC23"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC23">2.1.1 
Representing Keystrokes</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>hyper 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the &lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX0_5">I</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#IDX1299"><code>i a <span 
class="roman">(Calendar mode)</span></code></a></td><td valign="top"><a 
href="xemacs_29.html#SEC323">26.5.7 Special Diary Entries</a></td></tr>
@@ -258,7 +258,7 @@
 <tr><td></td><td valign="top"><a 
href="xemacs_23.html#SEC208"><code>M-}</code></a></td><td valign="top"><a 
href="xemacs_23.html#SEC208">20.4 Paragraphs</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#IDX1149"><code>M-} <span 
class="roman">(Calendar mode)</span></code></a></td><td valign="top"><a 
href="xemacs_29.html#SEC303">26.1.1.1 Motion by Integral Days, Weeks, Months, 
Years</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_17.html#IDX563"><code>M-~</code></a></td><td valign="top"><a 
href="xemacs_17.html#SEC137">14.3 Saving Files</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>META</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the <kbd>META</kbd> 
Key</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC26"><code>META</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the &lt;META&gt; 
Key</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX20"><code>meta 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 
Keystrokes as Building Blocks of Key Sequences</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 </table>
Index: texi2html/Tests/xemacs_res/xemacs_35.html
diff -u texi2html/Tests/xemacs_res/xemacs_35.html:1.21 
texi2html/Tests/xemacs_res/xemacs_35.html:1.22
--- texi2html/Tests/xemacs_res/xemacs_35.html:1.21      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_35.html   Sat Apr  8 23:02:08 2006
@@ -152,7 +152,7 @@
 <tr><td></td><td valign="top"><a href="xemacs_15.html#IDX483"><code>SPC 
(query-replace)</code></a></td><td valign="top"><a 
href="xemacs_15.html#SEC127">12.7.4 Query Replace</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX23"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 
Keystrokes as Building Blocks of Key Sequences</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#SEC23"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC23">2.1.1 
Representing Keystrokes</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_5.html#SEC27"><code>super 
key</code></a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 
Assignment of the &lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="INDEX1_6">T</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#IDX1206"><code>t <span 
class="roman">(Calendar mode)</span></code></a></td><td valign="top"><a 
href="xemacs_29.html#SEC309">26.2 LaTeX Calendar</a></td></tr>
Index: texi2html/Tests/xemacs_res/xemacs_43.html
diff -u texi2html/Tests/xemacs_res/xemacs_43.html:1.13 
texi2html/Tests/xemacs_res/xemacs_43.html:1.14
--- texi2html/Tests/xemacs_res/xemacs_43.html:1.13      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_43.html   Sat Apr  8 23:02:08 2006
@@ -209,7 +209,7 @@
 <tr><td></td><td valign="top"><a 
href="xemacs_29.html#IDX1311"><code>mark-holidays-in-calendar</code></a></td><td
 valign="top"><a href="xemacs_29.html#SEC325">26.5.8.1 Customizing the 
Calendar</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_12.html#IDX305"><code>mark-ring</code></a></td><td valign="top"><a 
href="xemacs_12.html#SEC84">9.1.4 The Mark Ring</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_12.html#IDX304"><code>mark-ring-max</code></a></td><td 
valign="top"><a href="xemacs_12.html#SEC84">9.1.4 The Mark Ring</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX40"><code>meta-flag</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the <kbd>META</kbd> 
Key</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX40"><code>meta-flag</code></a></td><td valign="top"><a 
href="xemacs_5.html#SEC26">2.1.4 Assignment of the &lt;META&gt; 
Key</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_9.html#IDX218"><code>minibuffer-confirm-incomplete</code></a></td><td
 valign="top"><a href="xemacs_9.html#SEC62">6.2 Editing in the 
Minibuffer</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_9.html#IDX228"><code>minibuffer-confirm-incomplete</code></a></td><td
 valign="top"><a href="xemacs_9.html#SEC67">6.3.4 Completion 
Options</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_30.html#IDX1514"><code>minibuffer-local-completion-map</code></a></td><td
 valign="top"><a href="xemacs_30.html#SEC368">27.4.1 Keymaps</a></td></tr>
Index: texi2html/Tests/xemacs_res/xemacs_47.html
diff -u texi2html/Tests/xemacs_res/xemacs_47.html:1.15 
texi2html/Tests/xemacs_res/xemacs_47.html:1.16
--- texi2html/Tests/xemacs_res/xemacs_47.html:1.15      Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_47.html   Sat Apr  8 23:02:08 2006
@@ -174,12 +174,12 @@
 <tr><td></td><td valign="top"><a href="xemacs_30.html#SEC377">key rebinding, 
permanent</a></td><td valign="top"><a href="xemacs_30.html#SEC377">27.6 The 
Init File</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_30.html#SEC369">key rebinding, 
this session</a></td><td valign="top"><a href="xemacs_30.html#SEC369">27.4.2 
Changing Key Bindings</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_30.html#SEC363">keyboard 
macros</a></td><td valign="top"><a href="xemacs_30.html#SEC363">27.3 Keyboard 
Macros</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX42">keycode</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX42">keycode</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#SEC29">keymap</a></td><td 
valign="top"><a href="xemacs_5.html#SEC29">2.3 Keys and Commands</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_30.html#SEC368">keymap</a></td><td valign="top"><a 
href="xemacs_30.html#SEC368">27.4.1 Keymaps</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_5.html#SEC22">keystroke</a></td><td valign="top"><a 
href="xemacs_5.html#SEC22">2.1 Keystrokes as Building Blocks of Key 
Sequences</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX19">keysym</a></td><td 
valign="top"><a href="xemacs_5.html#SEC22">2.1 Keystrokes as Building Blocks of 
Key Sequences</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX41">keysyms</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="xemacs_5.html#IDX41">keysyms</a></td><td valign="top"><a 
href="xemacs_5.html#SEC27">2.1.5 Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX60">Kill Buffer menu 
item</a></td><td valign="top"><a href="xemacs_5.html#SEC31">2.4.1 The File 
Menu</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_12.html#SEC91">kill 
ring</a></td><td valign="top"><a href="xemacs_12.html#SEC91">9.5 
Yanking</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="xemacs_12.html#SEC87">killing</a></td><td valign="top"><a 
href="xemacs_12.html#SEC87">9.4 Deletion and Killing</a></td></tr>
@@ -246,7 +246,7 @@
 <tr><td></td><td valign="top"><a href="xemacs_29.html#SEC342">mode, 
Term</a></td><td valign="top"><a href="xemacs_29.html#SEC342">26.7.5 Term 
Mode</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_17.html#IDX539">modified 
(buffer)</a></td><td valign="top"><a href="xemacs_17.html#SEC136">14.2 Visiting 
Files</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_5.html#IDX18">modifier 
key</a></td><td valign="top"><a href="xemacs_5.html#SEC22">2.1 Keystrokes as 
Building Blocks of Key Sequences</a></td></tr>
-<tr><td></td><td valign="top"><a href="xemacs_5.html#IDX43">modifier 
mapping</a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 Assignment 
of the <kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td></tr>
+<tr><td></td><td valign="top"><a href="xemacs_5.html#IDX43">modifier 
mapping</a></td><td valign="top"><a href="xemacs_5.html#SEC27">2.1.5 Assignment 
of the &lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_29.html#SEC312">moon, phases 
of</a></td><td valign="top"><a href="xemacs_29.html#SEC312">26.2.3 Phases of 
the Moon</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_12.html#SEC86">mouse 
operations</a></td><td valign="top"><a href="xemacs_12.html#SEC86">9.3 
Additional Mouse Operations</a></td></tr>
 <tr><td></td><td valign="top"><a href="xemacs_12.html#SEC85">mouse 
selection</a></td><td valign="top"><a href="xemacs_12.html#SEC85">9.2 Selecting 
Text with the Mouse</a></td></tr>
Index: texi2html/Tests/xemacs_res/xemacs_5.html
diff -u texi2html/Tests/xemacs_res/xemacs_5.html:1.30 
texi2html/Tests/xemacs_res/xemacs_5.html:1.31
--- texi2html/Tests/xemacs_res/xemacs_5.html:1.30       Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_5.html    Sat Apr  8 23:02:08 2006
@@ -73,9 +73,9 @@
 </td></tr>
 <tr><td align="left" valign="top"><a href="#SEC25">2.1.3 String Key 
Sequences</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">     
Available for upward compatibility.
 </td></tr>
-<tr><td align="left" valign="top"><a href="#SEC26">2.1.4 Assignment of the 
<kbd>META</kbd> Key</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"> 
                Using <kbd>ESC</kbd> to represent <kbd>Meta</kbd>
+<tr><td align="left" valign="top"><a href="#SEC26">2.1.4 Assignment of the 
&lt;META&gt; Key</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">    
             Using &lt;ESC&gt; to represent &lt;Meta&gt;
 </td></tr>
-<tr><td align="left" valign="top"><a href="#SEC27">2.1.5 Assignment of the 
<kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">     Adding modifier keys on certain keyboards.
+<tr><td align="left" valign="top"><a href="#SEC27">2.1.5 Assignment of the 
&lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">     Adding modifier keys on certain keyboards.
 </td></tr>
 <tr><td align="left" valign="top"><a href="#SEC28">2.2 Representation of 
Characters</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"> How 
characters appear in Emacs buffers.
 </td></tr>
@@ -108,7 +108,7 @@
 which defines 128 different character codes.  Some of these codes are
 assigned graphic symbols like &lsquo;<samp>a</samp>&rsquo; and 
&lsquo;<samp>=</samp>&rsquo;; the rest are
 control characters, such as <kbd>Control-a</kbd> (also called <kbd>C-a</kbd>).
-<kbd>C-a</kbd> means you hold down the <kbd>CTRL</kbd> key and then press
+<kbd>C-a</kbd> means you hold down the &lt;CTRL&gt; key and then press
 <kbd>a</kbd>.
 </p>
 <p>   Keybindings in XEmacs are not restricted to the set of
@@ -215,7 +215,7 @@
 </p>
 <dl compact="compact">
 <dt> <kbd>(control a)</kbd></dt>
-<dd><p>Pressing <kbd>CTRL</kbd> and <kbd>a</kbd> simultaneously.
+<dd><p>Pressing &lt;CTRL&gt; and <kbd>a</kbd> simultaneously.
 </p></dd>
 <dt> <kbd>(control ?a)</kbd></dt>
 <dd><p>Another way of writing the keystroke <kbd>C-a</kbd>.
@@ -224,18 +224,18 @@
 <dd><p>Yet another way of writing the keystroke <kbd>C-a</kbd>.
 </p></dd>
 <dt> <kbd>(break)</kbd></dt>
-<dd><p>Pressing the <kbd>BREAK</kbd> key.
+<dd><p>Pressing the &lt;BREAK&gt; key.
 </p></dd>
 <dt> <kbd>(control meta button2up)</kbd></dt>
-<dd><p>Release the middle mouse button, while pressing <kbd>CTRL</kbd> and
-<kbd>META</kbd>. 
+<dd><p>Release the middle mouse button, while pressing &lt;CTRL&gt; and
+&lt;META&gt;. 
 </p></dd>
 </dl>
 <a name="IDX32"></a>
 <p>  Note: As you define keystrokes, you can use the <kbd>shift</kbd> key only
 as a modifier with characters that do not have a second keysym on the
 same key, such as <kbd>backspace</kbd> and <kbd>tab</kbd>.  It is an error to
-define a keystroke using the <kbd>shift</kbd> modifier with keysyms such as
+define a keystroke using the &lt;shift&gt; modifier with keysyms such as
 <kbd>a</kbd> and <kbd>=</kbd>.  The correct forms are <kbd>A</kbd> and 
<kbd>+</kbd>.
 </p>
 <hr size="6">
@@ -318,7 +318,7 @@
 k)]</kbd> is not a key, because the <kbd>(control f)</kbd> is a complete key
 sequence in itself.  You cannot give <kbd>[(control f (control k)]</kbd> an
 independent meaning as a command while <kbd>(control f)</kbd> is a complete
-sequence, because Emacs would understand <kbd>C-f C-k</kbd> as two
+sequence, because Emacs would understand &lt;C-f C-k&gt; as two
 commands.
 </p>
 <p> The predefined prefix key sequences in Emacs are <kbd>(control c)</kbd>,
@@ -394,28 +394,28 @@
 <td valign="middle" align="left">[<a href="xemacs_33.html#SEC413" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="xemacs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="subsection"> 2.1.4 Assignment of the <kbd>META</kbd> Key </h3>
+<h3 class="subsection"> 2.1.4 Assignment of the &lt;META&gt; Key </h3>
  
 <p>  Not all terminals have the complete set of modifiers.  
-Terminals that have a <kbd>Meta</kbd> key allow you to type Meta characters
+Terminals that have a &lt;Meta&gt; key allow you to type Meta characters
 by just holding that key down.  To type <kbd>Meta-a</kbd>, hold down
-<kbd>META</kbd> and press <kbd>a</kbd>.  On those terminals, the 
<kbd>META</kbd> key
-works like the <kbd>SHIFT</kbd> key.  Such a key is not always labeled
-<kbd>META</kbd>, however, as this function is often a special option for a
+&lt;META&gt; and press <kbd>a</kbd>.  On those terminals, the &lt;META&gt; key
+works like the &lt;SHIFT&gt; key.  Such a key is not always labeled
+&lt;META&gt;, however, as this function is often a special option for a
 key with some other primary purpose.
 </p>
-<p>  If there is no <kbd>META</kbd> key, you can still type Meta characters
-using two-character sequences starting with <kbd>ESC</kbd>.  To enter
-<kbd>M-a</kbd>, you could type <kbd><kbd>ESC</kbd> a</kbd>.  To enter 
<kbd>C-M-a</kbd>, you
-would type <kbd>ESC C-a</kbd>.  <kbd>ESC</kbd> is allowed on terminals with
+<p>  If there is no &lt;META&gt; key, you can still type Meta characters
+using two-character sequences starting with &lt;ESC&gt;.  To enter
+<kbd>M-a</kbd>, you could type <kbd>&lt;ESC&gt; a</kbd>.  To enter 
<kbd>C-M-a</kbd>, you
+would type <kbd>ESC C-a</kbd>.  &lt;ESC&gt; is allowed on terminals with
 Meta keys, too, in case you have formed a habit of using it.
 </p>
-<p>If you are running under X and do not have a <kbd>META</kbd> key, it 
-is possible to reconfigure some other key to be a <kbd>META</kbd> 
-key.  See section <a href="#SEC27">Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys</a>. 
+<p>If you are running under X and do not have a &lt;META&gt; key, it 
+is possible to reconfigure some other key to be a &lt;META&gt; 
+key.  See section <a href="#SEC27">Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys</a>. 
 </p>
 <a name="IDX40"></a>
-<p>  Emacs believes the terminal has a <kbd>META</kbd> key if the variable
+<p>  Emacs believes the terminal has a &lt;META&gt; key if the variable
 <code>meta-flag</code> is non-<code>nil</code>.  Normally this is set 
automatically
 according to the termcap entry for your terminal type.  However, sometimes
 the termcap entry is wrong, and then it is useful to set this variable
@@ -443,14 +443,14 @@
 <td valign="middle" align="left">[<a href="xemacs_33.html#SEC413" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="xemacs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="subsection"> 2.1.5 Assignment of the <kbd>SUPER</kbd> and 
<kbd>HYPER</kbd> Keys </h3>
+<h3 class="subsection"> 2.1.5 Assignment of the &lt;SUPER&gt; and 
&lt;HYPER&gt; Keys </h3>
 
-<p>  Most keyboards do not, by default, have <kbd>SUPER</kbd> or 
<kbd>HYPER</kbd>
-modifier keys.  Under X, you can simulate the <kbd>SUPER</kbd> or
-<kbd>HYPER</kbd> key if you want to bind keys to sequences using 
<kbd>super</kbd>
+<p>  Most keyboards do not, by default, have &lt;SUPER&gt; or &lt;HYPER&gt;
+modifier keys.  Under X, you can simulate the &lt;SUPER&gt; or
+&lt;HYPER&gt; key if you want to bind keys to sequences using <kbd>super</kbd>
 and <kbd>hyper</kbd>.  You can use the <code>xmodmap</code> program to do this.
 </p>
-<p>  For example, to turn your <kbd>CAPS-LOCK</kbd> key into a 
<kbd>SUPER</kbd> key,
+<p>  For example, to turn your &lt;CAPS-LOCK&gt; key into a &lt;SUPER&gt; key,
 do the following:
 </p>
 <p>  Create a file called <code>~/.xmodmap</code>.  In this file, place the 
lines
@@ -466,7 +466,7 @@
 the key called <code>Super_L</code> should be a modifier key, which produces 
the
 <code>Mod2</code> modifier.
 </p>
-<p>To create a <kbd>META</kbd> or <kbd>HYPER</kbd> key instead of a 
<kbd>SUPER</kbd> key,
+<p>To create a &lt;META&gt; or &lt;HYPER&gt; key instead of a &lt;SUPER&gt; 
key,
 replace the word <code>Super</code> above with <code>Meta</code> or 
<code>Hyper</code>.
 </p>
 <p>Just after you start up X, execute the command <code>xmodmap 
/.xmodmap</code>.
@@ -587,7 +587,7 @@
 <code>Meta</code>; what matters is that a modifier bit is generated by a 
 keycode which is bound to the keysym <code>Meta_L</code> or 
<code>Meta_R</code>.
 </p>
-<p> Therefore, if you want to make a <kbd>META</kbd> key, the right way 
+<p> Therefore, if you want to make a &lt;META&gt; key, the right way 
 is to make the keycode in question generate both a <code>Meta</code> keysym 
 and some previously-unassigned modifier bit.
 </p>
@@ -617,8 +617,8 @@
 sequences to create key bindings. 
 </p>
 <p>  ASCII graphic characters in Emacs buffers are displayed with their
-graphics.  <kbd>LFD</kbd> is the same as a newline character; it is displayed
-by starting a new line.  <kbd>TAB</kbd> is displayed by moving to the next
+graphics.  &lt;LFD&gt; is the same as a newline character; it is displayed
+by starting a new line.  &lt;TAB&gt; is displayed by moving to the next
 tab stop column (usually every 8 spaces).  Other control characters are
 displayed as a caret (&lsquo;<samp>^</samp>&rsquo;) followed by the 
non-control version of
 the character; thus, <kbd>C-a</kbd> is displayed as 
&lsquo;<samp>^A</samp>&rsquo;.  Non-ASCII
Index: texi2html/Tests/xemacs_res/xemacs_6.html
diff -u texi2html/Tests/xemacs_res/xemacs_6.html:1.30 
texi2html/Tests/xemacs_res/xemacs_6.html:1.31
--- texi2html/Tests/xemacs_res/xemacs_6.html:1.30       Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_6.html    Sat Apr  8 23:02:08 2006
@@ -61,7 +61,7 @@
 </tr></table>
 <h1 class="chapter"> 3. Entering and Exiting Emacs </h1>
 
-<p>  The usual way to invoke XEmacs is to type <kbd>xemacs 
<kbd>RET</kbd></kbd> at
+<p>  The usual way to invoke XEmacs is to type <kbd>xemacs &lt;RET&gt;</kbd> at
 the shell.  XEmacs clears the screen and then displays an initial
 advisory message and copyright notice.  You can begin typing XEmacs
 commands immediately afterward.
Index: texi2html/Tests/xemacs_res/xemacs_7.html
diff -u texi2html/Tests/xemacs_res/xemacs_7.html:1.28 
texi2html/Tests/xemacs_res/xemacs_7.html:1.29
--- texi2html/Tests/xemacs_res/xemacs_7.html:1.28       Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_7.html    Sat Apr  8 23:02:08 2006
@@ -130,18 +130,18 @@
 </p>
 <a name="IDX132"></a>
 <a name="IDX133"></a>
-<p>   To <em>delete</em> text you have just inserted, use <kbd>BS</kbd>.  
<kbd>BS</kbd>
+<p>   To <em>delete</em> text you have just inserted, use &lt;BS&gt;.  
&lt;BS&gt;
 deletes the character <em>before</em> the cursor (not the one that the
 cursor is on top of or under; that is the character <var>after</var> the
 cursor).  The cursor and all characters after it move backwards.
-Therefore, if you type a printing character and then type <kbd>BS</kbd>, they
+Therefore, if you type a printing character and then type &lt;BS&gt;, they
 cancel out.
 </p>
 <a name="IDX134"></a>
 <a name="IDX135"></a>
-<p>   To end a line and start typing a new one, type <kbd>RET</kbd>.  This
+<p>   To end a line and start typing a new one, type &lt;RET&gt;.  This
 inserts a newline character in the buffer.  If point is in the middle of
-a line, <kbd>RET</kbd> splits the line.  Typing <kbd>DEL</kbd> when the cursor 
is
+a line, &lt;RET&gt; splits the line.  Typing &lt;DEL&gt; when the cursor is
 at the beginning of a line deletes the preceding newline, thus joining
 the line with the preceding line.
 </p>
@@ -156,7 +156,7 @@
 <a name="IDX136"></a>
 <a name="IDX137"></a>
 <a name="IDX138"></a>
-<p>  Direct insertion works for printing characters and <kbd>SPC</kbd>, but 
other
+<p>  Direct insertion works for printing characters and &lt;SPC&gt;, but other
 characters act as editing commands and do not insert themselves.  If you
 need to insert a control character or a character whose code is above 200
 octal, you must <em>quote</em> it by typing the character <kbd>Control-q</kbd>
@@ -172,7 +172,7 @@
 <kbd>C-q</kbd> followed by a sequence of octal digits inserts the character
 with the specified octal character code.  You can use any number of
 octal digits; any non-digit terminates the sequence.  If the terminating
-character is <kbd>RET</kbd>, it serves only to terminate the sequence; any
+character is &lt;RET&gt;, it serves only to terminate the sequence; any
 other non-digit is itself used as input after terminating the sequence.
 (The use of octal sequences is disabled in ordinary non-binary Overwrite
 mode, to give you a convenient way to insert a digit instead of
@@ -185,11 +185,11 @@
 <a name="IDX139"></a>
 <a name="IDX140"></a>
 <a name="IDX141"></a>
-<p>  Customization information: <kbd>DEL</kbd>, in most modes, runs the command
-<code>backward-or-forward-delete-char</code>; <kbd>RET</kbd> runs the command
+<p>  Customization information: &lt;DEL&gt;, in most modes, runs the command
+<code>backward-or-forward-delete-char</code>; &lt;RET&gt; runs the command
 <code>newline</code>, and self-inserting printing characters run the command
 <code>self-insert</code>, which inserts whatever character was typed to invoke
-it.  Some major modes rebind <kbd>DEL</kbd> to other commands.
+it.  Some major modes rebind &lt;DEL&gt; to other commands.
 </p>
 <hr size="6">
 <a name="Moving-Point"></a>
@@ -217,7 +217,7 @@
 clicking the left mouse button where you want to move to.
 </p>
 <p>  NOTE: Many of the following commands have two versions, one that uses
-the function keys (e.g. <kbd>LEFT</kbd> or <kbd>END</kbd>) and one that 
doesn't.
+the function keys (e.g. &lt;LEFT&gt; or &lt;END&gt;) and one that doesn't.
 The former versions may only be available on X terminals (i.e. not on
 TTY's), but the latter are available on all terminals.
 </p>
@@ -385,7 +385,7 @@
 <h2 class="section"> 4.3 Erasing Text </h2>
 
 <dl compact="compact">
-<dt> <kbd><kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>&lt;DEL&gt;</kbd></dt>
 <dd><p>Delete the character before or after point
 (<code>backward-or-forward-delete-char</code>).  You can customize
 this behavior by setting the variable <code>delete-key-deletes-forward</code>.
@@ -399,7 +399,7 @@
 <dt> <kbd>M-d</kbd></dt>
 <dd><p>Kill forward to the end of the next word (<code>kill-word</code>).
 </p></dd>
-<dt> <kbd>M-<kbd>DEL</kbd></kbd></dt>
+<dt> <kbd>M-&lt;DEL&gt;</kbd></dt>
 <dd><p>Kill back to the beginning of the previous word
 (<code>backward-kill-word</code>).
 </p></dd>
@@ -408,7 +408,7 @@
 <a name="IDX183"></a>
 <a name="IDX184"></a>
 <a name="IDX185"></a>
-<p>  You already know about the <kbd>DEL</kbd> key which deletes the character
+<p>  You already know about the &lt;DEL&gt; key which deletes the character
 before point (that is, before the cursor).  Another key, <kbd>Control-d</kbd>
 (<kbd>C-d</kbd> for short), deletes the character after point (that is, the
 character that the cursor is on).  This shifts the rest of the text on
@@ -454,12 +454,12 @@
 <p>  Consider a file named &lsquo;<tt>/usr/rms/foo.c</tt>&rsquo;.  To begin 
editing
 this file from Emacs, type:
 </p>
-<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-f /usr/rms/foo.c 
<kbd>RET</kbd>
+<table><tr><td>&nbsp;</td><td><pre class="example">C-x C-f /usr/rms/foo.c 
&lt;RET&gt;
 </pre></td></tr></table>
 
 <p>Here the file name is given as an <em>argument</em> to the command <kbd>C-x
 C-f</kbd> (<code>find-file</code>).  That command uses the <em>minibuffer</em> 
to
-read the argument, and you type <kbd>RET</kbd> to terminate the argument
+read the argument, and you type &lt;RET&gt; to terminate the argument
 (see section <a href="xemacs_9.html#SEC60">The Minibuffer</a>).
 </p>
 <p>  You can also use the <b>Open...</b> menu item from the <b>File</b> menu, 
then
@@ -505,7 +505,7 @@
 <h2 class="section"> 4.5 Help </h2>
 
 <p>  If you forget what a key does, you can find out with the Help
-character, which is <kbd>C-h</kbd> (or <kbd>F1</kbd>, which is an alias for
+character, which is <kbd>C-h</kbd> (or &lt;F1&gt;, which is an alias for
 <kbd>C-h</kbd>).  Type <kbd>C-h k</kbd> followed by the key you want to know
 about; for example, <kbd>C-h k C-n</kbd> tells you all about what 
<kbd>C-n</kbd>
 does.  <kbd>C-h</kbd> is a prefix key; <kbd>C-h k</kbd> is just one of its
@@ -553,13 +553,13 @@
 <a name="IDX189"></a>
 <a name="IDX190"></a>
 <p>  When you want to insert a new line of text before an existing line, you
-can do it by typing the new line of text, followed by <kbd>RET</kbd>.
+can do it by typing the new line of text, followed by &lt;RET&gt;.
 However, it may be easier to see what you are doing if you first make a
 blank line and then insert the desired text into it.  This is easy to do
 using the key <kbd>C-o</kbd> (<code>open-line</code>), which inserts a newline
 after point but leaves point in front of the newline.  After <kbd>C-o</kbd>,
 type the text for the new line.  <kbd>C-o F O O</kbd> has the same effect as
-<kbd>F O O <kbd>RET</kbd></kbd>, except for the final location of point.
+<kbd>F O O &lt;RET&gt;</kbd>, except for the final location of point.
 </p>
 <p>  You can make several blank lines by typing <kbd>C-o</kbd> several times, 
or
 by giving it a numeric argument to tell it how many blank lines to make.
@@ -596,7 +596,7 @@
 <h2 class="section"> 4.7 Continuation Lines </h2>
 
 <p>  If you add too many characters to one line without breaking it with
-<kbd>RET</kbd>, the line will grow to occupy two (or more) lines on the
+&lt;RET&gt;, the line will grow to occupy two (or more) lines on the
 screen, with a curved arrow at the extreme right margin of all but the
 last of them.  The curved arrow says that the following screen line is
 not really a distinct line in the text, but just the <em>continuation</em>
@@ -780,10 +780,10 @@
 <a name="IDX202"></a>
 <a name="IDX203"></a>
 <a name="IDX204"></a>
-<p>  If your keyboard has a <kbd>META</kbd> key (labelled with a diamond on
+<p>  If your keyboard has a &lt;META&gt; key (labelled with a diamond on
 Sun-type keyboards and labelled &lsquo;<samp>Alt</samp>&rsquo; on some other 
keyboards), the
 easiest way to specify a numeric argument is to type digits and/or a
-minus sign while holding down the <kbd>META</kbd> key.  For example,
+minus sign while holding down the &lt;META&gt; key.  For example,
 </p><table><tr><td>&nbsp;</td><td><pre class="example">M-5 C-n
 </pre></td></tr></table>
 <p>would move down five lines.  The characters <kbd>Meta-1</kbd>, 
<kbd>Meta-2</kbd>,
Index: texi2html/Tests/xemacs_res/xemacs_9.html
diff -u texi2html/Tests/xemacs_res/xemacs_9.html:1.27 
texi2html/Tests/xemacs_res/xemacs_9.html:1.28
--- texi2html/Tests/xemacs_res/xemacs_9.html:1.27       Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_9.html    Sat Apr  8 23:02:08 2006
@@ -78,13 +78,13 @@
 <a name="IDX211"></a>
 <p>  Sometimes a <em>default argument</em> appears in parentheses after the
 colon; it, too, is part of the prompt.  The default is used as the
-argument value if you enter an empty argument (e.g., by just typing 
<kbd>RET</kbd>).
+argument value if you enter an empty argument (e.g., by just typing 
&lt;RET&gt;).
 For example, commands that read buffer names always show a default, which
-is the name of the buffer that will be used if you type just <kbd>RET</kbd>.
+is the name of the buffer that will be used if you type just &lt;RET&gt;.
 </p>
 <a name="IDX212"></a>
 <p>  The simplest way to enter a minibuffer argument is to type the text
-you want, terminated by <kbd>RET</kbd> which exits the minibuffer.  You can
+you want, terminated by &lt;RET&gt; which exits the minibuffer.  You can
 cancel the command that wants the argument, and get out of the
 minibuffer, by typing <kbd>C-g</kbd>.
 </p>
@@ -161,7 +161,7 @@
 nearby directories, use <kbd>..</kbd>; thus, if you type
 <kbd>../lisp/simple.el</kbd>, you will get the file named
 &lsquo;<tt>/u2/emacs/lisp/simple.el</tt>&rsquo;.  Alternatively, you can kill 
with
-<kbd>M-<kbd>DEL</kbd></kbd> the directory names you don't want (see section <a 
href="xemacs_23.html#SEC206">Words</a>).
+<kbd>M-&lt;DEL&gt;</kbd> the directory names you don't want (see section <a 
href="xemacs_23.html#SEC206">Words</a>).
 </p>
 <p>  If you don't want any of the default, you can kill it with <kbd>C-a
 C-k</kbd>.  But you don't need to kill the default; you can simply ignore it.
@@ -212,7 +212,7 @@
 usual XEmacs commands are available for editing the text of an argument
 you are entering.
 </p>
-<p>  Since <kbd>RET</kbd> in the minibuffer is defined to exit the minibuffer,
+<p>  Since &lt;RET&gt; in the minibuffer is defined to exit the minibuffer,
 you can't use it to insert a newline in the minibuffer.  To do that,
 type <kbd>C-o</kbd> or <kbd>C-q C-j</kbd>.  (Recall that a newline is really 
the
 character control-J.)
@@ -290,8 +290,8 @@
 argument, then XEmacs visibly fills in the rest, or as much as
 can be determined from the part you have typed.
 </p>
-<p>  When completion is available, certain keys&mdash;<kbd>TAB</kbd>, 
<kbd>RET</kbd>, and
-<kbd>SPC</kbd>&mdash;are rebound to complete the text present in the
+<p>  When completion is available, certain keys&mdash;&lt;TAB&gt;, 
&lt;RET&gt;, and
+&lt;SPC&gt;&mdash;are rebound to complete the text present in the
 minibuffer into a longer string that it stands for, by matching it
 against a set of <em>completion alternatives</em> provided by the command
 reading the argument.  <kbd>?</kbd> is defined to display a list of possible
@@ -303,8 +303,8 @@
 against all the command names, find any additional name characters
 implied by the ones already present in the minibuffer, and add those
 characters to the ones you have given.  This is what makes it possible
-to type <kbd>M-x inse <kbd>SPC</kbd> b <kbd>RET</kbd></kbd> instead of <kbd>M-x
-insert-buffer <kbd>RET</kbd></kbd> (for example).
+to type <kbd>M-x inse &lt;SPC&gt; b &lt;RET&gt;</kbd> instead of <kbd>M-x
+insert-buffer &lt;RET&gt;</kbd> (for example).
 </p>
 <p>  Case is normally significant in completion because it is significant
 in most of the names that you can complete (buffer names, file names and
@@ -315,7 +315,7 @@
 <p>When a completion list is displayed, the completions will highlight as
 you move the mouse over them.  Clicking the middle mouse button on any 
 highlighted completion will &ldquo;select&rdquo; it just as if you had typed 
it in
-and hit <kbd>RET</kbd>.
+and hit &lt;RET&gt;.
 </p>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#SEC64">6.3.1 Completion 
Example</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -349,23 +349,23 @@
 </tr></table>
 <h3 class="subsection"> 6.3.1 Completion Example </h3>
 
-<p>  A concrete example may help here.  If you type <kbd>M-x au 
<kbd>TAB</kbd></kbd>,
-the <kbd>TAB</kbd> looks for alternatives (in this case, command names) that
+<p>  A concrete example may help here.  If you type <kbd>M-x au 
&lt;TAB&gt;</kbd>,
+the &lt;TAB&gt; looks for alternatives (in this case, command names) that
 start with &lsquo;<samp>au</samp>&rsquo;.  There are several, including
 <code>auto-fill-mode</code> and <code>auto-save-mode</code>&mdash;but they are 
all the
 same as far as <code>auto</code>, so the &lsquo;<samp>au</samp>&rsquo; in the 
minibuffer changes
 to &lsquo;<samp>auto</samp>&rsquo;.
 </p>
-<p>  If you type <kbd>TAB</kbd> again immediately, there are multiple
+<p>  If you type &lt;TAB&gt; again immediately, there are multiple
 possibilities for the very next character&mdash;it could be any of
-&lsquo;<samp>c-</samp>&rsquo;&mdash;so no more characters are added; instead, 
<kbd>TAB</kbd>
+&lsquo;<samp>c-</samp>&rsquo;&mdash;so no more characters are added; instead, 
&lt;TAB&gt;
 displays a list of all possible completions in another window.
 </p>
-<p>  If you go on to type <kbd>-f <kbd>TAB</kbd></kbd>, this <kbd>TAB</kbd> 
sees
+<p>  If you go on to type <kbd>-f &lt;TAB&gt;</kbd>, this &lt;TAB&gt; sees
 &lsquo;<samp>auto-f</samp>&rsquo;.  The only command name starting this way is
 <code>auto-fill-mode</code>, so completion fills in the rest of that.  You now
 have &lsquo;<samp>auto-fill-mode</samp>&rsquo; in the minibuffer after typing 
just <kbd>au
-<kbd>TAB</kbd> f <kbd>TAB</kbd></kbd>.  Note that <kbd>TAB</kbd> has this 
effect because in
+&lt;TAB&gt; f &lt;TAB&gt;</kbd>.  Note that &lt;TAB&gt; has this effect 
because in
 the minibuffer it is bound to the command <code>minibuffer-complete</code>
 when completion is available.
 </p>
@@ -394,15 +394,15 @@
 when completion is available.
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dd><p>Complete the text in the minibuffer as much as possible
 (<code>minibuffer-complete</code>).
 </p></dd>
-<dt> <kbd><kbd>SPC</kbd></kbd></dt>
+<dt> <kbd>&lt;SPC&gt;</kbd></dt>
 <dd><p>Complete the minibuffer text, but don't go beyond one word
 (<code>minibuffer-complete-word</code>).
 </p></dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
 <dd><p>Submit the text in the minibuffer as the argument, possibly completing
 first as described below (<code>minibuffer-complete-and-exit</code>).
 </p></dd>
@@ -410,11 +410,11 @@
 <dd><p>Print a list of all possible completions of the text in the minibuffer
 (<code>minibuffer-list-completions</code>).
 </p></dd>
-<dt> <kbd><kbd>button2</kbd></kbd></dt>
+<dt> <kbd>&lt;button2&gt;</kbd></dt>
 <dd><p>Select the highlighted text under the mouse as a minibuffer response.
 When the minibuffer is being used to prompt the user for a completion,
 any valid completions which are visible on the screen will be highlighted
-when the mouse moves over them.  Clicking <kbd>button2</kbd> will select the
+when the mouse moves over them.  Clicking &lt;button2&gt; will select the
 highlighted completion and exit the minibuffer.  
 (<code>minibuf-select-highlighted-completion</code>).
 </p></dd>
@@ -422,12 +422,12 @@
 
 <a name="IDX220"></a>
 <a name="IDX221"></a>
-<p>  <kbd>SPC</kbd> completes much like <kbd>TAB</kbd>, but never goes beyond 
the
+<p>  &lt;SPC&gt; completes much like &lt;TAB&gt;, but never goes beyond the
 next hyphen or space.  If you have &lsquo;<samp>auto-f</samp>&rsquo; in the 
minibuffer and
-type <kbd>SPC</kbd>, it finds that the completion is 
&lsquo;<samp>auto-fill-mode</samp>&rsquo;,
+type &lt;SPC&gt;, it finds that the completion is 
&lsquo;<samp>auto-fill-mode</samp>&rsquo;,
 but it stops completing after &lsquo;<samp>fill-</samp>&rsquo;.  This gives
-&lsquo;<samp>auto-fill-</samp>&rsquo;.  Another <kbd>SPC</kbd> at this point 
completes all the
-way to &lsquo;<samp>auto-fill-mode</samp>&rsquo;.  <kbd>SPC</kbd> in the 
minibuffer when
+&lsquo;<samp>auto-fill-</samp>&rsquo;.  Another &lt;SPC&gt; at this point 
completes all the
+way to &lsquo;<samp>auto-fill-mode</samp>&rsquo;.  &lt;SPC&gt; in the 
minibuffer when
 completion is available runs the command
 <code>minibuffer-complete-word</code>.
 </p>
@@ -445,9 +445,9 @@
 </p>
 <a name="IDX223"></a>
 </dd>
-<dt> <kbd><kbd>PRIOR</kbd></kbd></dt>
+<dt> <kbd>&lt;PRIOR&gt;</kbd></dt>
 <dt> <kbd>M-v</kbd></dt>
-<dd><p>Typing <kbd>PRIOR</kbd> or <kbd>M-v</kbd>, while in the minibuffer, 
selects the
+<dd><p>Typing &lt;PRIOR&gt; or <kbd>M-v</kbd>, while in the minibuffer, 
selects the
 window showing the completion list buffer
 (<code>switch-to-completions</code>).  This paves the way for using the
 commands below.  (Selecting that window in the usual ways has the same
@@ -455,26 +455,26 @@
 </p>
 <a name="IDX224"></a>
 </dd>
-<dt> <kbd><kbd>RET</kbd></kbd></dt>
-<dd><p>Typing <kbd>RET</kbd> <em>in the completion list buffer</em> chooses the
+<dt> <kbd>&lt;RET&gt;</kbd></dt>
+<dd><p>Typing &lt;RET&gt; <em>in the completion list buffer</em> chooses the
 completion that point is in or next to (<code>choose-completion</code>).  To
 use this command, you must first switch windows to the window that shows
 the list of completions.
 </p>
 <a name="IDX225"></a>
 </dd>
-<dt> <kbd><kbd>RIGHT</kbd></kbd></dt>
-<dt> <kbd><kbd>TAB</kbd></kbd></dt>
+<dt> <kbd>&lt;RIGHT&gt;</kbd></dt>
+<dt> <kbd>&lt;TAB&gt;</kbd></dt>
 <dt> <kbd>C-f</kbd></dt>
-<dd><p>Typing the right-arrow key <kbd>RIGHT</kbd>, <kbd>TAB</kbd> or 
<kbd>C-f</kbd> <em>in
+<dd><p>Typing the right-arrow key &lt;RIGHT&gt;, &lt;TAB&gt; or <kbd>C-f</kbd> 
<em>in
 the completion list buffer</em> moves point to the following completion
 (<code>next-list-mode-item</code>).
 </p>
 <a name="IDX226"></a>
 </dd>
-<dt> <kbd><kbd>LEFT</kbd></kbd></dt>
+<dt> <kbd>&lt;LEFT&gt;</kbd></dt>
 <dt> <kbd>C-b</kbd></dt>
-<dd><p>Typing the left-arrow key <kbd>LEFT</kbd> or <kbd>C-b</kbd> <em>in the
+<dd><p>Typing the left-arrow key &lt;LEFT&gt; or <kbd>C-b</kbd> <em>in the
 completion list buffer</em> moves point toward the beginning of the buffer,
 to the previous completion (<code>previous-list-mode-item</code>).
 </p></dd>
@@ -501,7 +501,7 @@
 </tr></table>
 <h3 class="subsection"> 6.3.3 Strict Completion </h3>
 
-<p>  There are three different ways that <kbd>RET</kbd> can work in completing
+<p>  There are three different ways that &lt;RET&gt; can work in completing
 minibuffers, depending on how the argument will be used.
 </p>
 <ul>
@@ -510,15 +510,15 @@
 argument except one of the known alternatives.  For example, when
 <kbd>C-x k</kbd> reads the name of a buffer to kill, it is meaningless to
 give anything but the name of an existing buffer.  In strict
-completion, <kbd>RET</kbd> refuses to exit if the text in the minibuffer
+completion, &lt;RET&gt; refuses to exit if the text in the minibuffer
 does not complete to an exact match.
 
 </li><li>
 <em>Cautious</em> completion is similar to strict completion, except that
-<kbd>RET</kbd> exits only if the text was an exact match already, not
-needing completion.  If the text is not an exact match, <kbd>RET</kbd> does
+&lt;RET&gt; exits only if the text was an exact match already, not
+needing completion.  If the text is not an exact match, &lt;RET&gt; does
 not exit, but it does complete the text.  If it completes to an exact
-match, a second <kbd>RET</kbd> will exit.
+match, a second &lt;RET&gt; will exit.
 
 <p>Cautious completion is used for reading file names for files that must
 already exist.
@@ -528,7 +528,7 @@
 meaningful, and the list of completion alternatives is just a guide.
 For example, when <kbd>C-x C-f</kbd> reads the name of a file to visit, any
 file name is allowed, in case you want to create a file.  In
-permissive completion, <kbd>RET</kbd> takes the text in the minibuffer
+permissive completion, &lt;RET&gt; takes the text in the minibuffer
 exactly as given, without completing it.
 </li></ul>
 
@@ -579,7 +579,7 @@
 <a name="IDX228"></a>
 <p>If the variable <code>minibuffer-confirm-incomplete</code> is set to 
<code>t</code>,
 then in contexts where <code>completing-read</code> allows answers that are
-not valid completions, an extra <kbd>RET</kbd> must be typed to confirm the
+not valid completions, an extra &lt;RET&gt; must be typed to confirm the
 response.  This is helpful for catching typos.
 </p>
 <a name="IDX229"></a>
@@ -616,21 +616,21 @@
 think of them as moving through the history of previous arguments.
 </p>
 <dl compact="compact">
-<dt> <kbd><kbd>UP</kbd></kbd></dt>
+<dt> <kbd>&lt;UP&gt;</kbd></dt>
 <dt> <kbd>M-p</kbd></dt>
 <dd><p>Move to the next earlier argument string saved in the minibuffer history
 (<code>previous-history-element</code>).
 </p></dd>
-<dt> <kbd><kbd>DOWN</kbd></kbd></dt>
+<dt> <kbd>&lt;DOWN&gt;</kbd></dt>
 <dt> <kbd>M-n</kbd></dt>
 <dd><p>Move to the next later argument string saved in the minibuffer history
 (<code>next-history-element</code>).
 </p></dd>
-<dt> <kbd>M-r <var>regexp</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-r <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Move to an earlier saved argument in the minibuffer history that has a
 match for <var>regexp</var> (<code>previous-matching-history-element</code>).
 </p></dd>
-<dt> <kbd>M-s <var>regexp</var> <kbd>RET</kbd></kbd></dt>
+<dt> <kbd>M-s <var>regexp</var> &lt;RET&gt;</kbd></dt>
 <dd><p>Move to a later saved argument in the minibuffer history that has a
 match for <var>regexp</var> (<code>next-matching-history-element</code>).
 </p></dd>
@@ -649,7 +649,7 @@
 </p>
 <p>  The previous input that you fetch from the history entirely replaces
 the contents of the minibuffer.  To use it as the argument, exit the
-minibuffer as usual with <kbd>RET</kbd>.  You can also edit the text before
+minibuffer as usual with &lt;RET&gt;.  You can also edit the text before
 you reuse it; this does not change the history element that you
 &ldquo;moved&rdquo; to, but your new argument does go at the end of the history
 list in its own right.
@@ -715,33 +715,33 @@
 </p>
 <a name="IDX238"></a>
 <dl compact="compact">
-<dt> <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd></dt>
+<dt> <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd></dt>
 <dd><p>Re-execute a recent minibuffer command 
(<code>repeat-complex-command</code>).
 </p></dd>
 <dt> <kbd>M-p</kbd></dt>
-<dd><p>Within <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd>, move to previous 
recorded command
+<dd><p>Within <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd>, move to previous 
recorded command
 (<code>previous-history-element</code>).
 </p></dd>
 <dt> <kbd>M-n</kbd></dt>
-<dd><p>Within <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd>, move to the next 
(more recent)
+<dd><p>Within <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd>, move to the next (more 
recent)
 recorded command (<code>next-history-element</code>).
 </p></dd>
 <dt> <kbd>M-x list-command-history</kbd></dt>
 <dd><p>Display the entire command history, showing all the commands
-<kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> can repeat, most recent first.
+<kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> can repeat, most recent first.
 </p></dd>
 </dl>
 
 <a name="IDX239"></a>
 <a name="IDX240"></a>
-<p>  <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> is used to re-execute a 
recent
+<p>  <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> is used to re-execute a recent
 minibuffer-using command.  With no argument, it repeats the last such
 command.  A numeric argument specifies which command to repeat; one
 means the last one, and larger numbers specify earlier ones.
 </p>
-<p>  <kbd>C-x <kbd>ESC</kbd> <kbd>ESC</kbd></kbd> works by turning the 
previous command
+<p>  <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> works by turning the previous 
command
 into a Lisp expression and then entering a minibuffer initialized with
-the text for that expression.  If you type just <kbd>RET</kbd>, the command
+the text for that expression.  If you type just &lt;RET&gt;, the command
 is repeated as before.  You can also change the command by editing the
 Lisp expression.  Whatever expression you finally submit is what will be
 executed.  The repeated command is added to the front of the command
@@ -756,17 +756,17 @@
 <a name="IDX242"></a>
 <a name="IDX243"></a>
 <a name="IDX244"></a>
-<p>  If you are in the minibuffer for <kbd>C-x <kbd>ESC</kbd> 
<kbd>ESC</kbd></kbd> and the
+<p>  If you are in the minibuffer for <kbd>C-x &lt;ESC&gt; &lt;ESC&gt;</kbd> 
and the
 command shown to you is not the one you want to repeat, you can move
 around the list of previous commands using <kbd>M-n</kbd> and <kbd>M-p</kbd>.
 <kbd>M-p</kbd> replaces the contents of the minibuffer with the next earlier
 recorded command, and <kbd>M-n</kbd> replaces it with the next later command.
 After finding the desired previous command, you can edit its expression
-and then resubmit it by typing <kbd>RET</kbd>.  Any editing you have done on
+and then resubmit it by typing &lt;RET&gt;.  Any editing you have done on
 the command to be repeated is lost if you use <kbd>M-n</kbd> or <kbd>M-p</kbd>.
 </p>
-<p><kbd>M-n</kbd> and <kbd>M-p</kbd> are specially defined within <kbd>C-x 
<kbd>ESC</kbd>
-<kbd>ESC</kbd></kbd> to run the commands <code>previous-history-element</code> 
and
+<p><kbd>M-n</kbd> and <kbd>M-p</kbd> are specially defined within <kbd>C-x 
&lt;ESC&gt;
+&lt;ESC&gt;</kbd> to run the commands <code>previous-history-element</code> and
 <code>next-history-element</code>.
 </p>
 <a name="IDX245"></a>
Index: texi2html/Tests/xemacs_res/xemacs_toc.html
diff -u texi2html/Tests/xemacs_res/xemacs_toc.html:1.16 
texi2html/Tests/xemacs_res/xemacs_toc.html:1.17
--- texi2html/Tests/xemacs_res/xemacs_toc.html:1.16     Sat Apr  8 22:40:20 2006
+++ texi2html/Tests/xemacs_res/xemacs_toc.html  Sat Apr  8 23:02:08 2006
@@ -85,8 +85,8 @@
       <li><a name="TOC23" href="xemacs_5.html#SEC23">2.1.1 Representing 
Keystrokes</a></li>
       <li><a name="TOC24" href="xemacs_5.html#SEC24">2.1.2 Representing Key 
Sequences</a></li>
       <li><a name="TOC25" href="xemacs_5.html#SEC25">2.1.3 String Key 
Sequences</a></li>
-      <li><a name="TOC26" href="xemacs_5.html#SEC26">2.1.4 Assignment of the 
<kbd>META</kbd> Key</a></li>
-      <li><a name="TOC27" href="xemacs_5.html#SEC27">2.1.5 Assignment of the 
<kbd>SUPER</kbd> and <kbd>HYPER</kbd> Keys</a></li>
+      <li><a name="TOC26" href="xemacs_5.html#SEC26">2.1.4 Assignment of the 
&lt;META&gt; Key</a></li>
+      <li><a name="TOC27" href="xemacs_5.html#SEC27">2.1.5 Assignment of the 
&lt;SUPER&gt; and &lt;HYPER&gt; Keys</a></li>
     </ul></li>
     <li><a name="TOC28" href="xemacs_5.html#SEC28">2.2 Representation of 
Characters</a></li>
     <li><a name="TOC29" href="xemacs_5.html#SEC29">2.3 Keys and 
Commands</a></li>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]