etags now parses HTML.

3 files changed, 19 insertions, 9 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 7940d1f1c15..db52e2b202e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -61,7 +61,7 @@ See the files mac/README and mac/INSTALL for build instructions.
 ** The mode line position information now comes before the major mode.
 When the file is maintained under version control, that information
 appears between the position information and the major mode.
-   
+
 +++
 ** You can now customize the use of window fringes.  To control this
 for all frames, use M-x fringe-mode or the Show/Hide submenu of the
@@ -682,17 +682,17 @@ expressions: `m' allows regexps to match more than one line, while `s'
 span newlines allows writing of much more powerful regular expressions
 and rapid prototyping for tagging new languages.
 
-**** Regular expressions can use char escape sequences as in Gcc
+**** Regular expressions can use char escape sequences as in Gcc.
 The escaped character sequence \a, \b, \d, \e, \f, \n, \r, \t, \v,
 respectively, stand for the ASCII characters BEL, BS, DEL, ESC, FF, NL,
 CR, TAB, VT,
 
-**** Regular expressions can be bound to a given language
+**** Regular expressions can be bound to a given language.
 The syntax --regex={LANGUAGE}REGEX means that REGEX is used to make tags
 only for files of language LANGUAGE, and ignored otherwise.  This is
 particularly useful when storing regexps in a file.
 
-**** Regular expressions can be read from a file
+**** Regular expressions can be read from a file.
 The --regex=@regexfile option means read the regexps from a file, one
 per line.  Lines beginning with space or tab are ignored.
 
@@ -703,14 +703,19 @@ Subroutine tags are named from their package.  You can jump to sub tags
 as you did before, by the sub name, or additionally by looking for
 package::sub.
 
-**** New language PHP: tags are functions, classes and defines.
+**** New language PHP.
+Tags are functions, classes and defines.
 If the --members option is specified to etags, tags are vars also.
 
+**** New language HTML.
+Title and h1, h2, h3 are tagged.  Also, tags are generated when name= is
+used inside an anchor and whenever id= is used.
+
 **** New default keywords for TeX.
 The new keywords are def, newcommand, renewcommand, newenvironment and
 renewenvironment.
 
-**** In Makefiles, constants are tagged
+**** In Makefiles, constants are tagged.
 If you want the old behavior instead, thus avoiding to increase the
 size of the tags file, use the --no-globals option.
 
@@ -723,7 +728,7 @@ specified in those directives.  This is useful when dealing with code
 created from Cweb source files.  When Etags tags the generated file, it
 writes tags pointing to the source file.
 
-*** New option --parse-stdin=FILE
+*** New option --parse-stdin=FILE.
 This option is mostly useful when calling etags from programs.  It can
 be used (only once) in place of a file name on the command line.  Etags
 will read from standard input and mark the produced tags as belonging to
@@ -925,7 +930,7 @@ manipulating the macro counter and format via C-x C-k C-c,
 C-x C-k C-a, and C-x C-k C-f.  See the commentary in kmacro.el
 for more commands.
 
-The normal macro bindings C-x (, C-x ), and C-x e now interfaces to 
+The normal macro bindings C-x (, C-x ), and C-x e now interfaces to
 the keyboard macro ring.
 
 +++
diff --git a/etc/etags.1 b/etc/etags.1
index cd0022012e1..911f20637e8 100644
--- a/etc/etags.1
+++ b/etc/etags.1
@@ -49,7 +49,7 @@ understood by
 format understood by
 .BR vi ( 1 )\c
 \&.  Both forms of the program understand
-the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang,
+the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang, HTML,
 LaTeX, Emacs Lisp/Common Lisp, makefiles, Pascal, Perl, PHP, Postscript,
 Python, Prolog, Scheme and
 most assembler\-like syntaxes.
diff --git a/man/maintaining.texi b/man/maintaining.texi
index fcc596d03ca..4cbeb743baf 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -337,6 +337,11 @@ in the file.
 In Fortran code, functions, subroutines and block data are tags.
 
 @item
+In HTML input files, the tags are the @code{title} and the @code{h1},
+@code{h2}, @code{h3} headers.  Also, tags are @code{name=} in anchors
+and all occurrences of @code{id=}.
+
+@item
 In makefiles, targets are tags; additionally, variables are tags
 unless you specify @samp{--no-globals}.