diff -ruN groff-1.20.1/aclocal.m4 groff-1.21/aclocal.m4
--- groff-1.20.1/aclocal.m4	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/aclocal.m4	2010-12-31 08:33:17.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -ruN groff-1.20.1/ChangeLog groff-1.21/ChangeLog
--- groff-1.20.1/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/ChangeLog	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,779 @@
-2009-01-05  Werner LEMBERG  <wl@gnu.org>
+2010-12-31  Werner LEMBERG  <wl@gnu.org>
+
+Version 1.21 released
+=====================
+
+	* NEWS, REVISION, VERSION, doc/groff.texinfo, doc/webpage.ms: Updated.
+	* aclocal.m4, configure: Regenerated.
+
+2010-12-31  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/webpage.ms: Updated.
+
+2010-12-31  Werner LEMBERG  <wl@gnu.org>
+
+	* configure: Regenerate with autoconf 2.67.
+
+2010-12-31  Werner LEMBERG  <wl@gnu.org>
+
+	Update various scripts.
+
+	* config.guess, config.sub: Update from `config' repository.
+	* install-sh, mkinstalldirs: Update from `gnulib' repository.
+
+2010-12-31  Werner LEMBERG  <wl@gnu.org>
+
+	Update texinfo.tex.
+
+	* doc/texinfo.tex: Update von `texinfo' repository.
+
+2010-12-30  Werner LEMBERG  <wl@gnu.org>
+
+	Call texi2dvi with correct makeinfo binary.
+
+	* doc/Makefile.in (.texinfo.dvi, .texinfo.pdf): Use $(MAKEINFO).
+
+2010-12-30  Werner LEMBERG  <wl@gnu.org>
+
+	Documentation updates.
+
+	* NEWS, PROBLEMS, MANIFEST: Update.
+
+2010-12-26  Werner LEMBERG  <wl@gnu.org>
+
+	Speed up troff.
+
+	* src/include/ptable.h (PTABLE): Make hash tables much more sparse
+	by changing the ratio `FULL_NUM/FULL_DEN' from 2/3 to 1/4.  This
+	increases the allocated memory by about 200kByte (which is nothing
+	today) but assures that there aren't extremely long searches for a
+	free hash slot in case that the hash function doesn't return a free
+	one.  Due to the nature of the entries in uniuni.cpp, the used hash
+	function in ptable.cpp is not optimal, but using a sparse array
+	compensates this.
+
+2010-12-20  Werner LEMBERG  <wl@gnu.org>
+
+	Replace patch from 2010-12-18 with a much faster implementation.
+
+	* src/roff/troff/node.h (node): Add virtual function
+	`get_break_code'.
+
+	* src/roff/troff/node.cpp (inter_char_space_node): Remove class
+	completely.
+	(glyph_node::merge_glyph_node): Restore previous version.
+
+	(break_char_node): Add `prev_break_code' field and update
+	constructors.
+	(node::get_break_code, break_char_node::get_break_code): Implement.
+
+	(node::add_char): Pass remaining cflags values.
+
+	(break_char_node::add_self): Use the logic of the now deleted
+	`inter_char_space_node::add_self' function to insert a space node if
+	necessary.
+
+2010-12-20  Daiki Ueno  <ueno@unixuser.org>
+
+	A new try to not changing srcdir if building in separate builddir.
+
+	Makefile.in ($GNULIBDIRS): Disable calls to autoconf and friends.
+
+2010-12-20  Werner LEMBERG  <wl@gnu.org>
+
+	Speed up access to cflags values.
+
+	We now recompute the cflags values for all charinfo objects if
+	`.class' has been called.
+
+	* src/roff/troff/charinfo.h: Add external references to `class_flag'
+	and `get_flags'.
+	(charinfo): `get_flags' no longer has a return value.
+	(charinfo::overlaps_horizontally, charinfo::overlaps_vertically,
+	charinfo::can_break_before, charinfo::can_break_after,
+	charinfo::can_break_after, charinfo::ends_sentence,
+	charinfo::transparent,, charinfo:ignore_hcodes,
+	charinfo::prohibit_break_before, charinfo::prohibit_break_after,
+	charinfo::inter_char_space): Call global `get_flags' only if
+	necessary.
+	(charinfo::add_to_class): Set `class_flag'.
+
+	* src/roff/troff/input.cpp (class_flag): New global flag.
+	(charinfo::charinfo): Call `get_flags' member function.
+	(get_flags): New global function which iterates over all entries in
+	the charinfo dictionary.
+	(charinfo::get_flags): Set `flags' directly.
+
+2010-12-19  Werner LEMBERG  <wl@gnu.org>
+
+	Protect `.class' against cyclic nesting.
+
+	* src/roff/troff/charinfo.h (charinfo::contains): Add optional
+	boolean argument.
+	* src/roff/troff/input.cpp (define_class, charinfo::contains): Check
+	for cyclic nesting.
+
+2010-12-18  Werner LEMBERG  <wl@gnu.org>
+
+	Improve CJK support with new values for `.cflags'.
+
+	This patch introduces three new values to `.cflags':
+
+	  don't break before character: 128
+	  don't break after character:  256
+	  allow inter-character break:  512
+
+	They are handled differently if compared to other cflags values:
+
+	  (1) hcode values are completely ignored
+	  (2) similar to kern values, and contrary to the other cflags
+	      values, troff looks at pairs of characters to decide whether a
+	      break gets inserted
+
+	A yet-to-be-written patch should add inter-character spacing if
+	those flags are active; currently, only zero-width breakpoints are
+	inserted.
+
+	* src/roff/troff/charinfo.h (charinfo): Change type of `flags' to
+	`int'.  Update callers accordingly.
+	New enum values `DONT_BREAK_BEFORE', `DONT_BREAK_AFTER', and
+	`INTER_CHAR_SPACE'.
+	New member functions `prohibit_break_before',
+	`prohibit_break_after', and `inter_char_space'.
+	* src/roff/troff/input.cpp: Updated.
+
+	* src/roff/troff/node.cpp (inter_char_space_node): New class similar
+	to kern_pair_node, collecting charinfo entities with the
+	abovementioned cflags values.
+	(break_char_type): Add new enum values.
+	(glyph_node::merge_glyph_node): Handle abovementioned cflags values
+	and emit an `inter_char_space_node' if necessary.
+
+	* tmac/ja.tmac: Use new cflags values.
+
+	* doc/groff.texinfo, NEWS, man/groff_diff.man: Document new values.
+
+2010-12-18  Werner LEMBERG  <wl@gnu.org>
+
+	Remove compiler warning.
+
+	* src/libs/libgroff/relocate.cpp (msw2posixpath): Remove redundant
+	dereferencing.
+
+2010-12-16  Daiki Ueno  <ueno@unixuser.org>
+
+	Don't change srcdir if building in a separate builddir.
+
+	* Makefile.in ($GNULIBDIRS): Copy configuring stuff of gnulib if
+	necessary.
+
+2010-12-15  Werner LEMBERG  <wl@gnu.org>
+
+	Fix compilation problem.
+
+	This issue happens with gcc 4.2.4.
+
+	* src/roff/troff/node.cpp (node::~node): Move to...
+	* src/roff/troff/node.h: Here.  This ensures that the inline
+	member function is publicly visible.
+
+2010-12-15  Werner LEMBERG  <wl@gnu.org>
+
+	Remove unused code.
+
+	* src/roff/troff/node.cpp, src/roff/troff/node.h
+	(space_node::space_node): Remove unused constructor.
+
+2010-12-15  Werner LEMBERG  <wl@gnu.org>
+
+	Use enum to increase readability.
+
+	* src/roff/troff/node.cpp (break_char_type): New enum.
+	(break_char_node::add_self, node::add_char): Use it.
+
+2010-12-13  Daiki Ueno  <ueno@unixuser.org>
+	    Werner LEMBERG  <wl@gnu.org>
+
+	Add wide character support to grotty.
+
+	This is a huge patch, mainly by adding the gnulib infrastructure in
+	a separate directory tree (in `src/libs/gnulib/lib') for its
+	`wcwidth' module.  However, the actual changes to native groff
+	source files are just a few lines.
+
+	* Makefile.comm (INCLUDES): Updated.
+	(LIBGNU): Define.
+
+	* Makefile.in (NOMAKEDIRS): Updated.
+	(GNULLIBDIRS): Define.
+	(DISTDIRS): Add GNULLIBDIRS.
+	($LIBDIRS): Depend on GNULLIBDIRS.
+	($GNULLIBDIRS): New target.
+
+	* src/libs/libgroff/font.cpp (font::get_width, font::load)
+	[is_unicode]: Use `wcwidth'.
+
+	* src/roff/troff/Makefile.sub (XLIBS): Add LIBGNU.
+	* src/roff/troff/input.cpp (main): Set LC_CTYPE.
+
+	* src/devices/grotty/Makefile.sub (XLIBS): Add LIBGNU.
+	* src/devices/grotty/tty.cpp (main): Set LC_CTYPE.
+
+	* src/libs/gnulib/*: New files.  The import was done as follows:
+
+	  . Call
+
+	      gnulib-tool --create-testdir \
+	                  --dir=src/libs/gnulib \
+	                  wcwidth
+
+	    to get a testbed.
+
+	  . Manually move directories src/libs/gl{lib,m4} to
+	    src/libs/{lib,m4}, and do s/gllib/lib/ and s/glm4/m4/ everywhere
+	    to `convert' the gnulib testbed to a standard gnulib
+	    configuration as maintained by gnulib-tool.
+
+	  . Call
+
+	      gnulib-tool --add-import \
+	                  --dir=src/libs/gnulib \
+	                  wcwidth
+
+	    to update everything.
+
+2010-12-13  Werner LEMBERG  <wl@gnu.org>
+
+	`.class' must not emit empty lines.
+
+	* src/roff/troff/input.cpp (define_class): Add missing `skip_line'
+	calls.
+
+2010-12-06  UKAI Fumitoshi  <ukai@debian.or.jp>
+	    Colin Watson  <cjwatson@debian.org>
+
+	Add Japanese localization.
+
+	* tmac/ja.tmac: New file.
+	* tmac/Makefile.sub (NORMALFILES): Updated.
+
+2010-12-06  Colin Watson  <cjwatson@debian.org>
+	    Daiki Ueno  <ueno@unixuser.org>
+
+	Implement support for character classes.
+
+	This patch uses standard C++ headers, contrary to the rest of groff.
+	Ideally, everything in groff should be updated to do the same.
+
+	* src/include/font.h (glyph_to_unicode): New function.
+
+	* src/libs/libgroff/font.cpp (glyph_to_unicode): Implement it.
+	(font::contains, font::get_code): Use it.
+
+	* src/roff/troff/charinfo.h: Include <vector> and <utility>.
+	(charinfo): New members `ranges' and `nested_classes'.
+	New member functions `get_unicode_code' and `get_flags'.
+	New member functions `add_to_class', `is_class', and `contains'.
+	(charinfo::overlaps_horizontally, charinfo::overlaps_vertically,
+	charinfo::can_break_before, charinfo::can_break_after,
+	charinfo::can_break_after, charinfo::ends_sentence,
+	charinfo::transparent,, charinfo:ignore_hcodes): Use `get_flags',
+	which handles character classes also.
+
+	* src/roff/troff/input.cpp (char_class_dictionary): New global
+	variable.
+	(define_class): New function.
+	(init_input_requests): Register `class'.
+
+	(charinfo::get_unicode_code, charinfo::get_flags,
+	charinfo::contains): Implement it.
+
+	* NEWS, doc/groff.texinfo (Character Classes), man/groff_diff.man,
+	man/groff.man: Document it.
+
+2010-11-11  Anton Shepelev  <anton.txt@gmail.com>
+
+	[grohtml]: Improve texinfo documentation.
+
+	* doc/groff.texinfo (grohtml): Insert man page description, slightly
+	extended.
+
+2010-11-11  Werner LEMBERG  <wl@gnu.org>
+
+	Fix crash in tbl with option `nospaces'.
+	Reported by Louis Guillaume <louis@zabrico.com>.
+
+	* src/libs/libgroff/string.cpp (string::remove_spaces): If input
+	data consists of spaces only and thus reduces to nothing, set `sz'
+	to 0.
+
+2010-11-02  Ulrich Spörlein  <uqs@spoerlein.net>
+
+	[mdoc]: Complete previous patch and document OpenBSD releases.
+
+	* tmac/doc-common (doc-operating-system-NetBSD): Add versions 5.0,
+	5.0.1, and 5.0.2.
+	(doc-operating-system-OpenBSD-*): New strings.
+	(doc-operating-system-FreeBSD-*): Add version 8.1.
+	(doc-operating-system-DragonFly-*): Add versions 2.2, 2.4, 2.6, and
+	2.8.
+	(Os): Handle DragonFly and OpenBSD.
+
+	* tmac/groff_mdoc.man: Document OpenBSD releases.
+	Add DragonFly release 2.8.
+
+2010-11-02  Ulrich Spörlein  <uqs@spoerlein.net>
+
+	[mdoc]: Improve man page.
+
+	* tmac/groff_tmac.man: Fix prologue macro order.
+	Update NetBSD, FreeBSD, and DragonflyBSD version numbers.
+	Other minor layout improvements.
+
+2010-11-02  Anton Shepelev  <anton.txt@gmail.com>
+
+	[grohtml] Improve man page.
+
+	* src/devices/grohtml/grohtml.man: Document two-pass handling of
+	input data.
+
+2010-09-19  Werner LEMBERG  <wl@gnu.org>
+
+	[groff] Don't use prefix for preconv.
+	Reported by Dorai Sitaram <ds26gte@yahoo.com>
+
+	* src/roff/groff/groff.cpp (main): Fix it.
+
+2010-07-28  Larry Kollar  <kollar@windstream.net>
+
+	* doc/groff.texinfo, man/groff.man: Document `!' operator better.
+
+2010-06-28  Jan Vcelak  <jvcelak@redhat.com>
+
+	* src/roff/troff/node.cpp (make_node): Adding missing `%'.
+	Reported in
+	http://lists.gnu.org/archive/html/bug-groff/2010-06/msg00022.html
+
+2010-06-05  Larry Jones  <lawrence.jones@siemens.com>
+
+	* man/groff_diff.man: Document \n[.P].
+
+2010-06-04  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS: Updated.
+
+2010-06-04  Denis M. Wilson  <dmw@oxytropis.plus.com>
+
+	afmtodit: Add option `-o' to specify an output file.
+
+	* src/utils/afmtodit.pl: Implement it.
+	* src/utils/afmtodit.man: Document it.
+
+2010-06-04  Larry Jones  <lawrence.jones@siemens.com>
+
+	* man/groff_diff.man: Document \n[.O].
+
+2010-05-30  Werner LEMBERG  <wl@gnu.org>
+
+	Fix metric files for devps families A, BM, and font ZCMI.
+	Problem reported by Denis M. Wilson <dmw@oxytropis.plus.com>.
+
+	* font/devps/{AB, ABI, AI, AR, BMB, BMBI, BMI, BMR, ZCMI}:
+	Regenerated, using correct AFM files (from the Adobe Core 35 fonts
+	with 229 glyphs).
+
+2010-05-28  Werner LEMBERG  <wl@gnu.org>
+
+	Don't use obsolete intermediate output command `F'.
+	Reported by Krzysztof Zelechowski <giecrilj@stegny.2a.pl>
+
+	* src/roff/troff/nodes.cpp (troff_output_file::really_put_filename):
+	Replace `F' command with `x F'.
+
+2010-05-24  Werner LEMBERG  <wl@gnu.org>
+
+	* PROBLEMS: Document that mdoc doesn't work with test-groff.
+	Reported by Krzysztof Zelechowski <giecrilj@stegny.2a.pl>
+
+2010-05-22  Werner LEMBERG  <wl@gnu.org>
+
+	Document preconv in texinfo.
+
+	* doc/groff.texinfo: Mention preconv and its related command line
+	options for groff.
+	Add stubs for direct preconv documentation.
+	Sort groff options and environment variables.
+
+2010-05-22  Werner LEMBERG  <wl@gnu.org>
+
+	Use DESC's `unicode' keyword for grotty.
+
+	Consequently, no longer check directly for the `utf8' device name
+	which prevented the creation of arbitrarily called output device
+	directories like `devunicode'.
+
+	Problem reported by Christopher Yeleighton <giecrilj@stegny.2a.pl>
+	in Savannah bug #29895.
+
+	* src/devices/grotty/tty.cpp (tty_printer): Remove `is_utf8' member.
+	Replace all ocurrences with `font::is_unicode'.
+	(tty_printer::tty_printer): Remove argument.
+
+	* src/devices/grotty/grotty.man: Document `unicode' keyword.
+
+2010-05-19  Werner LEMBERG  <wl@gnu.org>
+
+	Update symbol tables for devps font generation.
+
+	* font/devps/generate/textmap: Sort alphabetically.
+	Replace tabs with spaces.
+
+	* font/devps/generate/symbolchars: Update list to remove duplicates
+	which have already been added to `textmap' on 2007-04-09.
+
+	* font/devps/symbolmap: Regenerated.
+
+	* font/devps/*: Regenerate font definition files.
+
+2010-05-09  Colin Watson  <cjwatson@debian.org>
+
+	Handle ditroff command `Dt' without argument gracefully.
+
+	Without this patch, grotty goes into an infinite loop if it tries to
+	process
+
+	  x T utf8
+	  x res 240 24 40
+	  x init
+	  p1
+	  Dt
+
+	* src/libs/libdriver/input.cpp (get_integer_arg): Emit a fatal error
+	on a non-integer argument, bringing the code into line with the
+	behaviour documented in the header comment.
+	(get_possibly_integer_args): Terminate the loop on a non-integer
+	argument.
+	(next_arg_begin): Return newline or EOF after emitting the
+	corresponding error, rather than continuing on to the next line.
+
+2010-05-01  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Improve documentation of \R escape.
+
+2010-03-10  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Document \n[DD] register.
+	Updated version stuff.
+
+2010-03-10  Larry Kollar  <kollar@windstream.net>
+
+	* tmac/groff_ms.man: Document \n[DD] register.
+	Problem reported by Ted.
+
+2010-02-25  Colin Watson  <cjwatson@debian.org>
+
+	Use named signals for `trap' in shell scripts.
+
+	* contrib/eqn2graph/eqn2graph.sh, contrib/grap2graph/grap2/graph.sh,
+	contrib/pic2graph/pic2graph.sh: Do it.
+
+2010-02-25  Werner LEMBERG  <wl@gnu.org>
+
+	Fix angle brackets in grohtml.
+	Reported by Colin Watson <cjwatson@debian.org>.
+
+	* src/devices/grohtml/post-html.cpp (get_html_entity): Add U+27E8
+	and U+27E9.
+
+2010-02-24  Colin Watson  <cjwatson@debian.org>
+
+	Add new FreeBSD and Posix versions.
+
+	* tmac/doc-common: Add FreeBSD versions 7.2, 7.3, and 8.0
+	* tmac/doc-syms: Add Posix 2008
+	* tmac/groff_mdoc.man: Document it.
+
+2010-02-16  Larry Kollar  <kollar@windstream.net>
+
+	tbl: Add `nowarn' option.
+
+	* src/preproc/tbl/table.h (table): Add `NOWARN' enumeration value.
+
+	* src/preproc/tbl/main.cpp (process_options),
+	src/preprox/tbl/table.cpp (table::compute_expand_width,
+	table::compute_separation_factor): Handle `NOWARN'.
+
+	* src/preproc/tbl/tbl.man, NEWS: Document it.
+
+2010-02-08  Larry Kollar  <kollar@windstream.net>
+
+	* tmac/www.tmac (www-li-ol): Fix indentation if more than 10 items.
+
+2010-02-04  Larry Kollar  <kollar@windstream.net>
+
+	Improve `tbl' warnings.
+
+	* src/preproc/tbl/table.cpp (table::compute_expand_width,
+	table::compute_separation_factor): Add file name strings to
+	warnings.
+
+2010-01-23  Bjarni Ingi Gislason  <bjarniig@rhi.hi.is>
+
+	Fix `MC' macro of the ms package.
+
+	* tmac/s.tmac (@MC): Define `pg*col-top' after the paragraph has
+	been initialized.  Otherwise, using this example,
+
+	  .nh
+	  .nf
+	  .kern 0
+	  .pl 6c
+	  .ll 70n
+	  .MC 30n
+	  Text for multiple columns.
+	  Text for multiple columns.
+	  Text for multiple columns.
+	  Text for multiple columns.
+	  Text for multiple columns.
+
+	the columns start at different vertical positions.
+
+2010-01-23  Larry Kollar  <kollar@alltel.net>
+
+	* tmac/www.tmac (www-li-{ul,ol,dl}): Handle `PORPHANS' register.
+
+2010-01-23  Larry Kollar  <kollar@alltel.net>
+
+	PROBLEMS: Document some Mac OS issues.
+
+2010-01-02  Deri James  <deri@chuzzlewit.demon.co.uk>
+
+	Don't hardcode `ps' device.
+	This is needed for cooperation with gropdf.
+
+	* src/preproc/pic/troff.cpp (troff_output::text): Use GROPS_REG.
+
+2009-12-31  Werner LEMBERG  <wl@gnu.org>
+
+	Make patterns with uppercase letters work.
+	Problem reported by Bjarni Ingi Gislason <bjarniig@rhi.hi.is>.
+
+	* src/roff/troff/input.cpp (init_hpf_code_table): Use `cmlower'.
+	* doc/groff.texinfo, man/groff_diff.man: Update documentation of
+	`hpfcode' request.
+
+2009-11-24  Maurice van der Pot  <griffon26@kfk4ever.com>
+
+	Fix double frees and memory leaks.
+
+	* src/roff/troff/env.cpp (environment::make_tag): Use local object.
+	* src/roff/troff/input.cpp (input_stack::check_end_diversion): Free
+	`diversion_state' here.
+	(interpolate_arg): Fix memory leaks.
+	* src/roff/troff/mtsm.cpp (mtsm::pop_state): Don't free `sp->state'.
+
+2009-11-20  Paulo Ricardo Zanoni  <pzanoni@mandriva.com>
+
+	* */*.cpp: Replace `printf(string);' with `printf("%s", string);'.
+
+2009-10-28  Werner LEMBERG  <wl@gnu.org>
+
+	Document limitations with `#' characters, tbl, and eqn.
+	Problem reported by Michael Kain <mcain6925@comcast.net>.
+
+	* src/preproc/eqn/eqn.man, src/preproc/tbl/tbl.man: Do it.
+
+2009-10-26  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/doc-common (Dx): Define register.
+
+2009-10-26  Jörg Sonnenberger  <joerg@britannica.bec.de>
+
+	Implement `%U' in mdoc for URL references.
+
+	* tmac/doc-common (%U): New register.
+	(Rd): Handle `doc-url-count' and `doc-url-name'.
+
+	* tmac/doc.tmac (doc-url-count, doc-url-name): New registers.
+	(doc-save-global-vars, doc-restore-global-vars, doc-reset-reference,
+	doc-print-reference): Handle `doc-url-count' and `doc-url-name'.
+	(%U): New macro.
+
+	* NEWS, tmac/groff_mdoc.man: Document `%U' macro.
+
+2009-09-09  Jari Aalto  <jari.aalto@cante.net>
+
+	* src/roff/groff/groff.man: Point to troff(1) for `-w' and `-W'.
+
+2009-09-08  Werner LEMBERG  <wl@gnu.org>
+
+	[troff]: Fix hyphenation problem with kerned letters.
+	Problem reported by Steve Izma <sizma@golden.net>.
+
+	* src/roff/troff/node.cpp
+	(kern_pair_node::add_discretionary_hyphen): Compute `tf' using the
+	first node, `n1'.  `n2' might be another kerning node, and the
+	`get_tfont' member function isn't defined then.
+
+2009-09-01  Michael Cain  <mcain6925@comcast.net>
+
+	[pic] Fix a border case for arc computation.
+
+	* src/preproc/pic/object.cpp (object_spec::make_arc): It can happen
+	that test `radius < d' in the loop is satisfied, but the difference
+	in the two values is on the order of 1e-10.  If `radius' is small,
+	doubling the value can lead to a fairly gross error.
+
+	The original code appears to have been intended to deal with the
+	situation when radius is orders of magnitude less than `d'.  The
+	replacement code simply assigns `radius' the smallest value that
+	avoids problems with the floating point code further on in the
+	routine.
+
+2009-08-14  Roger Leigh  <rleigh@debian.org>
+
+	* man/groff_char.man: Fix white heart and diamond unicode values.
+
+2009-07-29  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/hyphen.fr: Fix typo which prevents hyphenation.
+	Reported by Seb <sbb@tuxfamily.org>.
+
+2009-06-25  Werner LEMBERG  <wl@gnu.org>
+
+	Make groff compile on Interix.
+	Reported by Jay Krell <jay.krell@cornell.edu>.
+
+	* configure.ac: Call AC_USE_SYTEM_EXTENSIONS.
+
+	* src/include/lib.h [__INTERIX]: Define _ALL_SOURCE.
+
+	* configure: Regenerated.
+
+2009-05-29  Werner LEMBERG  <wl@gnu.org>
+
+	pic: Fix handling of nested positions.
+	Reported by Doug McIlroy <doug@cs.dartmouth.edu>.
+
+	* src/preproc/pic/pic.y: Split `expr' into `expr_lower_than' and
+	`expr_not_lower_than' so that we can handle
+
+	  (1/3)<(1/2)<foo,bar>,baz>
+
+	correctly.  Without the patch, `(1/3)<(1/2)' is handled prematurely
+	as a comparison.
+
+2009-05-07  Werner LEMBERG  <wl@gnu.org>
+
+	Accept \0 and friends within \o.
+	Reported by Doug McIlroy <doug@cs.dartmouth.edu>.
+
+	* src/roff/troff/token.h (token): Add TOKEN_HORIZONTAL_SPACE
+	enumeration value together with `horizontal_space' member function.
+	Add `do_overstrike' as a friend.
+
+	* src/roff/troff/input.cpp: Use TOKEN_HORIZONTAL_SPACE for \0, \|,
+	\^, and \h.
+	Update all affected places.
+	(do_overstrike): Remove `static' attribute.
+	Accept all escapes which produce a fixed horizontal space.
+
+2009-04-24  Werner LEMBERG  <wl@gnu.org>
+
+	Use straight quotes where appropriate.
+	Reported by Reuben Thomas <rrt@sc3d.org>.
+
+	* man/groff.man: Do it.
+
+2009-04-14  Werner LEMBERG  <wl@gnu.org>
+
+	Fix documentation of `em' request.
+	Reported by Joachim Walsdorff
+	<Joachim.Walsdorff@urz.uni-heidelberg.de>.
+
+	* doc/groff.texinfo (End-of-input Traps): Rewrite.
+
+2009-04-10  Werner LEMBERG  <wl@gnu.org>
+
+	Fix a memory leak in troff for -Thtml.
+	Reported by Urs Eggli <Urs.Eggli@zuerich.ch>.
+
+	* src/roff/troff/node.h (node::~node): Move to...
+	* src/roff/troff/node.cpp: Here.  Free `state' and `push_state'.
+
+2009-04-01  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/doc.tmac: Call `ec' before mapping characters.
+
+2009-03-07  Werner LEMBERG  <wl@gnu.org>
+	    Gunnar Florus  <http://florus.no>
+
+	Improve configuration.
+
+	* configure.ac: Read `VERSION' and `REVISION' files to provide
+	proper values for AC_INIT.
+	* Makefile.in: Use `@datarootdir@' and `@docdir@' so that
+	configure's `--datarootdir' and `--docdir' options are honoured.
+	Documentation is now by default installed into something like
+	`/usr/local/share/doc/groff-1.20.1'.
+
+	* configure: Regenerated.
+
+2009-02-21  Colin Watson  <cjwatson@debian.org>
+	    Werner LEMBERG  <wl@gnu.org>
+
+	Add a new `file' warning category.
+
+	* src/roff/troff/troff.h (warning_type): Add WARN_FILE.
+	* src/roff/troff/input.cpp (DEFAULT_WARNING_MASK): Include
+	WARN_FILE.
+	(warning_table): Add `file' category.
+	(macro_source): Convert error on missing macro file to a
+	warning.
+	* NEWS, doc/groff.texinfo (I/O, Warnings), man/groff_diff.man,
+	src/roff/troff/troff.man: Document new warning category.
+
+2009-02-18  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/groff.texinfo: Improve documentation of `lsm' request.
+
+2009-02-14  Werner LEMBERG  <wl@gnu.org>
+
+	Implement a leading spaces macro request, `lsm', in analogy to
+	`blm'.
+	Implement two new number registers, \n[lsn] and \n[lss], which hold
+	the number of spaces and the horizontal space, respectively, which
+	would be inserted if the macro registered by `lsm' wasn't called.
+
+	* src/roff/troff/input.cpp (leading_spaces_macro_name,
+	leading_spaces_number, leading_spaces_space): New global
+	variables.
+	(leading_spaces_macro): New function.
+	(process_input_stack) <token::TOKEN_SPACE>: Handle `lsm'.
+	(init_input_requests): Register `lsm', \n[lsn], and \n[lss].
+
+	* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo
+	(Leading Spaces Traps): Document new requests and registers.
+
+2009-02-10  Denis M. Wilson  <dmw@oxytropis.plus.com>
+
+	* man/groff.man: Document missing number registers (`$$', `.b',
+	`.F', `.j', `.k', `.L', `.O', `.P', `.R', `opmaxx', `opmaxy',
+	`opminx', `opminy').
+
+	* doc/groff.texinfo: Document missing `.R' register.
+	Add `.U' to register index.
+
+2009-01-19  Werner LEMBERG  <wl@gnu.org>
+
+	Fix incorrect grops color state before \X'...'.
+	Problem reported by Miklos Somogyi <msom@netspace.net.au>.
+
+	* src/devices/grops/ps.cpp (ps_printer::special): Check color state
+	before doing a PS special and flush buffer.
+	Update called functions.
+
+2009-01-09  Werner LEMBERG  <wl@gnu.org>
 
 Version 1.20.1 released
 =======================
@@ -13,7 +788,7 @@
 
 
 	`gnu.eps' was missing in the tarball.
-	Problem reported by Patrik Gräser.
+	Problem reported by Patrik Gräser.
 
 	(PROCESSEDEXAMPLEFILES): Remove `gnu.eps'.
 	(MOSTLYCLEANNOTSRCDIRADD): Fix names of info files.
@@ -351,7 +1126,7 @@
 2008-10-03  Werner LEMBERG  <wl@gnu.org>
 
 	* src/devices/grops/grops.man, src/roff/troff/troff.man,
-	src/preproc/soelim/soelim.man: Correct documentation of -I switch. 
+	src/preproc/soelim/soelim.man: Correct documentation of -I switch.
 	Reported by Larry Kollar.
 	Other minor formatting issues.
 
@@ -416,7 +1191,7 @@
 
 2008-09-28  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-	* contrib/pic2graph, contrib/pic2graph.man, contrib/eqn2graph, 
+	* contrib/pic2graph, contrib/pic2graph.man, contrib/eqn2graph,
 	contrib/eqn2graph.man: Tweak scripts to cope with incompatible
 	changes in ImageMagick crop options.  Document the bugs.
 
@@ -479,7 +1254,7 @@
 
 	* src/preproc/tbl/tbl.man: Document computation of element widths.
 
-2008-08-20  Alexey Gladkov  <legion@altlinux.ru> 
+2008-08-20  Alexey Gladkov  <legion@altlinux.ru>
 	    Werner LEMBERG  <wl@gnu.org>
 
 	Add default encoding option -D to preconv and groff.
@@ -542,7 +1317,7 @@
 2008-04-05  Dorai Sitaram  <ds26gte@yahoo.com>
 
 	Add better support for `.TAG #<label>' in non-HTML documents: In
-	case of a forward reference in a call to .URL, write `(see below)'. 
+	case of a forward reference in a call to .URL, write `(see below)'.
 	In case of a backwards reference use the page number instead.  The
 	reference gets stored in a string `TAG_<label>' and can be
 	overridden while calling `.TAG' with its new optional argument --
@@ -557,11 +1332,11 @@
 
 	* tmac/trace.tmac (so, mso): Added.
 
-	* tmac/www.tmac (PIMG): Replace `.ie' (without `.el') with `.if'. 
+	* tmac/www.tmac (PIMG): Replace `.ie' (without `.el') with `.if'.
 	If used with -mtrace, and this clause was active, the macro was
 	executed twice.
 
-	* tmac/pspic.tmac (PSPIC): Accept option `-C' for orthogonality. 
+	* tmac/pspic.tmac (PSPIC): Accept option `-C' for orthogonality.
 	This makes `.PIMG -C <file>' (from www.tmac) work on non-HTML
 	devices.
 	* man/groff_tmac.man: Document it.
@@ -724,7 +1499,7 @@
 2007-11-08  Werner LEMBERG  <wl@gnu.org>
 
 	* src/preproc/preconv/preconv.cpp (emacs_to_mime): Add `utf-16be',
-	`utf-16le', `utf-16be-with-signature', `utf-16le-with-signature'. 
+	`utf-16le', `utf-16be-with-signature', `utf-16le-with-signature'.
 	(is_comment_line): Handle '\" and '\# also.
 
 	* src/preproc/preconv/preconv.man: Revise and make complete.
@@ -824,7 +1599,7 @@
 
 	* src/devices/grohtml/post-html.cpp: Modify header tags to be XHTML
 	compliant.
-	(valid_flag, groff_sig, dialect): New global variables. 
+	(valid_flag, groff_sig, dialect): New global variables.
 	(html_printer::handle_valid_flag, html_printer::do_math,
 	html_printer::write_html_anchor, html_printer::write_xhtml_anchor,
 	html_printer::do_math, html_printer::handle_valid_flag): New
@@ -968,7 +1743,7 @@
 
 2007-07-05  Werner LEMBERG  <wl@gnu.org>
 
-	* tmac/papersize.tmac: Fix dimensions of executive paper format. 
+	* tmac/papersize.tmac: Fix dimensions of executive paper format.
 	Reported by John Rupley <rupley@u.arizona.edu>.
 
 2007-07-02  Keith Marshall  <keith.d.marshall@ntlworld.com>
@@ -1195,7 +1970,7 @@
 	likely to do something surprising.
 	
 	* man/groff_out.man: We can simplify the command macros still
-	further if we stop trying to hide structural requests inside them. 
+	further if we stop trying to hide structural requests inside them.
 	Also, fix some instances of \} at start of line without a dot, and
 	make some font changes explicit in strings.
 	
@@ -1276,16 +2051,16 @@
 
 2007-02-03  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-	* tmac/groff_man.man: Documented the extension macros, and 
+	* tmac/groff_man.man: Documented the extension macros, and
 	added portability advice.
 
 	* MORE.STUFF: More-stuff entries for doclifter and pic2plot.
 
 
-	Add support for MathML output to eqn.  
+	Add support for MathML output to eqn.
 
 	The strategy used is very simple and relies on the fact that the box
-	models of eqn and Presentation MathML differ in only trivial ways. 
+	models of eqn and Presentation MathML differ in only trivial ways.
 	It leaves the grammar and existing internal object structures
 	unchanged.  A new global, `output_format', is defined as an
 	enumerated type with values {troff, mathml}.  Most of the functions
@@ -1338,7 +2113,7 @@
 
 	REMAINING ISSUES:
 
-	The entirety of eqn is translated when `-TMathML' is specified, 
+	The entirety of eqn is translated when `-TMathML' is specified,
 	with the following exceptions...
 
 	Limitations that cannot be fixed include non-support for special,
@@ -1349,16 +2124,16 @@
 	at all it's going to be in a very complicated and nasty way.
 
 	The way character boxes are output means that each digit of a
-	multi-digit number gets its own <mn></mn> tag pair in the MathHTML. 
+	multi-digit number gets its own <mn></mn> tag pair in the MathHTML.
 	While this is not technically wrong for Presentation MathML, it is
 	ugly and inefficient.  Fixing this will require implementing a
 	little state machine in the `text.cpp' output method.
 
-	* src/preproc/eqn/box.cpp, src/preproc/eqn/delim.cpp, 
-	src/preproc/eqn/eqn.h, src/preproc/eqn/eqn.man, 
+	* src/preproc/eqn/box.cpp, src/preproc/eqn/delim.cpp,
+	src/preproc/eqn/eqn.h, src/preproc/eqn/eqn.man,
 	src/preproc/eqn/lex.cpp, src/preproc/eqn/limit.cpp,
-	src/preproc/eqn/list.cpp, src/preproc/eqn/main.cpp, 
-	src/preproc/eqn/other.cpp, src/preproc/eqn/over.cpp, 
+	src/preproc/eqn/list.cpp, src/preproc/eqn/main.cpp,
+	src/preproc/eqn/other.cpp, src/preproc/eqn/over.cpp,
 	src/preproc/eqn/pile.cpp, src/preproc/eqn/script.cpp,
 	src/preproc/eqn/sqrt.cpp, src/preproc/eqn/text.cpp,
 	src/preproc/eqn/eqn.man: MathML output mode.
@@ -1368,7 +2143,7 @@
 2007-02-02  Eric S. Raymond  <esr@snark.thyrsus.com>
 
 	* src/roff/groff/groff.man: Converted to use .SY/.OP/.YS
-	and for cross-viewer portability.  Conversion checked 
+	and for cross-viewer portability.  Conversion checked
 	using the protocol described in tmac/TESTING-HINTS.
 
 2007-02-02  Werner LEMBERG  <wl@gnu.org>
@@ -1620,7 +2395,7 @@
 
 	* INSTALL.gen: Extend the file by information on `external
 	installation'.  Reorder the installation instruction as `normal
-	installation'. 
+	installation'.
 
 2006-11-08  Werner LEMBERG  <wl@gnu.org>
 
@@ -2917,7 +3692,7 @@
 
 2005-12-09  Werner LEMBERG  <wl@gnu.org>
 
-	* src/libs/libgroff/make-uniuni: New script to generate uniuni.cpp. 
+	* src/libs/libgroff/make-uniuni: New script to generate uniuni.cpp.
 
 	* src/libs/libgroff/uniuni.cpp: Regenerated, using data from Unicode
 	4.1.0.
@@ -8264,7 +9039,7 @@
 
 	* REVISION: Increased to 2.
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
diff -ruN groff-1.20.1/config.guess groff-1.21/config.guess
--- groff-1.20.1/config.guess	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/config.guess	2010-12-31 08:33:08.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2008-12-19'
+timestamp='2010-09-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -91,7 +92,7 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -105,7 +106,7 @@
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -170,7 +171,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -324,12 +325,18 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -545,7 +552,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -653,7 +660,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -804,12 +811,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -819,6 +826,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -848,6 +858,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -870,6 +894,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -879,78 +914,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -959,8 +950,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -974,6 +968,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -983,66 +980,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1071,7 +1008,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1115,8 +1052,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1176,7 +1116,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1269,6 +1209,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1284,6 +1234,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1350,6 +1303,9 @@
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff -ruN groff-1.20.1/config.sub groff-1.21/config.sub
--- groff-1.20.1/config.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/config.sub	2010-12-31 08:33:08.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2008-12-11'
+timestamp='2010-12-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,8 +124,10 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -148,10 +154,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -271,28 +280,41 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -323,7 +345,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -335,7 +357,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -357,21 +379,24 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -445,6 +470,10 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -461,6 +490,19 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -497,7 +539,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -713,6 +755,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -817,6 +862,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+        neo-tandem)
+		basic_machine=neo-tandem
+		;;
+        nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1051,17 +1102,10 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1234,6 +1278,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1254,10 +1301,11 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1268,7 +1316,8 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1276,7 +1325,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1409,6 +1458,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1449,6 +1500,15 @@
         c4x-* | tic4x-*)
         	os=-coff
 		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1606,7 +1666,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff -ruN groff-1.20.1/configure groff-1.21/configure
--- groff-1.20.1/configure	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/configure	2010-12-31 08:33:20.000000000 +0100
@@ -1,18 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
+# Generated by GNU Autoconf 2.67 for groff 1.21.
+#
+# Report bugs to <bug-groff@gnu.org>.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -44,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -94,15 +91,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -114,12 +111,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -131,330 +132,300 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and bug-groff@gnu.org
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
-exitcode=0
-if as_func_success; then
-  :
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
 
-if as_func_ret_success; then
-  :
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -471,8 +442,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -482,29 +452,18 @@
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -534,7 +493,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -553,10 +512,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -570,11 +529,11 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -589,14 +548,14 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='groff'
+PACKAGE_TARNAME='groff-1.21'
+PACKAGE_VERSION='1.21'
+PACKAGE_STRING='groff 1.21'
+PACKAGE_BUGREPORT='bug-groff@gnu.org'
+PACKAGE_URL=''
 
 ac_unique_file="src/roff/groff/groff.cpp"
 # Factoring default headers for most tests.
@@ -635,6 +594,7 @@
 # include <unistd.h>
 #endif"
 
+ac_header_list=
 ac_subst_vars='LTLIBOBJS
 GLIBC21
 pnmtops_nosetpage
@@ -683,8 +643,6 @@
 MAKEINFO
 YACC
 PERLPATH
-EGREP
-GREP
 DVIPRINT
 PSPRINT
 LPQ
@@ -698,13 +656,15 @@
 X_LIBS
 X_PRE_LIBS
 X_CFLAGS
-CPP
 XMKMF
 OTHERDEVDIRS
 TTYDEVDIRS
 ac_ct_CXX
 CXXFLAGS
 CXX
+EGREP
+GREP
+CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -742,6 +702,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -770,11 +731,11 @@
 LDFLAGS
 LIBS
 CPPFLAGS
+CPP
 CXX
 CXXFLAGS
 CCC
-XMKMF
-CPP'
+XMKMF'
 
 
 # Initialize some variables set by options.
@@ -815,7 +776,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -837,8 +798,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -883,8 +845,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -910,8 +871,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1115,8 +1075,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1132,8 +1091,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1163,17 +1121,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1190,15 +1148,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1221,8 +1177,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1236,8 +1191,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1252,11 +1207,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1295,13 +1248,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1327,7 +1278,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures groff 1.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1341,7 +1292,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1375,7 +1326,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/groff-1.21]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1395,7 +1346,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of groff 1.21:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1423,16 +1376,17 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   XMKMF       Path to xmkmf, Makefile generator for X Window System
-  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <bug-groff@gnu.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1495,383 +1449,2151 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.63
+groff configure 1.21
+generated by GNU Autoconf 2.67
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
 
-  $ $0 $@
+} # ac_fn_c_try_compile
 
-_ACEOF
-exec 5>>config.log
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
 {
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
 
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+} # ac_fn_c_try_cpp
 
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-_ASUNAME
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## -------------------------------- ##
+## Report this to bug-groff@gnu.org ##
+## -------------------------------- ##"[]
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
-} >&5
+} # ac_fn_c_check_header_mongrel
 
-cat >&5 <<_ACEOF
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
 
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+} # ac_fn_c_try_run
 
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
+} # ac_fn_c_check_header_compile
 
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
 
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
+} # ac_fn_cxx_try_compile
 
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by groff $as_me 1.21, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"[]
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"[]
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"[]
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"[]
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_config_headers="$ac_config_headers src/include/config.h:src/include/config.hin"
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
     fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
     fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
 
-# Predefined preprocessor variables.
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
 
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+fi
 
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
 
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_cv_header_stdc=no
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
+rm -f conftest*
 
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
 fi
 
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
+fi
 
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
 
 
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
 
 
+  if test "$MINIX" = yes; then
 
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 
+$as_echo "#define _MINIX 1" >>confdefs.h
 
+  fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-ac_config_headers="$ac_config_headers src/include/config.h:src/include/config.hin"
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
 
@@ -1884,9 +3606,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -1897,24 +3619,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -1924,9 +3646,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -1937,24 +3659,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -1963,7 +3685,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -1977,9 +3699,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -1990,24 +3712,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2017,9 +3739,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2031,18 +3753,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2061,10 +3783,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2076,9 +3798,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2089,24 +3811,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2120,366 +3842,96 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
 
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  test -n "$ac_ct_CC" && break
+done
 
-int
-main ()
-{
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
 
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2493,37 +3945,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -2532,20 +3963,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2556,35 +3983,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2595,36 +3998,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2635,42 +4014,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2687,18 +4041,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -2755,32 +4105,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -2791,17 +4118,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2823,9 +4152,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -2836,24 +4165,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2867,9 +4196,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -2880,24 +4209,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2910,7 +4239,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2921,53 +4250,36 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2981,37 +4293,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -3020,20 +4311,16 @@
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3044,35 +4331,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3083,36 +4346,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3123,42 +4362,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -3190,21 +4404,17 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    if test "$cross_compiling" = no; then
-     { $as_echo "$as_me:$LINENO: checking that C++ compiler can compile simple program" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking that C++ compiler can compile simple program" >&5
 $as_echo_n "checking that C++ compiler can compile simple program... " >&6; }
    fi
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 int main() {
   return 0;
 }
@@ -3212,64 +4422,31 @@
 
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      { { $as_echo "$as_me:$LINENO: error: a working C++ compiler is required" >&5
-$as_echo "$as_me: error: a working C++ compiler is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "a working C++ compiler is required" "$LINENO" 5
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-
    if test "$cross_compiling" = no; then
-     { $as_echo "$as_me:$LINENO: checking that C++ static constructors and destructors are called" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking that C++ static constructors and destructors are called" >&5
 $as_echo_n "checking that C++ static constructors and destructors are called... " >&6; }
    fi
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 extern "C" {
   void _exit(int);
 }
@@ -3291,59 +4468,26 @@
 
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      { { $as_echo "$as_me:$LINENO: error: a working C++ compiler is required" >&5
-$as_echo "$as_me: error: a working C++ compiler is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "a working C++ compiler is required" "$LINENO" 5
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-
-   { $as_echo "$as_me:$LINENO: checking that header files support C++" >&5
-$as_echo_n "checking that header files support C++... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking that header files support C++" >&5
+$as_echo_n "checking that header files support C++... " >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 
 
@@ -3360,65 +4504,31 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      { { $as_echo "$as_me:$LINENO: error: header files do not support C++
-		   (if you are using a version of gcc/g++ earlier than 2.5,
-		   you should install libg++)" >&5
-$as_echo "$as_me: error: header files do not support C++
+      as_fn_error $? "header files do not support C++
 		   (if you are using a version of gcc/g++ earlier than 2.5,
-		   you should install libg++)" >&2;}
-   { (exit 1); exit 1; }; }
+		   you should install libg++)" "$LINENO" 5
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
-{ $as_echo "$as_me:$LINENO: checking whether character set is EBCDIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether character set is EBCDIC" >&5
 $as_echo_n "checking whether character set is EBCDIC... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 /* Treat any failure as ASCII for compatibility with existing art.
    Use compile-time rather than run-time tests for cross-compiler
    tolerance. */
@@ -3436,303 +4546,43 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   groff_cv_ebcdic="yes"
       TTYDEVDIRS="font/devcp1047"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define IS_EBCDIC_HOST 1
-_ACEOF
+$as_echo "#define IS_EBCDIC_HOST 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_ebcdic="no"
+  groff_cv_ebcdic="no"
      TTYDEVDIRS="font/devascii font/devlatin1"
      OTHERDEVDIRS="font/devlj4 font/devlbp"
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 if test "$groff_cv_ebcdic" = "yes"; then
-     { $as_echo "$as_me:$LINENO: checking for OS/390 Unix" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OS/390 Unix" >&5
 $as_echo_n "checking for OS/390 Unix... " >&6; }
      case `uname` in
      OS/390)
        CFLAGS="$CFLAGS -D_ALL_SOURCE"
-       { $as_echo "$as_me:$LINENO: result: yes" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; } ;;
      *)
-       { $as_echo "$as_me:$LINENO: result: no" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; } ;;
      esac
    fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:$LINENO: checking for X" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
-if test "${with_x+set}" = set; then
+if test "${with_x+set}" = set; then :
   withval=$with_x;
 fi
 
@@ -3742,10 +4592,8 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
-   { (exit 1); exit 1; }; };; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -3762,7 +4610,7 @@
 	@echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
@@ -3793,21 +4641,25 @@
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
@@ -3829,37 +4681,14 @@
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
@@ -3867,8 +4696,7 @@
   fi
 done
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -3877,11 +4705,7 @@
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lX11 $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -3892,35 +4716,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	LIBS=$ac_save_LIBS
+  LIBS=$ac_save_LIBS
 for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
@@ -3932,10 +4733,8 @@
   done
 done
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
 case $ac_x_includes,$ac_x_libraries in #(
@@ -3956,7 +4755,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
 $as_echo "$have_x" >&6; }
   no_x=yes
 else
@@ -3967,16 +4766,14 @@
   ac_cv_have_x="have_x=yes\
 	ac_x_includes='$x_includes'\
 	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
@@ -3989,16 +4786,12 @@
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
 $as_echo_n "checking whether -R must be followed by a space... " >&6; }
     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
     ac_xsave_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4009,90 +4802,36 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        X_LIBS="$X_LIBS -R$x_libraries"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	  X_LIBS="$X_LIBS -R $x_libraries"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
 $as_echo "neither works" >&6; }
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     ac_c_werror_flag=$ac_xsave_c_werror_flag
     LIBS=$ac_xsave_LIBS
   fi
@@ -4108,11 +4847,7 @@
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4130,44 +4865,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
-	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4185,59 +4893,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_dnet_ntoa=no
+  ac_cv_lib_dnet_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4255,52 +4934,25 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_stub_dnet_ntoa=no
+  ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -4311,105 +4963,20 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
-$as_echo_n "checking for gethostbyname... " >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostbyname
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_gethostbyname=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 
-	ac_cv_func_gethostbyname=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
     if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4427,59 +4994,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyname=no
+  ac_cv_lib_nsl_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4497,43 +5035,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bsd_gethostbyname=no
+  ac_cv_lib_bsd_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -4546,193 +5059,22 @@
     # on later versions), says Simon Leinen: it contains gethostby*
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef connect
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_connect=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_connect=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
-
-    if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_socket_connect=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_connect=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+    # if connect needs -lnsl, so does gethostbyname.
+    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+fi
 
-#undef remove
+    if test $ac_cv_func_connect = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -4740,71 +5082,47 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
-
+char connect ();
 int
 main ()
 {
-return remove ();
+return connect ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_connect=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_remove=no
+  ac_cv_lib_socket_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+fi
+
+    fi
+
+    # Guillermo Gomez says -lposix is necessary on A/UX.
+    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
 
     if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
 $as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4822,148 +5140,38 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_posix_remove=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_posix_remove=no
+  ac_cv_lib_posix_remove=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shmat
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shmat=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shmat=no
-fi
+    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
 
     if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
 $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4981,43 +5189,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ipc_shmat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ipc_shmat=no
+  ac_cv_lib_ipc_shmat=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -5033,18 +5216,14 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5062,43 +5241,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ICE_IceConnectionNumber=no
+  ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -5117,17 +5271,13 @@
      LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
      LIBS="$LIBS -lXaw"
-     { $as_echo "$as_me:$LINENO: checking for Xaw library and header files" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xaw library and header files" >&5
 $as_echo_n "checking for Xaw library and header files... " >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
-
-	 /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <X11/Intrinsic.h>
 #include <X11/Xaw/Simple.h>
 
@@ -5141,54 +5291,25 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	groff_no_x="yes"
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
      LIBS="$LIBS -lXmu"
-     { $as_echo "$as_me:$LINENO: checking for Xmu library and header files" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xmu library and header files" >&5
 $as_echo_n "checking for Xmu library and header files... " >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
-
-	 /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <X11/Intrinsic.h>
 #include <X11/Xmu/Converters.h>
 
@@ -5202,41 +5323,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	groff_no_x="yes"
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
      CFLAGS=$OLDCFLAGS
      LDFLAGS=$OLDLDFLAGS
@@ -5244,7 +5340,7 @@
    fi
 
    if test "x$groff_no_x" = "xyes"; then
-     { $as_echo "$as_me:$LINENO: gxditview and xtotroff won't be built" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: gxditview and xtotroff won't be built" >&5
 $as_echo "$as_me: gxditview and xtotroff won't be built" >&6;}
    else
      XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
@@ -5257,7 +5353,7 @@
 
 
 # Check whether --with-appresdir was given.
-if test "${with_appresdir+set}" = set; then
+if test "${with_appresdir+set}" = set; then :
   withval=$with_appresdir;
 fi
 
@@ -5355,9 +5451,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LPR+set}" = set; then
+if test "${ac_cv_prog_LPR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LPR"; then
@@ -5368,24 +5464,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LPR="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LPR=$ac_cv_prog_LPR
 if test -n "$LPR"; then
-  { $as_echo "$as_me:$LINENO: result: $LPR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LPR" >&5
 $as_echo "$LPR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5397,9 +5493,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LP+set}" = set; then
+if test "${ac_cv_prog_LP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LP"; then
@@ -5410,24 +5506,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LP="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LP=$ac_cv_prog_LP
 if test -n "$LP"; then
-  { $as_echo "$as_me:$LINENO: result: $LP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LP" >&5
 $as_echo "$LP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5443,9 +5539,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LPQ+set}" = set; then
+if test "${ac_cv_prog_LPQ+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LPQ"; then
@@ -5456,24 +5552,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LPQ="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LPQ=$ac_cv_prog_LPQ
 if test -n "$LPQ"; then
-  { $as_echo "$as_me:$LINENO: result: $LPQ" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LPQ" >&5
 $as_echo "$LPQ" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5490,13 +5586,13 @@
      fi
    fi
 
-   { $as_echo "$as_me:$LINENO: checking for command to use for printing PostScript files" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for command to use for printing PostScript files" >&5
 $as_echo_n "checking for command to use for printing PostScript files... " >&6; }
-   { $as_echo "$as_me:$LINENO: result: $PSPRINT" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PSPRINT" >&5
 $as_echo "$PSPRINT" >&6; }
 
    # Figure out DVIPRINT from PSPRINT.
-   { $as_echo "$as_me:$LINENO: checking for command to use for printing dvi files" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for command to use for printing dvi files" >&5
 $as_echo_n "checking for command to use for printing dvi files... " >&6; }
    if test -n "$PSPRINT" && test -z "$DVIPRINT"; then
      if test "x$PSPRINT" = "xlpr"; then
@@ -5506,76 +5602,11 @@
      fi
    fi
 
-   { $as_echo "$as_me:$LINENO: result: $DVIPRINT" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DVIPRINT" >&5
 $as_echo "$DVIPRINT" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5589,7 +5620,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -5609,7 +5640,7 @@
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5624,12 +5655,10 @@
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5637,16 +5666,16 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERLPATH+set}" = set; then
+if test "${ac_cv_path_PERLPATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERLPATH in
@@ -5659,14 +5688,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERLPATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PERLPATH" && ac_cv_path_PERLPATH="/usr/bin/perl"
@@ -5675,10 +5704,10 @@
 fi
 PERLPATH=$ac_cv_path_PERLPATH
 if test -n "$PERLPATH"; then
-  { $as_echo "$as_me:$LINENO: result: $PERLPATH" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERLPATH" >&5
 $as_echo "$PERLPATH" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5687,9 +5716,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then
+if test "${ac_cv_prog_YACC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -5700,24 +5729,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
 $as_echo "$YACC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5729,9 +5758,9 @@
 missing=
    # Extract the first word of "makeinfo", so it can be a program name with args.
 set dummy makeinfo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MAKEINFO"; then
@@ -5742,24 +5771,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MAKEINFO="makeinfo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 MAKEINFO=$ac_cv_prog_MAKEINFO
 if test -n "$MAKEINFO"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
 $as_echo "$MAKEINFO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5767,12 +5796,12 @@
    if test -z "$MAKEINFO"; then
      missing="\`makeinfo' is missing."
    else
-     { $as_echo "$as_me:$LINENO: checking for makeinfo version" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for makeinfo version" >&5
 $as_echo_n "checking for makeinfo version... " >&6; }
      # We need an additional level of quoting to make sed's regexps work.
      makeinfo_version=`$MAKEINFO --version 2>&1 \
        | sed -e 's/^.* \([^ ][^ ]*\)$/\1/' -e '1q'`
-     { $as_echo "$as_me:$LINENO: result: $makeinfo_version" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $makeinfo_version" >&5
 $as_echo "$makeinfo_version" >&6; }
      # Consider only the first two numbers in version number string.
      makeinfo_version_major=`IFS=.; set x $makeinfo_version; echo 0${2}`
@@ -5789,13 +5818,10 @@
      test -f ${infofile} || infofile=${srcdir}/${infofile}
      if test ! -f ${infofile} \
 	|| test ${srcdir}/doc/groff.texinfo -nt ${infofile}; then
-       { { $as_echo "$as_me:$LINENO: error: $missing
-Get the \`texinfo' package version 4.8 or newer." >&5
-$as_echo "$as_me: error: $missing
-Get the \`texinfo' package version 4.8 or newer." >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error $? "$missing
+Get the \`texinfo' package version 4.8 or newer." "$LINENO" 5
      else
-       { $as_echo "$as_me:$LINENO: WARNING: $missing
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $missing
 Get the \`texinfo' package version 4.8 or newer if you want to convert
 \`groff.texinfo' into a PDF or HTML document." >&5
 $as_echo "$as_me: WARNING: $missing
@@ -5807,9 +5833,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5820,24 +5846,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5847,9 +5873,9 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -5860,24 +5886,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5886,7 +5912,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5913,9 +5939,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -5934,9 +5958,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_INSTALL_INFO+set}" = set; then
+if test "${ac_cv_prog_INSTALL_INFO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$INSTALL_INFO"; then
@@ -5947,24 +5971,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_INSTALL_INFO="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 INSTALL_INFO=$ac_cv_prog_INSTALL_INFO
 if test -n "$INSTALL_INFO"; then
-  { $as_echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL_INFO" >&5
 $as_echo "$INSTALL_INFO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5987,10 +6011,10 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5998,11 +6022,11 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -6039,7 +6063,7 @@
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -6055,7 +6079,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -6066,21 +6090,21 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 
 # use a dummy substitution if no csh hack is necessary to avoid errors
 # with non-GNU sed programs
-{ $as_echo "$as_me:$LINENO: checking for csh hash hack" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for csh hash hack" >&5
 $as_echo_n "checking for csh hash hack... " >&6; }
 
 cat <<EOF >conftest.sh
@@ -6092,11 +6116,11 @@
 
    chmod +x conftest.sh
    if echo ./conftest.sh | (csh >/dev/null 2>&1) >/dev/null 2>&1; then
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
      SH_SCRIPT_SED_CMD='1s/.*/:/'
    else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
      SH_SCRIPT_SED_CMD='1s/a/a/'
    fi
@@ -6104,407 +6128,12 @@
 
 
 # checks for headers
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_header in stddef.h stdlib.h unistd.h dirent.h limits.h sys/dir.h \
                   string.h strings.h math.h sys/time.h direct.h process.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6513,22 +6142,20 @@
 
 done
 
-{ $as_echo "$as_me:$LINENO: checking for ISC 3.x or 4.x" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ISC 3.x or 4.x" >&5
 $as_echo_n "checking for ISC 3.x or 4.x... " >&6; }
    if grep '[34]\.' /usr/options/cb.name >/dev/null 2>&1
    then
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define _SYSV3 1
-_ACEOF
+$as_echo "#define _SYSV3 1" >>confdefs.h
 
    else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
    fi
-{ $as_echo "$as_me:$LINENO: checking whether -D_POSIX_SOURCE is necessary" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -D_POSIX_SOURCE is necessary" >&5
 $as_echo_n "checking whether -D_POSIX_SOURCE is necessary... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -6536,15 +6163,11 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 extern "C" { void fileno(int); }
 
@@ -6558,39 +6181,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_SOURCE 1
-_ACEOF
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6606,17 +6206,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking for return type of srand" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for return type of srand" >&5
 $as_echo_n "checking for return type of srand... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdlib.h>
 extern "C" { void srand(unsigned int); }
 
@@ -6630,39 +6226,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: void" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: void" >&5
 $as_echo "void" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define RET_TYPE_SRAND_IS_VOID 1
-_ACEOF
+$as_echo "#define RET_TYPE_SRAND_IS_VOID 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: int" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5
 $as_echo "int" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6670,7 +6243,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether gettimeofday must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday must be declared" >&5
 $as_echo_n "checking whether gettimeofday must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -6678,18 +6251,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_gettimeofday+set}" = set; then
+   if test "${groff_cv_decl_needed_gettimeofday+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -6726,42 +6295,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_gettimeofday=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_gettimeofday=yes
+  groff_cv_decl_needed_gettimeofday=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_gettimeofday" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_gettimeofday" >&5
 $as_echo "$groff_cv_decl_needed_gettimeofday" >&6; }
    if test $groff_cv_decl_needed_gettimeofday = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_GETTIMEOFDAY 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_GETTIMEOFDAY 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -6770,7 +6316,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether hypot must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hypot must be declared" >&5
 $as_echo_n "checking whether hypot must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -6778,18 +6324,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_hypot+set}" = set; then
+   if test "${groff_cv_decl_needed_hypot+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -6826,42 +6368,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_hypot=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_hypot=yes
+  groff_cv_decl_needed_hypot=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_hypot" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_hypot" >&5
 $as_echo "$groff_cv_decl_needed_hypot" >&6; }
    if test $groff_cv_decl_needed_hypot = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_HYPOT 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_HYPOT 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -6870,7 +6389,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether popen must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether popen must be declared" >&5
 $as_echo_n "checking whether popen must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -6878,18 +6397,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_popen+set}" = set; then
+   if test "${groff_cv_decl_needed_popen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -6926,42 +6441,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_popen=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_popen=yes
+  groff_cv_decl_needed_popen=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_popen" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_popen" >&5
 $as_echo "$groff_cv_decl_needed_popen" >&6; }
    if test $groff_cv_decl_needed_popen = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_POPEN 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_POPEN 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -6970,7 +6462,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether pclose must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pclose must be declared" >&5
 $as_echo_n "checking whether pclose must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -6978,18 +6470,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_pclose+set}" = set; then
+   if test "${groff_cv_decl_needed_pclose+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7026,42 +6514,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_pclose=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_pclose=yes
+  groff_cv_decl_needed_pclose=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_pclose" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_pclose" >&5
 $as_echo "$groff_cv_decl_needed_pclose" >&6; }
    if test $groff_cv_decl_needed_pclose = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_PCLOSE 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_PCLOSE 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7070,7 +6535,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether putenv must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether putenv must be declared" >&5
 $as_echo_n "checking whether putenv must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7078,18 +6543,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_putenv+set}" = set; then
+   if test "${groff_cv_decl_needed_putenv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7126,42 +6587,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_putenv=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_putenv=yes
+  groff_cv_decl_needed_putenv=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_putenv" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_putenv" >&5
 $as_echo "$groff_cv_decl_needed_putenv" >&6; }
    if test $groff_cv_decl_needed_putenv = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_PUTENV 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_PUTENV 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7170,7 +6608,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether rand must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rand must be declared" >&5
 $as_echo_n "checking whether rand must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7178,18 +6616,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_rand+set}" = set; then
+   if test "${groff_cv_decl_needed_rand+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7226,42 +6660,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_rand=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_rand=yes
+  groff_cv_decl_needed_rand=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_rand" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_rand" >&5
 $as_echo "$groff_cv_decl_needed_rand" >&6; }
    if test $groff_cv_decl_needed_rand = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_RAND 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_RAND 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7270,7 +6681,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether snprintf must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf must be declared" >&5
 $as_echo_n "checking whether snprintf must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7278,18 +6689,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_snprintf+set}" = set; then
+   if test "${groff_cv_decl_needed_snprintf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7326,42 +6733,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_snprintf=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_snprintf=yes
+  groff_cv_decl_needed_snprintf=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_snprintf" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_snprintf" >&5
 $as_echo "$groff_cv_decl_needed_snprintf" >&6; }
    if test $groff_cv_decl_needed_snprintf = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_SNPRINTF 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_SNPRINTF 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7370,7 +6754,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether srand must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether srand must be declared" >&5
 $as_echo_n "checking whether srand must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7378,18 +6762,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_srand+set}" = set; then
+   if test "${groff_cv_decl_needed_srand+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7426,42 +6806,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_srand=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_srand=yes
+  groff_cv_decl_needed_srand=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_srand" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_srand" >&5
 $as_echo "$groff_cv_decl_needed_srand" >&6; }
    if test $groff_cv_decl_needed_srand = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_SRAND 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_SRAND 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7470,7 +6827,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether strcasecmp must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strcasecmp must be declared" >&5
 $as_echo_n "checking whether strcasecmp must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7478,18 +6835,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_strcasecmp+set}" = set; then
+   if test "${groff_cv_decl_needed_strcasecmp+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7526,42 +6879,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_strcasecmp=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_strcasecmp=yes
+  groff_cv_decl_needed_strcasecmp=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_strcasecmp" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_strcasecmp" >&5
 $as_echo "$groff_cv_decl_needed_strcasecmp" >&6; }
    if test $groff_cv_decl_needed_strcasecmp = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_STRCASECMP 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_STRCASECMP 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7570,7 +6900,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether strncasecmp must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strncasecmp must be declared" >&5
 $as_echo_n "checking whether strncasecmp must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7578,18 +6908,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_strncasecmp+set}" = set; then
+   if test "${groff_cv_decl_needed_strncasecmp+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7626,42 +6952,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_strncasecmp=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_strncasecmp=yes
+  groff_cv_decl_needed_strncasecmp=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_strncasecmp" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_strncasecmp" >&5
 $as_echo "$groff_cv_decl_needed_strncasecmp" >&6; }
    if test $groff_cv_decl_needed_strncasecmp = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_STRNCASECMP 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_STRNCASECMP 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7670,7 +6973,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether vfprintf must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vfprintf must be declared" >&5
 $as_echo_n "checking whether vfprintf must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7678,18 +6981,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_vfprintf+set}" = set; then
+   if test "${groff_cv_decl_needed_vfprintf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7726,42 +7025,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_vfprintf=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_vfprintf=yes
+  groff_cv_decl_needed_vfprintf=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_vfprintf" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_vfprintf" >&5
 $as_echo "$groff_cv_decl_needed_vfprintf" >&6; }
    if test $groff_cv_decl_needed_vfprintf = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_VFPRINTF 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_VFPRINTF 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7770,7 +7046,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether vsnprintf must be declared" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf must be declared" >&5
 $as_echo_n "checking whether vsnprintf must be declared... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7778,18 +7054,14 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${groff_cv_decl_needed_vsnprintf+set}" = set; then
+   if test "${groff_cv_decl_needed_vsnprintf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-	  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -7826,42 +7098,19 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_decl_needed_vsnprintf=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_decl_needed_vsnprintf=yes
+  groff_cv_decl_needed_vsnprintf=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_decl_needed_vsnprintf" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_vsnprintf" >&5
 $as_echo "$groff_cv_decl_needed_vsnprintf" >&6; }
    if test $groff_cv_decl_needed_vsnprintf = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_DECLARATION_VSNPRINTF 1
-_ACEOF
+$as_echo "#define NEED_DECLARATION_VSNPRINTF 1" >>confdefs.h
 
    fi
    ac_ext=c
@@ -7876,17 +7125,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking for sys_nerr in <errno.h>, <stdio.h>, or <stdlib.h>" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_nerr in <errno.h>, <stdio.h>, or <stdlib.h>" >&5
 $as_echo_n "checking for sys_nerr in <errno.h>, <stdio.h>, or <stdlib.h>... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -7906,39 +7151,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_NERR 1
-_ACEOF
+$as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7946,17 +7168,13 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking for sys_errlist in <errno.h>, <stdio.h>, or <stdlib.h>" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_errlist in <errno.h>, <stdio.h>, or <stdlib.h>" >&5
 $as_echo_n "checking for sys_errlist in <errno.h>, <stdio.h>, or <stdlib.h>... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -7976,39 +7194,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_ERRLIST 1
-_ACEOF
+$as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -8016,17 +7211,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking C++ <osfcn.h>" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ <osfcn.h>" >&5
 $as_echo_n "checking C++ <osfcn.h>... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <osfcn.h>
 
 
@@ -8040,43 +7231,20 @@
 
 
   ;
-  return 0;
-}
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  return 0;
+}
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CC_OSFCN_H 1
 _ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAVE_CC_OSFCN_H 1" >>confdefs.h
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8090,17 +7258,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking C++ <limits.h>" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ <limits.h>" >&5
 $as_echo_n "checking C++ <limits.h>... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <limits.h>
 
 
@@ -8119,39 +7283,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CC_LIMITS_H 1
-_ACEOF
+$as_echo "#define HAVE_CC_LIMITS_H 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8165,17 +7306,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking C++ <inttypes.h>" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ <inttypes.h>" >&5
 $as_echo_n "checking C++ <inttypes.h>... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <sys/types.h>
 #include <inttypes.h>
 
@@ -8193,39 +7330,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   groff_cv_header_inttypes_h=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CC_INTTYPES_H 1
-_ACEOF
+$as_echo "#define HAVE_CC_INTTYPES_H 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_header_inttypes_h=no
+  groff_cv_header_inttypes_h=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_header_inttypes_h" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_header_inttypes_h" >&5
 $as_echo "$groff_cv_header_inttypes_h" >&6; }
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8241,17 +7355,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking for unsigned long long" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long" >&5
 $as_echo_n "checking for unsigned long long... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 unsigned long long ull = 1;
 int i = 63;
 unsigned long long ullmax = (unsigned long long)-1;
@@ -8270,39 +7380,14 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   groff_cv_type_unsigned_long_long=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	groff_cv_type_unsigned_long_long=no
+  groff_cv_type_unsigned_long_long=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-   { $as_echo "$as_me:$LINENO: result: $groff_cv_type_unsigned_long_long" >&5
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_type_unsigned_long_long" >&5
 $as_echo "$groff_cv_type_unsigned_long_long" >&6; }
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8328,17 +7413,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking for declaration of time_t" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for declaration of time_t" >&5
 $as_echo_n "checking for declaration of time_t... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <time.h>
 
 
@@ -8356,39 +7437,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define LONG_FOR_TIME_T 1
-_ACEOF
+$as_echo "#define LONG_FOR_TIME_T 1" >>confdefs.h
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8396,22 +7454,18 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking for return type of signal handlers" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for return type of signal handlers" >&5
 $as_echo_n "checking for return type of signal handlers... " >&6; }
    for groff_declaration in \
      'extern "C" void (*signal (int, void (*)(int)))(int);' \
      'extern "C" void (*signal (int, void (*)(int)) throw ())(int);' \
      'void (*signal ()) ();'
    do
-     cat >conftest.$ac_ext <<_ACEOF
-
-	 /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <sys/types.h>
 #include <signal.h>
 #ifdef signal
@@ -8433,63 +7487,34 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   break
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	continue
+  continue
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
 
    if test -n "$groff_declaration"; then
-     { $as_echo "$as_me:$LINENO: result: void" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: void" >&5
 $as_echo "void" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define RETSIGTYPE void
-_ACEOF
+$as_echo "#define RETSIGTYPE void" >>confdefs.h
 
    else
-     { $as_echo "$as_me:$LINENO: result: int" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5
 $as_echo "int" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define RETSIGTYPE int
-_ACEOF
+$as_echo "#define RETSIGTYPE int" >>confdefs.h
 
    fi
-{ $as_echo "$as_me:$LINENO: checking struct exception" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct exception" >&5
 $as_echo_n "checking struct exception... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <math.h>
 
 
@@ -8506,55 +7531,27 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_EXCEPTION 1
-_ACEOF
+$as_echo "#define HAVE_STRUCT_EXCEPTION 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 # check endianness
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
+if test "${ac_cv_c_bigendian+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
 	       not a universal capable compiler
@@ -8562,46 +7559,34 @@
 	     typedef int dummy;
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 	# Check for potential -arch flags.  It is not universal unless
-	# there are some -arch flags.  Note that *ppc* also matches
-	# ppc64.  This check is also rather less than ideal.
-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-	esac
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 	     #include <sys/param.h>
@@ -8619,30 +7604,9 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 		#include <sys/param.h>
@@ -8658,49 +7622,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -8715,30 +7648,9 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -8753,51 +7665,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   # Try to guess by grepping values from an object file.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -8823,24 +7704,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -8852,20 +7716,10 @@
 		ac_cv_c_bigendian=unknown
 	      fi
 	    fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -8885,83 +7739,45 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian=no
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+  ac_cv_c_bigendian=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
     fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 
 # checks for libraries
-{ $as_echo "$as_me:$LINENO: checking for main in -lc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc" >&5
 $as_echo_n "checking for main in -lc... " >&6; }
-if test "${ac_cv_lib_c_main+set}" = set; then
+if test "${ac_cv_lib_c_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -8973,59 +7789,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_main=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_main=no
+  ac_cv_lib_c_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_main" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_main" >&5
 $as_echo "$ac_cv_lib_c_main" >&6; }
-if test "x$ac_cv_lib_c_main" = x""yes; then
+if test "x$ac_cv_lib_c_main" = x""yes; then :
   LIBC=-lc
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for sin in -lm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
 $as_echo_n "checking for sin in -lm... " >&6; }
-if test "${ac_cv_lib_m_sin+set}" = set; then
+if test "${ac_cv_lib_m_sin+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9043,78 +7830,45 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_sin=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_m_sin=no
+  ac_cv_lib_m_sin=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
 $as_echo "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = x""yes; then
+if test "x$ac_cv_lib_m_sin" = x""yes; then :
   LIBM=-lm
 fi
 
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -9130,28 +7884,24 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -9185,7 +7935,7 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -9207,7 +7957,7 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
 $as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -9237,13 +7987,13 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then
+if test "${acl_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -9271,18 +8021,16 @@
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -9293,16 +8041,16 @@
   acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
 $as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
-                                                { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then
+if test "${acl_cv_rpath+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9313,7 +8061,7 @@
     acl_cv_rpath=done
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
 $as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
@@ -9325,7 +8073,7 @@
   acl_hardcode_direct="$acl_cv_hardcode_direct"
   acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; :
 else
   enable_rpath=yes
@@ -9338,16 +8086,12 @@
   acl_libdirstem2=
   case "$host_os" in
     solaris*)
-                                    { $as_echo "$as_me:$LINENO: checking for 64-bit host" >&5
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
 $as_echo_n "checking for 64-bit host... " >&6; }
-if test "${gl_cv_solaris_64bit+set}" = set; then
+if test "${gl_cv_solaris_64bit+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef _LP64
@@ -9356,7 +8100,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sixtyfour bits" >/dev/null 2>&1; then
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
   gl_cv_solaris_64bit=yes
 else
   gl_cv_solaris_64bit=no
@@ -9365,7 +8109,7 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_solaris_64bit" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
 $as_echo "$gl_cv_solaris_64bit" >&6; }
       if test $gl_cv_solaris_64bit = yes; then
         acl_libdirstem=lib/64
@@ -9422,7 +8166,7 @@
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
+if test "${with_libiconv_prefix+set}" = set; then :
   withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -9891,19 +8635,15 @@
   done
 
 
-  { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then
+if test "${am_cv_func_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -9917,46 +8657,15 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  am_cv_func_iconv=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_func_iconv=yes
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -9970,49 +8679,22 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
 $as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:$LINENO: checking for working iconv" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then
+if test "${am_cv_func_iconv_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10020,17 +8702,13 @@
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -10090,46 +8768,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   am_cv_func_iconv_works=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-am_cv_func_iconv_works=no
+  am_cv_func_iconv_works=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
       LIBS="$am_save_LIBS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
 $as_echo "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
@@ -10140,15 +8791,13 @@
   fi
   if test "$am_func_iconv" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 $as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
 $as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
@@ -10159,17 +8808,13 @@
 
 
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:$LINENO: checking for iconv declaration" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
 $as_echo_n "checking for iconv declaration... " >&6; }
-    if test "${am_cv_proto_iconv+set}" = set; then
+    if test "${am_cv_proto_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -10192,38 +8837,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   am_cv_proto_iconv_arg1=""
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_proto_iconv_arg1="const"
+  am_cv_proto_iconv_arg1="const"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { $as_echo "$as_me:$LINENO: result: ${ac_t:-
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
          }$am_cv_proto_iconv" >&5
 $as_echo "${ac_t:-
          }$am_cv_proto_iconv" >&6; }
@@ -10242,143 +8866,13 @@
 # checks for functions
 
 
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10388,119 +8882,32 @@
 done
 
 
-for ac_func in getpagesize
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
 
-#undef $ac_func
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETPAGESIZE 1
 _ACEOF
 
 fi
 done
 
-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_mmap_fixed_mapped=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 /* malloc might have been renamed as rpl_malloc. */
@@ -10537,11 +8944,6 @@
 
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
 # ifdef _SC_PAGESIZE
 #  define getpagesize() sysconf(_SC_PAGESIZE)
 # else /* no _SC_PAGESIZE */
@@ -10576,8 +8978,9 @@
 main ()
 {
   char *data, *data2, *data3;
+  const char *cdata2;
   int i, pagesize;
-  int fd;
+  int fd, fd2;
 
   pagesize = getpagesize ();
 
@@ -10590,27 +8993,41 @@
   umask (0);
   fd = creat ("conftest.mmap", 0600);
   if (fd < 0)
-    return 1;
+    return 2;
   if (write (fd, data, pagesize) != pagesize)
-    return 1;
+    return 3;
   close (fd);
 
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
+    return 5;
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
   /* Next, try to mmap the file at a fixed address which already has
      something else allocated at it.  If we can, also make sure that
      we see the same garbage.  */
   fd = open ("conftest.mmap", O_RDWR);
   if (fd < 0)
-    return 1;
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    return 1;
-  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+    return 9;
   if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
 		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 1;
+    return 10;
   for (i = 0; i < pagesize; ++i)
     if (*(data + i) != *(data2 + i))
-      return 1;
+      return 11;
 
   /* Finally, make sure that changes to the mapped area do not
      percolate back to the file as seen by read().  (This is a bug on
@@ -10619,392 +9036,167 @@
     *(data2 + i) = *(data2 + i) + 1;
   data3 = (char *) malloc (pagesize);
   if (!data3)
-    return 1;
+    return 12;
   if (read (fd, data3, pagesize) != pagesize)
-    return 1;
+    return 13;
   for (i = 0; i < pagesize; ++i)
     if (*(data + i) != *(data3 + i))
-      return 1;
+      return 14;
   close (fd);
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_mmap_fixed_mapped=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
+  ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
 $as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
 
 fi
-rm -f conftest.mmap
+rm -f conftest.mmap conftest.txt
 
 saved_libs="$LIBS"
 LIBS="$LIBS $LIBC $LIBM"
+ac_fn_c_check_func "$LINENO" "fmod" "ac_cv_func_fmod"
+if test "x$ac_cv_func_fmod" = x""yes; then :
+  $as_echo "#define HAVE_FMOD 1" >>confdefs.h
 
-
-
-
-
-
-
-
-for ac_func in fmod getcwd putenv snprintf strcasecmp \
-                  strerror strncasecmp strtol
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+  case " $LIBOBJS " in
+  *" fmod.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS fmod.$ac_objext"
+ ;;
+esac
 
-#undef $ac_func
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
+ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
+if test "x$ac_cv_func_getcwd" = x""yes; then :
+  $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  case " $LIBOBJS " in
+  *" getcwd.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
+ ;;
+esac
 
-	eval "$as_ac_var=no"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = x""yes; then :
+  $as_echo "#define HAVE_PUTENV 1" >>confdefs.h
 
 else
   case " $LIBOBJS " in
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+  *" putenv.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS putenv.$ac_objext"
  ;;
 esac
 
 fi
-done
-
 
-# vsnprintf is in the same source file as snprintf
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = x""yes; then :
+  $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h
 
-for ac_func in vsnprintf
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+  case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
 
-#undef $ac_func
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = x""yes; then :
+  $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  case " $LIBOBJS " in
+  *" strcasecmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
+ ;;
+esac
 
-	eval "$as_ac_var=no"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
+if test "x$ac_cv_func_strerror" = x""yes; then :
+  $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
 
 else
   case " $LIBOBJS " in
-  *" snprintf.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+  *" strerror.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strerror.$ac_objext"
  ;;
 esac
 
 fi
-done
-
-LIBS="$saved_libs"
-
 
+ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
+if test "x$ac_cv_func_strncasecmp" = x""yes; then :
+  $as_echo "#define HAVE_STRNCASECMP 1" >>confdefs.h
 
+else
+  case " $LIBOBJS " in
+  *" strncasecmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strncasecmp.$ac_objext"
+ ;;
+esac
 
+fi
 
+ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
+if test "x$ac_cv_func_strtol" = x""yes; then :
+  $as_echo "#define HAVE_STRTOL 1" >>confdefs.h
 
-for ac_func in gettimeofday isatty kill rename setlocale strsep
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+  case " $LIBOBJS " in
+  *" strtol.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strtol.$ac_objext"
+ ;;
+esac
 
-#undef $ac_func
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
+# vsnprintf is in the same source file as snprintf
+for ac_func in vsnprintf
+do :
+  ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VSNPRINTF 1
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
+
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
 
-	eval "$as_ac_var=no"
 fi
+done
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+LIBS="$saved_libs"
+for ac_func in gettimeofday isatty kill rename setlocale strsep
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11012,7 +9204,7 @@
 fi
 done
 
-{ $as_echo "$as_me:$LINENO: checking for mkstemp" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkstemp" >&5
 $as_echo_n "checking for mkstemp... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11021,15 +9213,11 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <stdlib.h>
 #include <unistd.h>
 int (*f) (char *);
@@ -11048,39 +9236,14 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MKSTEMP 1
-_ACEOF
+$as_echo "#define HAVE_MKSTEMP 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
       case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
@@ -11089,163 +9252,42 @@
 esac
 
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
-$as_echo_n "checking whether sys_siglist is declared... " >&6; }
-if test "${ac_cv_have_decl_sys_siglist+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef sys_siglist
-  (void) sys_siglist;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_sys_siglist=yes
+ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default"
+if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
+  ac_have_decl=1
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_sys_siglist=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
-$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST 0
-_ACEOF
-
-
-fi
-{ $as_echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef getc_unlocked
-  (void) getc_unlocked;
-#endif
-
-  ;
-  return 0;
-}
+#define HAVE_DECL_SYS_SIGLIST $ac_have_decl
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getc_unlocked=yes
+ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
+  ac_have_decl=1
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_getc_unlocked=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
-if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED 0
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
 _ACEOF
 
 
-fi
-
-
-
-  { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if test "${am_cv_langinfo_codeset+set}" = set; then
+if test "${am_cv_langinfo_codeset+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
 int
@@ -11256,47 +9298,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_langinfo_codeset=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_langinfo_codeset=no
+  am_cv_langinfo_codeset=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
 $as_echo "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -11308,16 +9323,12 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking whether ANSI array delete syntax is supported" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ANSI array delete syntax is supported" >&5
 $as_echo_n "checking whether ANSI array delete syntax is supported... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main ()
 {
@@ -11332,39 +9343,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define ARRAY_DELETE_NEEDS_SIZE 1
-_ACEOF
+$as_echo "#define ARRAY_DELETE_NEEDS_SIZE 1" >>confdefs.h
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -11378,17 +9366,13 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:$LINENO: checking traditional preprocessor" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking traditional preprocessor" >&5
 $as_echo_n "checking traditional preprocessor... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #define name2(a, b) a/**/b
 
 
@@ -11405,39 +9389,16 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define TRADITIONAL_CPP 1
-_ACEOF
+$as_echo "#define TRADITIONAL_CPP 1" >>confdefs.h
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -11447,21 +9408,17 @@
 
 
 # checks for operating system services
-{ $as_echo "$as_me:$LINENO: checking w_coredump" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking w_coredump" >&5
 $as_echo_n "checking w_coredump... " >&6; }
-   if test "$cross_compiling" = yes; then
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+   if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -11488,58 +9445,29 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define WCOREFLAG 0200
-_ACEOF
+$as_echo "#define WCOREFLAG 0200" >>confdefs.h
 
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-
 # other random stuff
-{ $as_echo "$as_me:$LINENO: checking default value for grops -b option" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default value for grops -b option" >&5
 $as_echo_n "checking default value for grops -b option... " >&6; }
    test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=0
-   { $as_echo "$as_me:$LINENO: result: $BROKEN_SPOOLER_FLAGS" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BROKEN_SPOOLER_FLAGS" >&5
 $as_echo "$BROKEN_SPOOLER_FLAGS" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking default paper size" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default paper size" >&5
 $as_echo_n "checking default paper size... " >&6; }
    groff_prefix=$prefix
    test "x$prefix" = "xNONE" && groff_prefix=$ac_default_prefix
@@ -11590,27 +9518,25 @@
    test -n "$PAGE" || PAGE=letter
    if test "x$PAGE" = "xA4"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PAGEA4 1
-_ACEOF
+$as_echo "#define PAGEA4 1" >>confdefs.h
 
    fi
-   { $as_echo "$as_me:$LINENO: result: $PAGE" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PAGE" >&5
 $as_echo "$PAGE" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for existing troff installation" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for existing troff installation" >&5
 $as_echo_n "checking for existing troff installation... " >&6; }
    if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
      g=g
    else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
      g=
    fi
 
-{ $as_echo "$as_me:$LINENO: checking for prefix of system macro packages" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prefix of system macro packages" >&5
 $as_echo_n "checking for prefix of system macro packages... " >&6; }
    sys_tmac_prefix=
    sys_tmac_file_prefix=
@@ -11627,11 +9553,11 @@
        done
      done
    done
-   { $as_echo "$as_me:$LINENO: result: $sys_tmac_prefix" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sys_tmac_prefix" >&5
 $as_echo "$sys_tmac_prefix" >&6; }
 
 
-   { $as_echo "$as_me:$LINENO: checking which system macro packages should be made available" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which system macro packages should be made available" >&5
 $as_echo_n "checking which system macro packages should be made available... " >&6; }
    tmac_wrap=
    if test "x$sys_tmac_file_prefix" = "xtmac."; then
@@ -11674,21 +9600,17 @@
      done
      rm -f conftest.sol
    fi
-   { $as_echo "$as_me:$LINENO: result: $tmac_wrap" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tmac_wrap" >&5
 $as_echo "$tmac_wrap" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking separator character to use in groff search paths" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking separator character to use in groff search paths" >&5
 $as_echo_n "checking separator character to use in groff search paths... " >&6; }
    cp ${srcdir}/src/include/nonposix.h conftest.h
-   cat >conftest.$ac_ext <<_ACEOF
-
-       /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
+
 #include <ctype.h>
 #include "conftest.h"
 
@@ -11708,39 +9630,18 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   GROFF_PATH_SEPARATOR=":"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	GROFF_PATH_SEPARATOR=";"
+  GROFF_PATH_SEPARATOR=";"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   { $as_echo "$as_me:$LINENO: result: $GROFF_PATH_SEPARATOR" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROFF_PATH_SEPARATOR" >&5
 $as_echo "$GROFF_PATH_SEPARATOR" >&6; }
 
 
 # Check whether --with-alt-gs was given.
-if test "${with_alt_gs+set}" = set; then
+if test "${with_alt_gs+set}" = set; then :
   withval=$with_alt_gs; ALT_GHOSTSCRIPT_PROGS="$withval"
 else
   ALT_GHOSTSCRIPT_PROGS="gs gswin32c gsos2"
@@ -11750,7 +9651,7 @@
 
 
 # Check whether --with-gs was given.
-if test "${with_gs+set}" = set; then
+if test "${with_gs+set}" = set; then :
   withval=$with_gs; GHOSTSCRIPT=$withval
 else
   if test -n "$ac_tool_prefix"; then
@@ -11758,9 +9659,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_GHOSTSCRIPT+set}" = set; then
+if test "${ac_cv_prog_GHOSTSCRIPT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$GHOSTSCRIPT"; then
@@ -11771,24 +9672,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GHOSTSCRIPT="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 GHOSTSCRIPT=$ac_cv_prog_GHOSTSCRIPT
 if test -n "$GHOSTSCRIPT"; then
-  { $as_echo "$as_me:$LINENO: result: $GHOSTSCRIPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GHOSTSCRIPT" >&5
 $as_echo "$GHOSTSCRIPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11802,9 +9703,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_GHOSTSCRIPT+set}" = set; then
+if test "${ac_cv_prog_ac_ct_GHOSTSCRIPT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_GHOSTSCRIPT"; then
@@ -11815,24 +9716,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_GHOSTSCRIPT="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_GHOSTSCRIPT=$ac_cv_prog_ac_ct_GHOSTSCRIPT
 if test -n "$ac_ct_GHOSTSCRIPT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_GHOSTSCRIPT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GHOSTSCRIPT" >&5
 $as_echo "$ac_ct_GHOSTSCRIPT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11845,7 +9746,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -11863,9 +9764,9 @@
    missing=
    # Extract the first word of "pnmcut", so it can be a program name with args.
 set dummy pnmcut; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_pnmcut+set}" = set; then
+if test "${ac_cv_prog_pnmcut+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$pnmcut"; then
@@ -11876,14 +9777,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_pnmcut="found"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_pnmcut" && ac_cv_prog_pnmcut="missing"
@@ -11891,10 +9792,10 @@
 fi
 pnmcut=$ac_cv_prog_pnmcut
 if test -n "$pnmcut"; then
-  { $as_echo "$as_me:$LINENO: result: $pnmcut" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmcut" >&5
 $as_echo "$pnmcut" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11903,9 +9804,9 @@
 	missing="$missing \`pnmcut'"
       fi;# Extract the first word of "pnmcrop", so it can be a program name with args.
 set dummy pnmcrop; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_pnmcrop+set}" = set; then
+if test "${ac_cv_prog_pnmcrop+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$pnmcrop"; then
@@ -11916,14 +9817,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_pnmcrop="found"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_pnmcrop" && ac_cv_prog_pnmcrop="missing"
@@ -11931,10 +9832,10 @@
 fi
 pnmcrop=$ac_cv_prog_pnmcrop
 if test -n "$pnmcrop"; then
-  { $as_echo "$as_me:$LINENO: result: $pnmcrop" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmcrop" >&5
 $as_echo "$pnmcrop" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11943,9 +9844,9 @@
 	missing="$missing \`pnmcrop'"
       fi;# Extract the first word of "pnmtopng", so it can be a program name with args.
 set dummy pnmtopng; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_pnmtopng+set}" = set; then
+if test "${ac_cv_prog_pnmtopng+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$pnmtopng"; then
@@ -11956,14 +9857,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_pnmtopng="found"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_pnmtopng" && ac_cv_prog_pnmtopng="missing"
@@ -11971,10 +9872,10 @@
 fi
 pnmtopng=$ac_cv_prog_pnmtopng
 if test -n "$pnmtopng"; then
-  { $as_echo "$as_me:$LINENO: result: $pnmtopng" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmtopng" >&5
 $as_echo "$pnmtopng" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11983,9 +9884,9 @@
 	missing="$missing \`pnmtopng'"
       fi;# Extract the first word of "psselect", so it can be a program name with args.
 set dummy psselect; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_psselect+set}" = set; then
+if test "${ac_cv_prog_psselect+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$psselect"; then
@@ -11996,14 +9897,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_psselect="found"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_psselect" && ac_cv_prog_psselect="missing"
@@ -12011,10 +9912,10 @@
 fi
 psselect=$ac_cv_prog_psselect
 if test -n "$psselect"; then
-  { $as_echo "$as_me:$LINENO: result: $psselect" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $psselect" >&5
 $as_echo "$psselect" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12023,9 +9924,9 @@
 	missing="$missing \`psselect'"
       fi;# Extract the first word of "pnmtops", so it can be a program name with args.
 set dummy pnmtops; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_pnmtops+set}" = set; then
+if test "${ac_cv_prog_pnmtops+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$pnmtops"; then
@@ -12036,14 +9937,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_pnmtops="found"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_pnmtops" && ac_cv_prog_pnmtops="missing"
@@ -12051,10 +9952,10 @@
 fi
 pnmtops=$ac_cv_prog_pnmtops
 if test -n "$pnmtops"; then
-  { $as_echo "$as_me:$LINENO: result: $pnmtops" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmtops" >&5
 $as_echo "$pnmtops" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12083,7 +9984,7 @@
      make_html=
      make_install_html=
 
-     { $as_echo "$as_me:$LINENO: WARNING: missing program$plural:
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural:
 
   The program$plural
      $missing
@@ -12107,7 +10008,7 @@
 
 
 # Check whether --with-alt-awk was given.
-if test "${with_alt_awk+set}" = set; then
+if test "${with_alt_awk+set}" = set; then :
   withval=$with_alt_awk; ALT_AWK_PROGS="$withval"
 else
   ALT_AWK_PROGS="gawk mawk nawk awk"
@@ -12117,7 +10018,7 @@
 
 
 # Check whether --with-awk was given.
-if test "${with_awk+set}" = set; then
+if test "${with_awk+set}" = set; then :
   withval=$with_awk; AWK=$withval
 else
   if test -n "$ac_tool_prefix"; then
@@ -12125,9 +10026,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -12138,24 +10039,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12169,9 +10070,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AWK+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AWK"; then
@@ -12182,24 +10083,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AWK=$ac_cv_prog_ac_ct_AWK
 if test -n "$ac_ct_AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AWK" >&5
 $as_echo "$ac_ct_AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12212,7 +10113,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -12241,7 +10142,7 @@
      make_pdfdoc=
      make_install_pdfdoc=
 
-     { $as_echo "$as_me:$LINENO: WARNING: missing program$plural:
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural:
 
   The program$plural $missing cannot be found in the PATH.
   Consequently, groff's PDF formatter (pdfroff) will not work properly;
@@ -12259,29 +10160,25 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether pnmtops can handle the -nosetpage option" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pnmtops can handle the -nosetpage option" >&5
 $as_echo_n "checking whether pnmtops can handle the -nosetpage option... " >&6; }
    if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then
-     { $as_echo "$as_me:$LINENO: result: yes" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
      pnmtops_nosetpage="pnmtops -nosetpage"
    else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
      pnmtops_nosetpage="pnmtops"
    fi
 
 
-    { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
 $as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -12293,7 +10190,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2_1=yes
 else
   ac_cv_gnu_library_2_1=no
@@ -12303,7 +10200,7 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
 $as_echo "$ac_cv_gnu_library_2_1" >&6; }
 
     GLIBC21="$ac_cv_gnu_library_2_1"
@@ -12345,13 +10242,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -12359,8 +10256,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -12383,11 +10280,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -12401,14 +10298,15 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -12421,9 +10319,10 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -12433,17 +10332,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -12451,23 +10351,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -12475,7 +10367,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -12486,7 +10384,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -12509,13 +10407,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -12525,15 +10416,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -12545,12 +10436,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -12562,7 +10457,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -12576,8 +10553,12 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -12597,76 +10578,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -12695,8 +10625,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -12715,10 +10693,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -12733,13 +10711,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by groff $as_me 1.21, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -12770,13 +10754,15 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -12792,16 +10778,17 @@
 Configuration headers:
 $config_headers
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <bug-groff@gnu.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+groff config.status 1.21
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -12817,11 +10804,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -12835,27 +10827,29 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -12863,11 +10857,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -12921,9 +10914,7 @@
     "contrib/gdiffmk/tests/runtests") CONFIG_FILES="$CONFIG_FILES contrib/gdiffmk/tests/runtests" ;;
     "test-groff") CONFIG_FILES="$CONFIG_FILES test-groff" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -12949,7 +10940,7 @@
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -12960,11 +10951,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -12972,7 +10959,13 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -12989,24 +10982,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -13028,7 +11015,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -13042,7 +11029,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -13095,22 +11082,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -13138,9 +11131,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -13225,9 +11216,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -13240,9 +11229,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -13270,12 +11257,10 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -13286,7 +11271,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -13299,9 +11284,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -13329,47 +11312,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -13421,7 +11364,6 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -13431,12 +11373,11 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -13446,7 +11387,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -13474,26 +11415,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -13504,25 +11441,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -13539,15 +11470,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -13568,17 +11496,17 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
 if test -z "$groff_no_x"; then
      if test "x$with_appresdir" = "x"; then
-       { $as_echo "$as_me:$LINENO:
+       { $as_echo "$as_me:${as_lineno-$LINENO}:
 
   The application resource files for gxditview will be installed as
 
diff -ruN groff-1.20.1/configure.ac groff-1.21/configure.ac
--- groff-1.20.1/configure.ac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/configure.ac	2010-12-31 08:33:08.000000000 +0100
@@ -20,12 +20,36 @@
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT
-AC_PREREQ(2.59)
+dnl Use `VERSION' and `REVISION' files to get version.
+m4_define([GROFF_VERSION_DATA], m4_include([VERSION]))
+m4_define([GROFF_REVISION_DATA], m4_include([REVISION]))
+
+dnl Strip off newline characters.
+m4_define([GROFF_VERSION],
+          m4_substr(GROFF_VERSION_DATA,
+                    [0], m4_decr(m4_len(GROFF_VERSION_DATA))))
+m4_define([GROFF_REVISION],
+          m4_substr(GROFF_REVISION_DATA,
+                    [0], m4_decr(m4_len(GROFF_REVISION_DATA))))
+
+dnl Don't use revision if it is zero.
+m4_define([GROFF_VERSION_STRING],
+          m4_if(m4_eval(GROFF_REVISION[ > 0]),
+                [1],
+                GROFF_VERSION[.]GROFF_REVISION,
+                GROFF_VERSION))
+
+AC_INIT([groff],
+        GROFF_VERSION_STRING,
+        [bug-groff@gnu.org],
+        [groff-]GROFF_VERSION_STRING)
+AC_PREREQ([2.62])
 
 AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin])
 AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp])
 
+AC_USE_SYSTEM_EXTENSIONS
+
 # checks for programs
 AC_PROG_CC
 AC_PROG_CXX
diff -ruN groff-1.20.1/contrib/chem/ChangeLog groff-1.21/contrib/chem/ChangeLog
--- groff-1.20.1/contrib/chem/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/chem/ChangeLog	2010-12-31 08:33:09.000000000 +0100
@@ -1,3 +1,19 @@
+2010-12-13  Werner LEMBERG  <wl@gnu.org>
+
+	Really fix handling of examples/122.
+
+	* examples/122/README: Renamed to...
+	* examples/122/README.txt: This.
+
+	* Makefile.sub (all, MOSTLYCLEANADD): Add `examples/122/README'.
+	(examples/122/README): New target.
+	(install_data): Fix typo.
+
+2010-06-02  Larry Jones  <lawrence.jones@siemens.com>
+
+	* Makefile.sub (install): Fix handling of examples/122.
+	It tried to process the CVS subdirectory as a file.
+
 2009-01-03  Werner LEMBERG  <wl@gnu.org>
 
 	* chem.pl: Prepare for groff version 1.20.
@@ -195,7 +211,7 @@
 	________________________________________________________________
 	License
 
-	Copyright (C) 2006, 2007, 2008, 2009
+	Copyright (C) 2006, 2007, 2008, 2009, 2010
 	Free Software Foundation, Inc.
 	Written by Bernd Warken
 
diff -ruN groff-1.20.1/contrib/chem/examples/122/README groff-1.21/contrib/chem/examples/122/README
--- groff-1.20.1/contrib/chem/examples/122/README	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/chem/examples/122/README	1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-This directory contains the examples for the `chem' language written
-in the book:
-
-    Computing Science Technical Report No. 122
-    CHEM - A Program for Typesetting Chemical Diagrams: User Manual
-    by Jon L. Bentley, Lynn W. Jelinski, Brian W. Kernighan
-
-The book is available in the internet at
-<http://cm.bell-labs.com/cm/cs/cstr/122.ps.gz>.
-
-Many of the examples had to be fixed.  Unfortunately, the `chem' akw
-version does not run on many of these programs.  But the Perl version
-of `chem' works on all examples.
-
-Most examples do not use the modern chemical display.  They have C
-atoms added, whereas the modern method omits all C atoms and their
-directly appended H atoms.
-
-The examples are named and sorted by the chapter where they are found
-in the book.  For example, the file `ch4c_colon.chem' means a `chem'
-example in chapter 4; according to `c', it is the third example in
-this chapter; the name `colon' is used to describe the context of the
-example.
-
-You can view the graphical display of the examples by calling
-
-    groffer <file>
-
-`groffer' calls `chem' automatically.
-
-If you want to transform example files to a different format use the
-`roff2*' programs:
-
-`roff2dvi' prints dvi format to standard output,
-`roff2html' generates html output,
-`roff2pdf' outputs pdf mode,
-`roff2ps' produces PostScript output,
-`roff2text' generates text output in the groff device `latin1',
-`roff2x' prints the output  in  the  groff  device  X  that  is
-         suitable  for programs  like `gxditview' or `xditview'.
-
-To get a suitable `groff' output run
-
-    @g@chem <file> | groff -p ...
-
-
-####### License
-
-Last update: 5 Jan 2009
-
-Copyright (C) 2006, 2009 Free Software Foundation, Inc.
-Written by Bernd Warken.
-
-This file is part of `chem', which is part of `groff'.
-
-`groff' is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-`groff' is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-####### Emacs settings
-
-Local Variables:
-mode: text
-End:
diff -ruN groff-1.20.1/contrib/chem/examples/122/README.txt groff-1.21/contrib/chem/examples/122/README.txt
--- groff-1.20.1/contrib/chem/examples/122/README.txt	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/contrib/chem/examples/122/README.txt	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,74 @@
+This directory contains the examples for the `chem' language written
+in the book:
+
+    Computing Science Technical Report No. 122
+    CHEM - A Program for Typesetting Chemical Diagrams: User Manual
+    by Jon L. Bentley, Lynn W. Jelinski, Brian W. Kernighan
+
+The book is available in the internet at
+<http://cm.bell-labs.com/cm/cs/cstr/122.ps.gz>.
+
+Many of the examples had to be fixed.  Unfortunately, the `chem' akw
+version does not run on many of these programs.  But the Perl version
+of `chem' works on all examples.
+
+Most examples do not use the modern chemical display.  They have C
+atoms added, whereas the modern method omits all C atoms and their
+directly appended H atoms.
+
+The examples are named and sorted by the chapter where they are found
+in the book.  For example, the file `ch4c_colon.chem' means a `chem'
+example in chapter 4; according to `c', it is the third example in
+this chapter; the name `colon' is used to describe the context of the
+example.
+
+You can view the graphical display of the examples by calling
+
+    groffer <file>
+
+`groffer' calls `chem' automatically.
+
+If you want to transform example files to a different format use the
+`roff2*' programs:
+
+`roff2dvi' prints dvi format to standard output,
+`roff2html' generates html output,
+`roff2pdf' outputs pdf mode,
+`roff2ps' produces PostScript output,
+`roff2text' generates text output in the groff device `latin1',
+`roff2x' prints the output  in  the  groff  device  X  that  is
+         suitable  for programs  like `gxditview' or `xditview'.
+
+To get a suitable `groff' output run
+
+    @g@chem <file> | groff -p ...
+
+
+####### License
+
+Last update: 5 Jan 2009
+
+Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+Written by Bernd Warken.
+
+This file is part of `chem', which is part of `groff'.
+
+`groff' is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+`groff' is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+####### Emacs settings
+
+Local Variables:
+mode: text
+End:
diff -ruN groff-1.20.1/contrib/chem/Makefile.sub groff-1.21/contrib/chem/Makefile.sub
--- groff-1.20.1/contrib/chem/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/chem/Makefile.sub	2010-12-31 08:33:09.000000000 +0100
@@ -2,10 +2,10 @@
 
 # File position: <groff-source>/contrib/chem/Makefile.sub
 
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 # Written by Bernd Warken.
 
-# Last update: 5 Jan 2009
+# Last update: 12 Dec 2010
 
 # This file is part of `chem' which is part of `groff'.
 
@@ -25,12 +25,19 @@
 ########################################################################
 
 MAN1=chem.n
-MOSTLYCLEANADD=chem chem.n README examples/README
+MOSTLYCLEANADD=\
+  chem \
+  chem.n \
+  README \
+  examples/README \
+  example/122/README
 
 # not all make programs have $(RM) predefined.
 RM=rm -f
 
-all: README examples/README chem $(MAN1)
+all: README examples/README examples/122/README \
+     chem \
+     $(MAN1)
 
 README: $(srcdir)/README.txt
 	sed -e "s|@g@|$(g)|g" $? >$@
@@ -39,6 +46,11 @@
 	-test -d examples || $(mkinstalldirs) examples
 	sed -e "s|@g@|$(g)|g" $? >$@
 
+examples/122/README: $(srcdir)/examples/122/README.txt
+	-test -d examples || $(mkinstalldirs) examples
+	-test -d examples/122 || $(mkinstalldirs) examples/122
+	sed -e "s|@g@|$(g)|g" $? >$@
+
 chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
 	sed -f "$(SH_DEPS_SED_SCRIPT)" \
 	  -e "s|@g@|$(g)|g" \
@@ -51,9 +63,9 @@
 	chmod +x $@
 
 install_data: chem \
-              README examples/README \
+              README examples/README examples/122/README \
               $(srcdir)/chem.pic \
-              $(srcdir)/examples/*.chem $(srcdir)/examples/122/*
+              $(srcdir)/examples/*.chem $(srcdir)/examples/122/*.chem
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(RM) $(DESTDIR)$(bindir)/$(g)chem
 	$(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem
@@ -63,7 +75,7 @@
 	$(INSTALL_DATA) $(srcdir)/chem.pic \
           $(DESTDIR)$(datasubdir)/pic/chem.pic
 	-test -d $(DESTDIR)$(exampledir)/chem \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
+          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
 	-test -d $(DESTDIR)$(exampledir)/chem/122 \
           || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
 	-$(RM) $(DESTDIR)$(exampledir)/chem/*
@@ -74,7 +86,9 @@
           $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
         done
 	-$(RM) $(DESTDIR)$(exampledir)/chem/122/*
-	for i in $(srcdir)/examples/122/*; do \
+	$(INSTALL_DATA) examples/122/README \
+          $(DESTDIR)$(exampledir)/chem/122/README
+	for i in $(srcdir)/examples/122/*.chem; do \
           n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \
           $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \
         done
diff -ruN groff-1.20.1/contrib/eqn2graph/eqn2graph.sh groff-1.21/contrib/eqn2graph/eqn2graph.sh
--- groff-1.20.1/contrib/eqn2graph/eqn2graph.sh	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/eqn2graph/eqn2graph.sh	2010-12-31 08:33:09.000000000 +0100
@@ -32,7 +32,7 @@
 #
 # Thus, we pass -U to groff(1), and everything else to convert(1).
 #
-# $Id: eqn2graph.sh,v 1.6 2008/09/29 00:53:29 esr Exp $
+# $Id: eqn2graph.sh,v 1.7 2010/02/25 20:17:13 wl Exp $
 #
 groff_opts=""
 convert_opts=""
@@ -75,7 +75,7 @@
     { (exit 1); exit 1; }
 fi
 
-trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
 
 # Here goes:
 # 1. Add .EQ/.EN.
diff -ruN groff-1.20.1/contrib/gdiffmk/ChangeLog groff-1.21/contrib/gdiffmk/ChangeLog
--- groff-1.20.1/contrib/gdiffmk/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/gdiffmk/ChangeLog	2010-12-31 08:33:09.000000000 +0100
@@ -1,3 +1,7 @@
+2009-09-22  Colin Watson  <cjwatson@debian.org>
+
+	* contrib/gdiffmk/gdiffmk.sh: Don't use bash specific syntax.
+
 2008-01-04  Werner LEMBERG  <wl@gnu.org>
 
 	* gdiffmk.man: Replace .URL with .UR/.UE.
@@ -86,7 +90,7 @@
 
 	First import of gdiffmk files.
 
-Copyright 2004, 2005, 2006, 2007, 2008
+Copyright 2004, 2005, 2006, 2007, 2008, 2009
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
diff -ruN groff-1.20.1/contrib/gdiffmk/gdiffmk.sh groff-1.21/contrib/gdiffmk/gdiffmk.sh
--- groff-1.20.1/contrib/gdiffmk/gdiffmk.sh	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/gdiffmk/gdiffmk.sh	2010-12-31 08:33:09.000000000 +0100
@@ -21,7 +21,7 @@
 
 cmd=$( basename $0 )
 
-function Usage {
+Usage () {
 	if test "$#" -gt 0
 	then
 		echo >&2 "${cmd}:  $@"
@@ -60,7 +60,7 @@
 }
 
 
-function Exit {
+Exit () {
 	exitcode=$1
 	shift
 	for arg
@@ -75,7 +75,7 @@
 #
 #	Check for existence and readability of given file name.
 #	If not found or not readable, print message and exit with EXIT_CODE.
-function FileRead {
+FileRead () {
 	case "$2" in
 	-)
 		return
@@ -97,7 +97,7 @@
 #
 #	Create the given filename if it doesn't exist.
 #	If unable to create or write, print message and exit with EXIT_CODE.
-function FileCreate {
+FileCreate () {
 	case "$2" in
 	-)
 		return
@@ -115,7 +115,7 @@
 	fi
 }
 
-function WouldClobber {
+WouldClobber () {
 	case "$2" in
 	-)
 		return
@@ -136,7 +136,7 @@
 MARK1='[['
 MARK2=']]'
 
-function RequiresArgument {
+RequiresArgument () {
 	#	Process flags that take either concatenated or
 	#	separated values.
 	case "$1" in
diff -ruN groff-1.20.1/contrib/grap2graph/grap2graph.sh groff-1.21/contrib/grap2graph/grap2graph.sh
--- groff-1.20.1/contrib/grap2graph/grap2graph.sh	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/grap2graph/grap2graph.sh	2010-12-31 08:33:09.000000000 +0100
@@ -28,7 +28,7 @@
 #
 # Thus, we pass -U to groff(1), and everything else to convert(1).
 #
-# $Id: grap2graph.sh,v 1.4 2005/05/18 07:03:06 wl Exp $
+# $Id: grap2graph.sh,v 1.5 2010/02/25 20:17:13 wl Exp $
 #
 groff_opts=""
 convert_opts=""
@@ -71,7 +71,7 @@
     { (exit 1); exit 1; }
 fi
 
-trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
 
 # Here goes:
 # 1. Add .G1/.G2.
diff -ruN groff-1.20.1/contrib/groffer/perl/groffer.man groff-1.21/contrib/groffer/perl/groffer.man
--- groff-1.20.1/contrib/groffer/perl/groffer.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/groffer/perl/groffer.man	2010-12-31 08:33:09.000000000 +0100
@@ -6,7 +6,7 @@
 .\" The .SH was moved to this place in order to appease `apropos'.
 .
 .\" --------------------------------------------------------------------
-.\" Legalize
+.\" Legalese
 .\" --------------------------------------------------------------------
 .
 .ig
@@ -15,13 +15,13 @@
 Source file position:  <groff_source_top>/contrib/groffer/perl/groffer.man
 Installed position:    $prefix/share/man/man1/groffer.1
 
-Last update: 5 Jan 2009
+Last update: 2 Jun 2010
 ..
 .de author
 This file was written by Bernd Warken.
 ..
 .de copyleft
-Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009
+Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009, 2010
   Free Software Foundation, Inc.
 .
 .P
@@ -3141,6 +3141,10 @@
 .B groff
 does.
 .
+See the
+.BR \%groff (@MAN1EXT@)
+man page for more details on the location of temporary files.
+.
 .
 .\" --------------------------------------------------------------------
 .SS "Man Variables"
diff -ruN groff-1.20.1/contrib/groffer/shell/groffer.man groff-1.21/contrib/groffer/shell/groffer.man
--- groff-1.20.1/contrib/groffer/shell/groffer.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/groffer/shell/groffer.man	2010-12-31 08:33:09.000000000 +0100
@@ -6,7 +6,7 @@
 .\" The .SH was moved to this place in order to appease `apropos'.
 .
 .\" --------------------------------------------------------------------
-.\" Legalize
+.\" Legalese
 .\" --------------------------------------------------------------------
 .
 .ig
@@ -15,13 +15,13 @@
 Source file position:  <groff_source_top>/contrib/groffer/shell/groffer.man
 Installed position:    $prefix/share/man/man1/groffer.1
 
-Last update: 5 Jan 2009
+Last update: 2 Jun 2010
 ..
 .de author
 This file was written by Bernd Warken.
 ..
 .de copyleft
-Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  Free Software Foundation, Inc.
 .
 .P
@@ -3214,6 +3214,10 @@
 .B groff
 does.
 .
+See the
+.BR \%groff (@MAN1EXT@)
+man page for more details on the location of temporary files.
+.
 .
 .\" --------------------------------------------------------------------
 .SS "Man Variables"
diff -ruN groff-1.20.1/contrib/hdtbl/ChangeLog groff-1.21/contrib/hdtbl/ChangeLog
--- groff-1.20.1/contrib/hdtbl/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/hdtbl/ChangeLog	2010-12-31 08:33:09.000000000 +0100
@@ -1,3 +1,71 @@
+2010-02-09  Werner LEMBEARG  <wl@gnu.org>
+
+	Make example compilation work again if srcdir != builddir.
+
+	* Makefile.sub (.roff.ps): Define `sopath' groff string.
+
+	* examples/*.roff, examples/*.in: Use it so that .so finds its input
+	file.
+
+2010-02-08  Werner LEMBEARG  <wl@gnu.org>
+
+	Fix handling of `common.roff'.
+
+	* Makefile.sub (MOSTLYCLEANADD): Don't handle `common.roff'.
+	(EXAMPLEFILES): Handle `common.roff'.
+
+2010-02-08  Larry Kollar  <kollar@alltel.net>
+
+	Fix last patch and use `t*' prefix for all non-public stuff.
+	Other minor fixes.
+
+	* hdmisc.tmac (getarg, index, SP, P1, \n[s], \n[v], \n[hy], pv, DI):
+	Rename to...
+	(t*getarg, t*index, t*SP, t*P1, \n[t*s], \n[t*v], \n[t*hy], t*pv,
+	t*DI): This.
+	Update all callers.
+	(t*EM): New auxiliary macro (using stuff from
+	`examples/common.roff'.
+
+	* hdtbl.tmac (\n[t*v], \n[t*s], \n[t*hy], \n[t*l]): Initialize.
+	(\n[t*FN], \n[t*LN]): New number registers.
+
+	* examples/*.roff: Updated.
+	* examples/common.roff: Load `hdtbl.tmac' earlier.
+	Reinstall `HM' and `BM' traps.
+	Provide `SP' macros if not defined by other macro package.
+	(\n[p], \n[o]): Initialize.
+	(\*[t*HM], \*[t*BM]): Initialize.
+	(EM): Use `t*EM'.
+	Updated.
+
+	* examples/fonts_n.in, examples/fonts_x.in: Load
+	`examples/common.roff'.
+	Updated.
+
+	* groff_hdtbl.man: Document setup of default values.
+	Document `t*EM'.
+
+2010-01-23  Larry Kollar  <kollar@alltel.net>
+
+	Break out example formatting to a separate file.
+
+	* hdmisc.tmac: Move example formatting stuff to...
+	* examples/common.roff: This new file.
+
+	* hdtbl.tmac (HM, t*HM, BM, t*BM): Remove.
+
+	* examples/*.roff: Include `common.roff'.
+
+	* groff_hdtbl.man: Remove references to `HM' and `BM'.
+
+	* Makefile.sub: Handle `examples/common.roff'.
+
+2009-04-05  Joachim Walsdorff  <Joachim.Walsdorff@urz.uni-heidelberg.de>
+
+	* hdtbl.tmac (ETB, t*free): Correct two typos, fixing register
+	incrementation.
+
 2009-01-04  Werner LEMBERG  <wl@gnu.org>
 
 	* Makefile.sub (CLEANADD): Add hdmisc.tmac-s and hdtbl.tmac-s.
@@ -200,7 +268,7 @@
 	* Import of hdtbl 0.91 (with some further modifications).  Still
 	many rough edges.
 
-Copyright 2006, 2008, 2009
+Copyright 2006, 2008, 2009, 2010
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
diff -ruN groff-1.20.1/contrib/hdtbl/examples/chess_board.roff groff-1.21/contrib/hdtbl/examples/chess_board.roff
--- groff-1.20.1/contrib/hdtbl/examples/chess_board.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/chess_board.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,14 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
+.
 .time start
+.
 .nr *x 8
 .de r1
 .TR height=1.6c 
diff -ruN groff-1.20.1/contrib/hdtbl/examples/color_boxes.roff groff-1.21/contrib/hdtbl/examples/color_boxes.roff
--- groff-1.20.1/contrib/hdtbl/examples/color_boxes.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/color_boxes.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,13 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
+.
 .H Horizontal Rules and Boxes .br with Randomly Colored Border and Background
 .PN 25 Text before horizontal rule.
 .TBL border=.5n bc=green bgc=red width=7c tal=c csp=.2n cpd=.3n .TR .TD .ETB
diff -ruN groff-1.20.1/contrib/hdtbl/examples/color_nested_tables.roff groff-1.21/contrib/hdtbl/examples/color_nested_tables.roff
--- groff-1.20.1/contrib/hdtbl/examples/color_nested_tables.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/color_nested_tables.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,14 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
+.
 .time start
+.
 .PN 15 Text before first table.
 .nr # 0 1
 *****
diff -ruN groff-1.20.1/contrib/hdtbl/examples/color_table_cells.roff groff-1.21/contrib/hdtbl/examples/color_table_cells.roff
--- groff-1.20.1/contrib/hdtbl/examples/color_table_cells.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/color_table_cells.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,13 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
+.
 .H Horizontal Rules and Randomly Colored Table Cells
 .PN 15 Text before HR.
 .TBL border=.5n bc=green bgc=red width=7c tal=c csp=.2n cpd=.3n .TR .TD .ETB
diff -ruN groff-1.20.1/contrib/hdtbl/examples/color_transitions.roff groff-1.21/contrib/hdtbl/examples/color_transitions.roff
--- groff-1.20.1/contrib/hdtbl/examples/color_transitions.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/color_transitions.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,13 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
+.
 .de ctab
 .nr #cc 0
 .PN 21 ".nr #cc +.05f" ".defcolor \En[t*#] rgb \\$1 \\$2 \\$3" ".TBL border= csp=0 cpd=.5n bgc=\\\\n[t*#] bc=" .TR .TD
diff -ruN groff-1.20.1/contrib/hdtbl/examples/col_rowspan_colors.roff groff-1.21/contrib/hdtbl/examples/col_rowspan_colors.roff
--- groff-1.20.1/contrib/hdtbl/examples/col_rowspan_colors.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/col_rowspan_colors.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,13 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
+.
 .de color#
 .nr # +1
 .random#
@@ -57,7 +63,7 @@
 .   color#
 .   as html " \\*[help] ".TR height=\\nW" ".TD colspan=\\nI bgc=c\\n#"
 .\}
-.P1 \\*[html]
+.t*P1 \\*[html]
 ..
 .
 .pv 1.2 1.2 "" x
diff -ruN groff-1.20.1/contrib/hdtbl/examples/common.roff groff-1.21/contrib/hdtbl/examples/common.roff
--- groff-1.20.1/contrib/hdtbl/examples/common.roff	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/common.roff	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,342 @@
+.\"	-*-	mode: roff	-*-
+.ig
+
+common.roff
+
+This file is part of groff, the GNU roff type-setting system.
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+..
+.
+.
+.mso hdtbl.tmac\"			load table macros
+.
+.\"	******************************************************************
+.\"	**	Some macros and the page setup used by the examples	**
+.\"	******************************************************************
+.
+.\"	******************************************************************
+.\"	**	some of the following macros use system commands	**
+.\"	**	and are therefore `unsafe': they need the `-U' argument **
+.\"	**	when calling groff/troff				**
+.\"	******************************************************************
+.
+.\"	******************************************************************
+.\"	**		Header macro for the examples			**
+.\"	******************************************************************
+.de H
+.  nr *w* (17 * \w\\$* / 10 + 4n)
+.  TBL border=1n \
+       bc=yellow \
+       bgc=red4 \
+       fgc=yellow \
+       csp=0 \
+       fst=TB \
+       "fsz=1.7 1.5" \
+       hal=c \
+       tal=c \
+       "width=(\\n[*w*]+4n)<?\n[.l]"
+.  TR .TD
+.  t*P1 \\$*
+.  ETB
+.  SP
+..
+.
+.
+.\"	******************************************************************
+.\"	**	Utility macro for the date, requires UNIX date.		**
+.\"	**	after return string *date contains the date in the	**
+.\"	**	standard form of the Unix date-command,			**
+.\"	**	for example "Sun Dec  5 22:27:57     2004"		**
+.\"	******************************************************************
+.de date
+.  pso bash -c "echo -n .ds *date\ ;date"
+.  tm \\*[*date] ***
+..
+.
+.
+.\"	******************************************************************
+.\"	**	Utility macro for time measurement, requires UNIX date	**
+.\"	**	.time s[tart]|[end]					**
+.\"	**		.time start:					**
+.\"	**			reg *time gets the start-time (seconds) **
+.\"	**		.time [end]:					**
+.\"	**			reg *time gets the difference of the	**
+.\"	**				end- and start-time (seconds)	**
+.\"	******************************************************************
+.de time
+.  ds * \\$1\"
+.  substring * 0 0
+.  ie "\\*[*]"s" \
+.    pso bash -c "echo -n .nr *time 0+;date +%s"
+.  el \{\
+.   pso bash -c "echo -n .nr *time -;date +%s"
+.   nr *time 0-\\n[*time]
+.   tm elapsed time: \\n[*time] seconds
+.  \}
+..
+.
+.
+.\"	******************************************************************
+.\"	**		Perform n-times all the arbitrary arguments	**
+.\"	**		.PN n a2 a3 ...					**
+.\"	**			PN is nestable				**
+.\"	******************************************************************
+.de PN
+.  nr *pn +1
+.  nr PN\\n[*pn] (\\$1 + 1) 1
+.  shift
+.
+.  while \\n-[PN\\n[*pn]] \
+.    t*P1 \\$@
+.
+.  nr *pn -1
+..
+.
+.
+.\"	Utility macro:	.d2x decimal_number [base [string_name]]
+.\"
+.\"		Convert `decimal_number' to another base `base' (in the
+.\"		range 1..16) and store the result in string `string_name'.
+.\"		If `base' is missing or empty, convert to a hexadecimal
+.\"		number.  If `string_name' is missing or empty, return value
+.\"		in string `hex#', otherwise return the value in both
+.\"		`string_name' and `hex#'.
+.\"
+.\"		The base value 1 is handled specially: The returned
+.\"		string contains the character `|' `decimal_number' times
+.\"		(for example, input value 4 yields `||||').
+.ds d2x-0 0\"
+.ds d2x-1 1\"
+.ds d2x-2 2\"
+.ds d2x-3 3\"
+.ds d2x-4 4\"
+.ds d2x-5 5\"
+.ds d2x-6 6\"
+.ds d2x-7 7\"
+.ds d2x-8 8\"
+.ds d2x-9 9\"
+.ds d2x-10 A\"
+.ds d2x-11 B\"
+.ds d2x-12 C\"
+.ds d2x-13 D\"
+.ds d2x-14 E\"
+.ds d2x-15 F\"
+.
+.
+.de d2x
+.  if !\B\\$1 \{\
+.    tm \\n[.F]:\\n[.c]: invalid or missing first argument
+.    tm1 "     usage: `.d2x decimal_number [base [string_name]]'
+.    return
+.  \}
+.
+.  nr i# (-1) 1
+.  nr j# 1
+.  ds hex#
+.  nr dec# (\\$1) 1
+.
+.  if !\\$1 \
+.    nr dec# (-\\n[dec#])
+.
+.  ie !"\\$2"" \{\
+.    ie !\B\\$2 \
+.      tm \\n[.F]:\\n[.c]: invalid base `\\$2'
+.    el \
+.      ie ((\\$2 < 1) : (\\$2 > 16)) \
+.        tm \\n[.F]:\\n[.c]: invalid base `\\$2'
+.      el \
+.        nr b# \\$2
+.  \}\}
+.  el \
+.    nr b# 16
+.
+.  nr xb# 1
+.
+.  ie (\\n[b#] == 1) \{\
+.    nr dec# +1
+.    while \\n-[dec#] \
+.      as hex# |\"
+.  \}
+.  el \{\
+.    while (\\n[dec#] - \\n[xb#]) \{\
+.      nr xb# (\\n[xb#] * \\n[b#])
+.      nr j# +1
+.    \}
+.
+.    while (\\n+[i#] < \\n[j#]) \{\
+.      nr ** (\\n[dec#] / \\n[xb#])
+.      as hex# \\*[d2x-\\n[**]]\"
+.      nr dec# (\\n[dec#] - (\\n[xb#] * \\n[**]))
+.      nr xb# (\\n[xb#] / \\n[b#])
+.    \}
+.  \}
+.
+.  \" strip leading zero, if any
+.  ds * \\*[hex#]\"
+.  substring * 0 0
+.  if "\\*[*]"0" \
+.    substring hex# 1 -1
+.
+.  if (\\$1 < 0) \
+.    ds hex# -\\*[hex#]\"
+.
+.  if !"\\$3"" \{\
+.    ie !\A\\$3 \
+.      tm \\n[.F]:\\n[.c]: invalid string name `\\$3'
+.    el \
+.      ds \\$3 \\*[hex#]\"
+.  \}
+..
+.
+.
+.\"	Utility macro:	.random#
+.\"			.random-seed seed1 seed2
+.\"
+.\"		Return pseudo-random numbers in the range 0..0xFFFFFF,
+.\"		represented as the concatenation of `#' and six
+.\"		hexadecimal digits, in the string `#random'.  The
+.\"		macro `random-seed' can be used to set seed values,
+.\"		which should be integers in the range 1..2147483562 and
+.\"		1..2147483398 for `seed1' and `seed2', respectively
+.\"		(the macro applies a modulo operation to assure this
+.\"		range).  If `random-seed' isn't called the registers
+.\"		`seconds', `minutes', `hours', `dy', `mo', `year', and
+.\"		`$$' are used to compute it.
+.\"
+.\"		The used generator is presented in L'Ecuyer's 1988 paper
+.\"		`Efficient and Portable Combined Random Number
+.\"		Generators', which combines two Multiplicative Linear
+.\"		Congruential Generators (MLCGs) to achieve a period of
+.\"		2.3*10^18.
+.af hours 00
+.af minutes 00
+.af seconds 00
+.af year 0000
+.af mo 00
+.af dy 00
+.
+.ds random-s1 \n[minutes]\n[seconds]\n[$$]\n[hours]\"
+.\" prevent overflow
+.substring random-s1 0 8
+.
+.nr random-s1 (\*[random-s1] % 2147483562)
+.nr random-s2 \n[dy]\n[year]\n[mo]
+.
+.
+.de random-seed
+.  if !(\\n[.$] == 2) \{\
+.    tm1 "random-seed: Invalid number of arguments.
+.    tm1 "             usage: `.random-seed seed1 seed2'
+.    return
+.  \}
+.
+.  nr random-s1 (\\$1 % 2147483562)
+.  nr random-s2 (\\$2 % 2147483398)
+..
+.
+.
+.de random#
+.  nr * (\\n[random-s1] / 53668)
+.  nr random-s1 (40014 * (\\n[random-s1] - (\\n[*] * 53668)) \
+                - (\\n[*] * 12211))
+.  if !\\n[random-s1] \
+.    nr random-s1 +2147483563
+.
+.  nr * (\\n[random-s2] / 52774)
+.  nr random-s2 (40692 * (\\n[random-s2] - (\\n[*] * 52774)) \
+                - (\\n[*] * 3791))
+.  if !\\n[random-s2] \
+.    nr random-s2 +2147483399
+.
+.  nr * (\\n[random-s1] - \\n[random-s2])
+.  if (\\n[*] < 1) \
+.    nr * +2147483562
+.
+.  \" reduce the result to the leftmost 24 bits
+.  nr * (\\n[*] / 128)
+.
+.  d2x \\n[*]
+.  ds hex# 000000\\*[hex#]\"
+.  substring hex# -6
+.  ds #random #\\*[hex#]\"
+..
+.
+.
+.\"	******************************************************************
+.\"	**			minimal Page setup			**
+.\"	******************************************************************
+.
+.nr s \n[.ps]
+.nr v \n[.v]
+.nr p \n[.p]
+.nr o \n[.o]
+.pv 1.2 1.2 "" X
+.nr l 6.6i				\"	set text width
+.ll \n[t*l]u
+.nr o 2c				\"	set offset
+.po \n[o]u
+.nr p 29.7c				\"	set paper length (A4)
+.pl \n[p]u
+.nr tH 1i				\"	set top margin
+.sp |\n[tH]u
+.
+.ds t*HM //arbitrary text for page header, except on the first page//\"
+.ds t*BM //arbitrary text for page footer, except on the last page/\\n[%]/\"
+.
+.ev 99
+.lt \n[t*l]u
+.ev
+.
+.
+.de HM
+.  sp |.5i				\"	print header in top margin
+.  tl \\*[t*HM]
+.  sp |\\n[tH]u
+.  ev
+..
+.
+.
+.de BM
+.  ev 99
+.  sp |(\\n[p]u - .5i)			\"	print footer in bottom margin
+.  tl \\*[t*BM]
+.  bp
+..
+.
+.
+.de EM
+.  rm BM			\"	no page number at bottom of last page
+.  t*EM
+..
+.
+.
+.wh 0 HM
+.wh 0-1.5i BM
+.em EM
+.
+.\" Some packages (-mm) define their own .SP macro.
+.\" Use ours if another one isn't already available.
+.if !d SP .als SP t*SP
+.
+.if "\n[.m]"" \
+.  gcolor black
+.if "\n[.M]"" \
+.  fcolor white
+.
+.\" EOF
diff -ruN groff-1.20.1/contrib/hdtbl/examples/fonts_n.in groff-1.21/contrib/hdtbl/examples/fonts_n.in
--- groff-1.20.1/contrib/hdtbl/examples/fonts_n.in	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/fonts_n.in	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -34,6 +34,11 @@
 .\"	**		without arg: glyphs and codes of active font.	**
 .\"	******************************************************************
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
 .
 .if !d fontpath \
@@ -67,7 +72,7 @@
 .        continue 
 .    \}
 .
-.    index "\\*[*f]" \\*[*$1]
+.    t*index "\\*[*f]" \\*[*$1]
 .
 .    ie (\\n[.y] > 18) \
 .      if !F \\*[*$1] \{\
@@ -75,7 +80,7 @@
 .        continue 
 .      \}
 .    el \{\
-.      if !\\n[index] \{\
+.      if !\\n[t*index] \{\
 .        tm \\n[.F]:\\n[.c]: Font \\*[*$1] not found.
 .        continue 
 .      \}
diff -ruN groff-1.20.1/contrib/hdtbl/examples/fonts_x.in groff-1.21/contrib/hdtbl/examples/fonts_x.in
--- groff-1.20.1/contrib/hdtbl/examples/fonts_x.in	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/fonts_x.in	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -34,6 +34,11 @@
 .\"	**		without arg: glyphs and codes of active font.	**
 .\"	******************************************************************
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
 .
 .if !d fontpath \
@@ -67,7 +72,7 @@
 .        continue
 .    \}
 .
-.    index "\\*[*f]" \\*[*$1]
+.    t*index "\\*[*f]" \\*[*$1]
 .
 .    ie (\\n[.y] > 18) \
 .      if !F \\*[*$1] \{\
@@ -75,7 +80,7 @@
 .        continue
 .      \}
 .    el \{\
-.      if !\\n[index] \{\
+.      if !\\n[t*index] \{\
 .        tm \\n[.F]:\\n[.c]: Font \\*[*$1] not found.
 .        continue
 .      \}
diff -ruN groff-1.20.1/contrib/hdtbl/examples/mixed_pickles.roff groff-1.21/contrib/hdtbl/examples/mixed_pickles.roff
--- groff-1.20.1/contrib/hdtbl/examples/mixed_pickles.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/mixed_pickles.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,6 +23,11 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
 .
 .H Table with Mixed Content: \
diff -ruN groff-1.20.1/contrib/hdtbl/examples/rainbow.roff groff-1.21/contrib/hdtbl/examples/rainbow.roff
--- groff-1.20.1/contrib/hdtbl/examples/rainbow.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/rainbow.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,6 +23,11 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
 .
 .nr *n 25
@@ -33,7 +38,7 @@
 .  PN \\$1 \
      ".nr #cc +(1f / \\$1)" \
      ".defcolor \En[t*#] rgb \\$2 \\$3 \\$4" \
-     ".TBL csp=\n[l]/(12*\\$1+2) border= cpd=0 bgc=\\\\n[t*#] bc=" \
+     ".TBL csp=\n[t*l]/(12*\\$1+2) border= cpd=0 bgc=\\\\n[t*#] bc=" \
        ".if (\\\\n+[*#] == 1) \
           .CPTN Rainbow Colors \[em] Nested Tables with Colored Backgrounds \
                 val=b" \
@@ -64,7 +69,7 @@
 .  PN \\$1 \
      ".nr #cc +(1f / \\$1)" \
      ".defcolor \En[t*#] rgb \\$2 \\$3 \\$4" \
-     ".TBL border=\n[l]/(12*\\$1+2) csp=0 cpd=0 bc=\\\\n[t*#] bgc=" \
+     ".TBL border=\n[t*l]/(12*\\$1+2) csp=0 cpd=0 bc=\\\\n[t*#] bgc=" \
        ".if (\\\\n+[*#] == 1) \
           .CPTN Rainbow Colors \[em] Nested Tables with Colored Borders \
                 val=b" \
diff -ruN groff-1.20.1/contrib/hdtbl/examples/short_reference.roff groff-1.21/contrib/hdtbl/examples/short_reference.roff
--- groff-1.20.1/contrib/hdtbl/examples/short_reference.roff	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/hdtbl/examples/short_reference.roff	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -23,7 +23,13 @@
 
 ..
 .
+.if !d sopath \
+.  ds sopath
+.
+.so \*[sopath]examples/common.roff
+.
 .time start
+.
 .pv 1.2 1.2 "" x
 .H Short Reference for the HDtbl-Macros
 This Short Reference describes the Heidelberger Table Macros
diff -ruN groff-1.20.1/contrib/hdtbl/groff_hdtbl.man groff-1.21/contrib/hdtbl/groff_hdtbl.man
--- groff-1.20.1/contrib/hdtbl/groff_hdtbl.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/hdtbl/groff_hdtbl.man	2010-12-31 08:33:09.000000000 +0100
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 2005, 2006, 2008, 2009
+Copyright (C) 2005, 2006, 2008, 2009, 2010
   Free Software Foundation, Inc.
 
 Written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>
@@ -192,7 +192,7 @@
 On the other hand, table processing with
 .B hdtbl
 is much slower than using the
-.BR tbl (@MAN1EXT)
+.BR tbl (@MAN1EXT@)
 preprocessor.
 .
 A further advantage is that the HTML-like syntax of
@@ -897,6 +897,30 @@
 .
 .SH HDTBL CUSTOMIZATION
 .
+.PP
+Before creating the first table,
+you should configure default values
+to minimize the markup
+needed in each table.
+The following example
+sets up defaults
+suitable for typical papers:
+.PP
+.RS
+.nf
+.CR ".ds t*bgc white\e\[dq] background color
+.CR ".ds t*fgc black\e\[dq] foreground color
+.CR ".ds t*bc black\e\[dq]  border color
+.CR ".nr t*cpd 0.1n\e\[dq]  cell padding
+.fi
+.RE
+.PP
+The file
+.B examples/common.roff
+provides another example setup
+in the ``minimal Page setup'' section.
+.
+.PP
 A table which does not fit on a partially filled page is printed
 automatically on the top of the next page if you append the little
 utility macro
@@ -919,17 +943,29 @@
 macro package.
 .
 .PP
-.B hdtbl
-has built-in page header and page footer macros,
-.B HM
-and
-.BR BM .
-If they interfere with your own header and footer macros, simply
-say
-.CR ".rm\ HM"
-and
-.CR ".rm\ BM"
-to remove them.
+The macro
+.CR t*EM
+checks for held or kept tables,
+and for missing
+.CR ETB
+macros (table not closed).
+You can append this macro
+to the ``end'' macro of your document's main macro package.
+For example:
+.
+.PP
+.RS
+.nf
+.CR ".am pg@end-text"
+.CR ".  t*EM"
+.CR ".."
+.fi
+.RE
+.
+.PP
+If you use the
+.B ms
+macro package.
 .
 .
 .SH AUTHOR
diff -ruN groff-1.20.1/contrib/hdtbl/hdmisc.tmac groff-1.21/contrib/hdtbl/hdmisc.tmac
--- groff-1.20.1/contrib/hdtbl/hdmisc.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/hdtbl/hdmisc.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -26,7 +26,7 @@
 .
 .\" %beginstrip%
 .
-.if d getarg \
+.if d t*getarg \
 .  nx
 .
 .
@@ -68,7 +68,7 @@
 .\"
 .\"		sets string `ddd' to value `=', and `args' contains
 .\"		`aaa=xxx bbb eee'.
-.de getarg
+.de t*getarg
 .  ds \\$1
 .  ds args
 .
@@ -145,13 +145,13 @@
 .
 .\"	Utility macro:	.index <string1> <string2>
 .\"
-.\"		Check whether <string2> is a substring of <string2> and
-.\"		return its position in number register `index', starting
+.\"		Check whether <string2> is a substring of <string1> and
+.\"		return its position in number register `t*index', starting
 .\"		with 1.  If not found, return 0.  If <string2> is empty,
-.\"		set `index' to -999.
-.de index
+.\"		set `t*index' to -999.
+.de t*index
 .  if "\\$2"" \{\
-.    nr index -999
+.    nr t*index -999
 .    return
 .  \}
 .
@@ -168,23 +168,23 @@
 .  \}
 .
 .  ie (\\n[*] == \\n[**]) \
-.    nr index 0
+.    nr t*index 0
 .  el \
-.    nr index (\\n[*] + 1)
+.    nr t*index (\\n[*] + 1)
 ..
 .
 .
 .\"	******************************************************************
-.\"	********	non-accumulating space .SP [v]		**********
+.\"	********	non-accumulating space .t*SP [v]	**********
 .\"	**                                                              **
 .\"	**	nl vor erster Seite -1, oben auf Seite 0 resp. tH	**
 .\"	**	.k nach .sp oder .br 0,					**
 .\"	**		sonst Laenge der angefangenen Zeile		**
-.\"	**	Der Merker M# fuer vorangegangenes .SP wird in .HM am	**
+.\"	**	Der Merker M# fuer vorangegangenes .t*SP wird in .HM am	**
 .\"	**	Seitenanfang zurueckgesetzt.				**
 .\"	**	ganz richtig ist .sp + .br = .br + .sp = .sp		**
 .\"	******************************************************************
-.de SP
+.de t*SP
 .  if (\\n[nl] < 0) \
 .    br			\"	start very first page
 .  nr * \\n[.p]		\"	save current page length
@@ -194,7 +194,7 @@
 .  el \
 .    pl +\\$1		\"	otherwise use \\$1
 .
-.  nr ** (\\n[.p] - \\n[*])	\" ** now holds arg for .SP in base units
+.  nr ** (\\n[.p] - \\n[*])	\" ** now holds arg for .t*SP in base units
 .  pl \\n[*]u		\"	restore page length
 .
 .  \" we do nothing at start of new page or column
@@ -205,7 +205,7 @@
 .    \}
 .    el \{\
 .      if (\\n[**] - \\n[S#]) \{\
-.        sp (\\n[**]u - \\n[S#]u)\"	emit difference to previous .SP
+.        sp (\\n[**]u - \\n[S#]u)\"	emit difference to previous .t*SP
 .        nr S# \\n[**]	\"	store ** in S#
 .    \}\}
 .
@@ -218,7 +218,7 @@
 .\"	**		Perform all arguments once			**
 .\"	**			P1 is nestable				**
 .\"	******************************************************************
-.de P1
+.de t*P1
 .  \" `while' command is about five times faster than recursion!
 .  while \\n[.$] \{\
 .    nop \\$1
@@ -229,22 +229,27 @@
 .
 .\"	******************************************************************
 .\"	**	Hilfsmakro zum Einstellen von Schriftgroesse und	**
-.\"	**	Zeilenabstand, bezogen auf Anfangswerte \n[s] und \n[v]	**
-.\"	**	sowie fuer Hyphenation:					**
+.\"	**	Zeilenabstand, bezogen auf Anfangswerte \n[t*s]		**
+.\"	**	und \n[t*v] sowie fuer Hyphenation:			**
 .\"	**		.pv s v hy# hart;  macht .br			**
 .\"	**	Bei 4. Argument setzen der Register s und v und hy.	**
 .\"	**	Fuer angefangene Zeile die vorgefundenen Einstellungen	**
+.\"	**								**
+.\"	**   Auxiliary macro to set internal registers for font size	**
+.\"	**   and line spacing, relative to initial values \n[t*s] and	**
+.\"	**   \n[t*v]. Optionally sets hyphenation. A fourth argument	**
+.\"	**   initializes internal registers to global default values.	**
 .\"	******************************************************************
-.de pv
+.de t*pv
 .  br
 .
 .  if \\n[.$] \
-.    ps (\\n[s]u * \\$1z / 1z)
+.    ps (\\n[t*s]u * \\$1z / 1z)
 .
 .  ie (\\n[.$] - 1) \
-.    vs (\\n[v]u * \\$2p / 1p)
+.    vs (\\n[t*v]u * \\$2p / 1p)
 .  el \{\
-.    vs (\\n[v]u * \\$1p / 1p)
+.    vs (\\n[t*v]u * \\$1p / 1p)
 .    return
 .  \}
 .
@@ -252,9 +257,9 @@
 .    hy \\$3
 .
 .  if !""\\$4" \{\
-.    nr v \\n[.v]
-.    nr s \\n[.ps]
-.    nr hy \\n[.hy]
+.    nr t*v \\n[.v]
+.    nr t*s \\n[.ps]
+.    nr t*hy \\n[.hy]
 .  \}
 ..
 .
@@ -289,9 +294,9 @@
 .
 .
 .\"	******************************************************************
-.\"	**		processs diversion				**
+.\"	**		process diversion				**
 .\"	******************************************************************
-.de DI
+.de t*DI
 .  nr * \\n[.u]
 .  nf		\"	diversion is already formatted - output it unchanged
 .  \\$1		\"	output the diversion ...
@@ -300,298 +305,10 @@
 .    fi		\"	reactivate formatting
 ..
 .
-.
-.\"	******************************************************************
-.\"	**	Some macros and the page setup used by the examples	**
-.\"	******************************************************************
-.
-.\"	******************************************************************
-.\"	**	some of the following macros use system commands	**
-.\"	**	and are therefore `unsafe': they need the `-U' argument **
-.\"	**	when calling groff/troff				**
 .\"	******************************************************************
-.
-.\"	******************************************************************
-.\"	**		Header macro for the examples			**
-.\"	******************************************************************
-.de H
-.  nr *w* (17 * \w\\$* / 10 + 4n)
-.  TBL border=1n \
-       bc=yellow \
-       bgc=red4 \
-       fgc=yellow \
-       csp=0 \
-       fst=TB \
-       "fsz=1.7 1.5" \
-       hal=c \
-       tal=c \
-       "width=(\\n[*w*]+4n)<?\n[.l]"
-.  TR .TD
-.  P1 \\$*
-.  ETB
-.  SP
-..
-.
-.
-.\"	******************************************************************
-.\"	**	Utility macro for the date, requires UNIX date.		**
-.\"	**	after return string *date contains the date in the	**
-.\"	**	standard form of the Unix date-command,			**
-.\"	**	for example "Sun Dec  5 22:27:57     2004"		**
-.\"	******************************************************************
-.de date
-.  pso bash -c "echo -n .ds *date\ ;date"
-.  tm \\*[*date] ***
-..
-.
-.
-.\"	******************************************************************
-.\"	**	Utility macro for time measurement, requires UNIX date	**
-.\"	**	.time s[tart]|[end]					**
-.\"	**		.time start:					**
-.\"	**			reg *time gets the start-time (seconds) **
-.\"	**		.time [end]:					**
-.\"	**			reg *time gets the difference of the	**
-.\"	**				end- and start-time (seconds)	**
-.\"	******************************************************************
-.de time
-.  ds * \\$1\"
-.  substring * 0 0
-.  ie "\\*[*]"s" \
-.    pso bash -c "echo -n .nr *time 0+;date +%s"
-.  el \{\
-.   pso bash -c "echo -n .nr *time -;date +%s"
-.   nr *time 0-\\n[*time]
-.   tm elapsed time: \\n[*time] seconds
-.  \}
-..
-.
-.
+.\"	**		error checking at end				**
 .\"	******************************************************************
-.\"	**		Perform n-times all the arbitrary arguments	**
-.\"	**		.PN n a2 a3 ...					**
-.\"	**			PN is nestable				**
-.\"	******************************************************************
-.de PN
-.  nr *pn +1
-.  nr PN\\n[*pn] (\\$1 + 1) 1
-.  shift
-.
-.  while \\n-[PN\\n[*pn]] \
-.    P1 \\$@
-.
-.  nr *pn -1
-..
-.
-.
-.\"	Utility macro:	.d2x decimal_number [base [string_name]]
-.\"
-.\"		Convert `decimal_number' to another base `base' (in the
-.\"		range 1..16) and store the result in string `string_name'.
-.\"		If `base' is missing or empty, convert to a hexadecimal
-.\"		number.  If `string_name' is missing or empty, return value
-.\"		in string `hex#', otherwise return the value in both
-.\"		`string_name' and `hex#'.
-.\"
-.\"		The base value 1 is handled specially: The returned
-.\"		string contains the character `|' `decimal_number' times
-.\"		(for example, input value 4 yields `||||').
-.ds d2x-0 0\"
-.ds d2x-1 1\"
-.ds d2x-2 2\"
-.ds d2x-3 3\"
-.ds d2x-4 4\"
-.ds d2x-5 5\"
-.ds d2x-6 6\"
-.ds d2x-7 7\"
-.ds d2x-8 8\"
-.ds d2x-9 9\"
-.ds d2x-10 A\"
-.ds d2x-11 B\"
-.ds d2x-12 C\"
-.ds d2x-13 D\"
-.ds d2x-14 E\"
-.ds d2x-15 F\"
-.
-.
-.de d2x
-.  if !\B\\$1 \{\
-.    tm \\n[.F]:\\n[.c]: invalid or missing first argument
-.    tm1 "     usage: `.d2x decimal_number [base [string_name]]'
-.    return
-.  \}
-.
-.  nr i# (-1) 1
-.  nr j# 1
-.  ds hex#
-.  nr dec# (\\$1) 1
-.
-.  if !\\$1 \
-.    nr dec# (-\\n[dec#])
-.
-.  ie !"\\$2"" \{\
-.    ie !\B\\$2 \
-.      tm \\n[.F]:\\n[.c]: invalid base `\\$2'
-.    el \
-.      ie ((\\$2 < 1) : (\\$2 > 16)) \
-.        tm \\n[.F]:\\n[.c]: invalid base `\\$2'
-.      el \
-.        nr b# \\$2
-.  \}\}
-.  el \
-.    nr b# 16
-.
-.  nr xb# 1
-.
-.  ie (\\n[b#] == 1) \{\
-.    nr dec# +1
-.    while \\n-[dec#] \
-.      as hex# |\"
-.  \}
-.  el \{\
-.    while (\\n[dec#] - \\n[xb#]) \{\
-.      nr xb# (\\n[xb#] * \\n[b#])
-.      nr j# +1
-.    \}
-.
-.    while (\\n+[i#] < \\n[j#]) \{\
-.      nr ** (\\n[dec#] / \\n[xb#])
-.      as hex# \\*[d2x-\\n[**]]\"
-.      nr dec# (\\n[dec#] - (\\n[xb#] * \\n[**]))
-.      nr xb# (\\n[xb#] / \\n[b#])
-.    \}
-.  \}
-.
-.  \" strip leading zero, if any
-.  ds * \\*[hex#]\"
-.  substring * 0 0
-.  if "\\*[*]"0" \
-.    substring hex# 1 -1
-.
-.  if (\\$1 < 0) \
-.    ds hex# -\\*[hex#]\"
-.
-.  if !"\\$3"" \{\
-.    ie !\A\\$3 \
-.      tm \\n[.F]:\\n[.c]: invalid string name `\\$3'
-.    el \
-.      ds \\$3 \\*[hex#]\"
-.  \}
-..
-.
-.
-.\"	Utility macro:	.random#
-.\"			.random-seed seed1 seed2
-.\"
-.\"		Return pseudo-random numbers in the range 0..0xFFFFFF,
-.\"		represented as the concatenation of `#' and six
-.\"		hexadecimal digits, in the string `#random'.  The
-.\"		macro `random-seed' can be used to set seed values,
-.\"		which should be integers in the range 1..2147483562 and
-.\"		1..2147483398 for `seed1' and `seed2', respectively
-.\"		(the macro applies a modulo operation to assure this
-.\"		range).  If `random-seed' isn't called the registers
-.\"		`seconds', `minutes', `hours', `dy', `mo', `year', and
-.\"		`$$' are used to compute it.
-.\"
-.\"		The used generator is presented in L'Ecuyer's 1988 paper
-.\"		`Efficient and Portable Combined Random Number
-.\"		Generators', which combines two Multiplicative Linear
-.\"		Congruential Generators (MLCGs) to achieve a period of
-.\"		2.3*10^18.
-.af hours 00
-.af minutes 00
-.af seconds 00
-.af year 0000
-.af mo 00
-.af dy 00
-.
-.ds random-s1 \n[minutes]\n[seconds]\n[$$]\n[hours]\"
-.\" prevent overflow
-.substring random-s1 0 8
-.
-.nr random-s1 (\*[random-s1] % 2147483562)
-.nr random-s2 \n[dy]\n[year]\n[mo]
-.
-.
-.de random-seed
-.  if !(\\n[.$] == 2) \{\
-.    tm1 "random-seed: Invalid number of arguments.
-.    tm1 "             usage: `.random-seed seed1 seed2'
-.    return
-.  \}
-.
-.  nr random-s1 (\\$1 % 2147483562)
-.  nr random-s2 (\\$2 % 2147483398)
-..
-.
-.
-.de random#
-.  nr * (\\n[random-s1] / 53668)
-.  nr random-s1 (40014 * (\\n[random-s1] - (\\n[*] * 53668)) \
-                - (\\n[*] * 12211))
-.  if !\\n[random-s1] \
-.    nr random-s1 +2147483563
-.
-.  nr * (\\n[random-s2] / 52774)
-.  nr random-s2 (40692 * (\\n[random-s2] - (\\n[*] * 52774)) \
-                - (\\n[*] * 3791))
-.  if !\\n[random-s2] \
-.    nr random-s2 +2147483399
-.
-.  nr * (\\n[random-s1] - \\n[random-s2])
-.  if (\\n[*] < 1) \
-.    nr * +2147483562
-.
-.  \" reduce the result to the leftmost 24 bits
-.  nr * (\\n[*] / 128)
-.
-.  d2x \\n[*]
-.  ds hex# 000000\\*[hex#]\"
-.  substring hex# -6
-.  ds #random #\\*[hex#]\"
-..
-.
-.
-.\"	******************************************************************
-.\"	**			minimal Page setup			**
-.\"	******************************************************************
-.
-.nr s \n[.ps]
-.nr v \n[.v]
-.pv 1.2 1.2 "" X
-.nr l 6.6i				\"	set text width
-.ll \n[l]u
-.nr o 2c				\"	set offset
-.po \n[o]u
-.nr p 29.7c				\"	set paper length (A4)
-.pl \n[p]u
-.nr tH 1i				\"	set top margin
-.sp |\n[tH]u
-.
-.ev 99
-.lt \n[l]u
-.ev
-.
-.
-.de HM
-.  sp |.5i				\"	print header in top margin
-.  tl \\*[t*HM]
-.  sp |\\n[tH]u
-.  ev
-..
-.
-.
-.de BM
-.  ev 99
-.  sp |(\\n[p]u - .5i)			\"	print footer in bottom margin
-.  tl \\*[t*BM]
-.  bp
-..
-.
-.
-.de EM
-.  rm BM			\"	no page number at bottom of last page
+.de t*EM
 .
 .  if !"\\*[t*kept]"" \{\
 .    tm1 "hdtbl: Not all tables have been printed.
@@ -602,17 +319,7 @@
 .    tm1 "       Add `.t*free' at the end of your document.
 .  \}
 .  if \\n[t*#] \
-.    tm hdtbl: Missing `.ETB' macro at end of document.
+.    tm hdtbl: Missing `.ETB' macro; last .TBL in \\*[t*FN] at line \\*[t*LN].
 ..
 .
-.
-.em EM
-.
-.if "\n[.m]"" \
-.  gcolor black
-.if "\n[.M]"" \
-.  fcolor white
-.
-.mso hdtbl.tmac\"			load table macros
-.
 .\" EOF
diff -ruN groff-1.20.1/contrib/hdtbl/hdtbl.tmac groff-1.21/contrib/hdtbl/hdtbl.tmac
--- groff-1.20.1/contrib/hdtbl/hdtbl.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/hdtbl/hdtbl.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute it and/or modify it under
@@ -35,14 +35,6 @@
 .mso hdmisc.tmac
 .mso 62bit.tmac
 .
-.wh 0 HM	\"	comment this out if a page header macro exists
-.wh -1i BM	\"	comment this out if a bottom margin macro exists
-.
-.\" replace `HM' with the name of your pageheader macro, e.g., `pg@top' for MS
-.am HM
-.  t*hm
-..
-.
 .
 .\"	*****************************************************************
 .\"	*		default values for some arguments		*
@@ -63,21 +55,20 @@
 .nr t*csp .5n
 .nr t*b .1n
 .nr t*cols 1
+.nr t*v \n[.v]
+.nr t*s \n[.ps]
+.nr t*hy \n[.hy]
+.nr t*l \n[.ll]
 .
 .
 .\"			defaults for table captions
 .nr t*cptn 0 1
 .ds t*cptn "".sp .4" \
-            ".pv 1.4 1.4" \
+            ".t*pv 1.0 1.0" \
             ".ad l" \
             "\m[\\*[t*fgc]]Table \\n+[t*cptn]:\0\c\k*"\"
 .
 .
-.\"			Running title, running footer
-.ds t*HM //arbitrary text for pageheader, except on the first page//\"
-.ds t*BM //arbitrary text for pagefooter, except on the last page/\\n[%]/\"
-.
-.
 .\" %beginstrip%
 .
 .\" for better error messages
@@ -120,7 +111,11 @@
 .  \}
 .  nr t*# +1
 .
-.  getarg cols \\$@\"	from here string `args' contains the rest of \\$@
+.  \" Save current location for error checking at end
+.  ds t*FN \\[.F]
+.  ds t*LN \\[.c]
+.
+.  t*getarg cols \\$@\"	from here string `args' contains the rest of \\$@
 .  ie "\\*[cols]"" \
 .    nr t*cols\\n[t*#] \\n[t*cols]
 .  el \{\
@@ -130,7 +125,7 @@
 .      tm \\n[.F]:\\n[.c]: Invalid number of columns value `\\*[cols]'.
 .  \}
 .
-.  getarg cpd \\*[args]                 \"	cell padding
+.  t*getarg cpd \\*[args]                 \"	cell padding
 .  ie "\\*[cpd]"" \
 .    nr t*cpd\\n[t*#] \\n[t*cpd]
 .  el \{\
@@ -140,7 +135,7 @@
 .      tm \\n[.F]:\\n[.c]: Invalid cell padding value `\\*[cpd]'.
 .  \}
 .
-.  getarg csp \\*[args]                 \"	cell spacing
+.  t*getarg csp \\*[args]                 \"	cell spacing
 .  ie "\\*[csp]"" \
 .    nr t*csp\\n[t*#] \\n[t*csp]
 .  el \{\
@@ -150,7 +145,7 @@
 .      tm \\n[.F]:\\n[.c]: Invalid cell spacing value `\\*[csp]'.
 .  \}
 .
-.  getarg border \\*[args]              \"	border thickness
+.  t*getarg border \\*[args]              \"	border thickness
 .  ie "\\*[border]"=" \
 .    nr t*b\\n[t*#] 0-1
 .  el \{\
@@ -163,7 +158,7 @@
 .        tm \\n[.F]:\\n[.c]: Invalid border thickness value `\\*[border]'.
 .  \}\}
 .
-.  getarg bc \\*[args]                  \"	border color
+.  t*getarg bc \\*[args]                  \"	border color
 .  ds t*bc\\n[t*#] \\*[t*bc]\"
 .  if !"\\*[bc]"" \{\
 .    ie m\\*[bc] \
@@ -183,14 +178,14 @@
 .      ds t*bc\\n[t*#] \\*[bc]\"
 .  \}
 .
-.  getarg width \\*[args]               \"	table/col widths
+.  t*getarg width \\*[args]               \"	table/col widths
 .  if "\\*[width]"=" \
 .    ds width
 .
 .  nr b/2\\n[t*#] (\\n[t*b\\n[t*#]] / 2)\"	shortcut
 .  nr cscp\\n[t*#] (\\n[t*csp\\n[t*#]] + \\n[t*cpd\\n[t*#]])\"  aux. register
 .
-.  getarg height \\*[args]              \"	table outline height
+.  t*getarg height \\*[args]              \"	table outline height
 .  ie "\\*[height]"" \
 .    nr t*height\\n[t*#] 0
 .  el \{\
@@ -205,7 +200,7 @@
 .  t*cl \\*[width]                      \"	get cell widths and offsets
 .  t*args \\n[t*#]                      \"	look for common arguments
 .
-.  getarg tal \\*[args]                 \"	table horizontal alignment
+.  t*getarg tal \\*[args]                 \"	table horizontal alignment
 .  if "\\*[tal]"" \
 .    ds tal \\*[t*tal]\"
 .  ie "\\*[tal]"l" \
@@ -224,7 +219,7 @@
 .  nr t*r#\\n[t*#] 0		        \"	initialize row index
 .  mk toptbl\\n[t*#]
 .
-.  P1 \\*[args]
+.  t*P1 \\*[args]
 ..
 .
 .
@@ -241,14 +236,14 @@
 .      return
 .    \}
 .
-.  getarg val \\$@
+.  t*getarg val \\$@
 .  ds args\\n[t*#] "\\*[args]\"
 .
-.  index "\\*[args]" .TR
-.  ie \\n[index] \{\
+.  t*index "\\*[args]" .TR
+.  ie \\n[t*index] \{\
 .    ds *a\\n[t*#] "\\*[args]\"
-.    substring args\\n[t*#] 0 \\n[index]
-.    substring *a\\n[t*#] \\n[index]-2 -1
+.    substring args\\n[t*#] 0 \\n[t*index]
+.    substring *a\\n[t*#] \\n[t*index]-2 -1
 .  \}
 .  el \
 .    ds *a\\n[t*#]
@@ -262,15 +257,15 @@
 .  el \{\
 .    ll (\\n[ll\\n[t*#]]u + \\n[in\\n[t*#]]u)
 .    in \\n[in\\n[t*#]]u
-.    P1 \\*[t*cptn]
+.    t*P1 \\*[t*cptn]
 '    in +\\n[*]u
-.    P1 \\*[args\\n[t*#]]
-.    pv 1 1
+.    t*P1 \\*[args\\n[t*#]]
+.    t*pv 1 1
 .    in
 .    mk toptbl\\n[t*#]
 .  \}
 .
-.  P1 \\*[*a\\n[t*#]]
+.  t*P1 \\*[*a\\n[t*#]]
 ..
 .
 .als *CPTN CPTN
@@ -296,7 +291,7 @@
 .  nr c#\\*[#t#r] 0 1			\"	clear cell counter
 .  nr dntr\\*[#t#r] 0 1			\"	clear accumulated row height
 .
-.  getarg height \\$@
+.  t*getarg height \\$@
 .  ie "\\*[height]"" \
 .    nr t*height\\*[#t#r] 0
 .  el \{\
@@ -310,7 +305,7 @@
 .  \"	is too high by 3/2 b, independent of the number of TR with `height'.
 .  t*args \\*[#t#r] \\n[t*#]            \"	look for common arguments
 .
-.  P1 \\*[args]
+.  t*P1 \\*[args]
 ..
 .
 .
@@ -322,15 +317,15 @@
 .\"		else like .TD
 .de TH
 .  ft 1
-.  getarg hal \\$@
+.  t*getarg hal \\$@
 .  if "\\*[hal]"" \
 .    ds hal c\"
 .
-.  getarg val \\*[args]
+.  t*getarg val \\*[args]
 .  if "\\*[val]"" \
 .    ds val m\"
 .
-.  getarg fst \\*[args]
+.  t*getarg fst \\*[args]
 .  if "\\*[fst]"" \
 .    ds fst B\"
 .
@@ -349,7 +344,7 @@
 .  ds *#trc* \\*[#t#r]*\\n[c#\\*[#t#r]]\"	table cell identifier
 .					\"	(<level>*<row>*<column>)
 .
-.  getarg rowspan \\$@
+.  t*getarg rowspan \\$@
 .  nr rowspan 1
 .  if !"\\*[rowspan]"" \{\
 .    ie \B\\*[rowspan] \{\
@@ -360,7 +355,7 @@
 .      tm \\n[.F]:\\n[.c]: Invalid value of `rowspan' keyword.
 .  \}
 .
-.  getarg colspan \\*[args]
+.  t*getarg colspan \\*[args]
 .  nr colspan 1
 .  if !"\\*[colspan]"" \{\
 .    ie \B\\*[colspan] \
@@ -434,9 +429,9 @@
 .  ad \\*[t*hal\\*[#trc]]
 .  fam \\*[t*ff\\*[#trc]]
 .  ft \\*[t*fst\\*[#trc]]
-.  pv \\*[t*fsz\\*[#trc]]
+.  t*pv \\*[t*fsz\\*[#trc]]
 .
-.  P1 \\*[args]
+.  t*P1 \\*[args]
 ..
 .
 .
@@ -467,16 +462,16 @@
 .  in 0                          \"	reset indent
 .  gcolor \\*[t*m\\n[t*#]]       \"	reset previous fgc
 .
-.  getarg hold \\$@
+.  t*getarg hold \\$@
 .  if !\\n[t*#] \{\
 .    sp .5
 .    di
 .    in \\n[t*i]u
 .    ie "\\*[hold]"" \{\
 .      ie (\\n[.t] - \\n[dn]) \
-.        DI t*tbl0
+.        t*DI t*tbl0
 .      el \{\
-.        rn t*tbl0 t*tbl\\n[t*numb]
+.        rn t*tbl0 t*tbl\\n+[t*numb]
 .        ds t*kept \\*[t*kept] t*tbl\\n[t*numb] \\n[dn]\"
 .      \}
 .    \}
@@ -489,7 +484,7 @@
 .    ev				\"	restore previous environment
 .  \}
 .
-.  P1 \\*[args]
+.  t*P1 \\*[args]
 ..
 .
 .
@@ -519,14 +514,14 @@
 .    return
 .  \}
 .
-.  nr ** (\\$1 >? 1)
+.  nr ** (\\$1 >? 1) 1
 .  while !""\\*[t*held]" \{\
 .    pops * t*held
 .    popr * t*held
 .
 .    ie (\\n[.t] - \\n[*]) \{\
 .      ev t*tbl
-.      DI \\*[*]
+.      t*DI \\*[*]
 .      ev
 .    \}
 .    el \{\
@@ -549,7 +544,7 @@
 .\"		Nested tables are processed from inside to outside.
 .
 .de t*divs
-.  ll (\\n[l]u + 1c)			\"	avoid warning `can't break line'
+.  ll (\\n[t*l]u + 1c)			\"	avoid warning `can't break line'
 .  nf
 .
 .  nr b/2 \\n[b/2\\n[t*#]]		\"	some abbreviations
@@ -899,7 +894,7 @@
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg bgc \\*[args]         \"	background color
+.  t*getarg bgc \\*[args]         \"	background color
 .  if !"\\*[bgc]"" \{\
 .    ie m\\*[bgc] \
 .      ds t*bgc\\$1 \\*[bgc]\"
@@ -912,7 +907,7 @@
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg fgc \\*[args]         \"	foreground color
+.  t*getarg fgc \\*[args]         \"	foreground color
 .  if !"\\*[fgc]"" \{\
 .    ie m\\*[fgc] \
 .      ds t*fgc\\$1 \\*[fgc]\"
@@ -925,22 +920,22 @@
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg hl \\*[args]          \"	horizontal line between cells
+.  t*getarg hl \\*[args]          \"	horizontal line between cells
 .  if !"\\*[hl]"" \
 .    ds t*hl\\$1 \\*[hl]\"
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg vl \\*[args]          \"	vertical line between cells
+.  t*getarg vl \\*[args]          \"	vertical line between cells
 .  if !"\\*[vl]"" \
 .    ds t*vl\\$1 \\*[vl]\"
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg hal \\*[args]         \"	horizontal table cell alignment
+.  t*getarg hal \\*[args]         \"	horizontal table cell alignment
 .  if !"\\*[hal]"" \{\
-.    index bcrl \\*[hal]
-.    ie \\n[index] \
+.    t*index bcrl \\*[hal]
+.    ie \\n[t*index] \
 .      ds t*hal\\$1 \\*[hal]\"
 .    el \{\
 .      tmc \\n[.F]:\\n[.c]: Invalid horizontal alignment `\\*[hal]':
@@ -949,10 +944,10 @@
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg val \\*[args]         \"	vertical table cell alignment
+.  t*getarg val \\*[args]         \"	vertical table cell alignment
 .  if !"\\*[val]"" \{\
-.    index tmb \\*[val]
-.    ie \\n[index] \
+.    t*index tmb \\*[val]
+.    ie \\n[t*index] \
 .      ds t*val\\$1 \\*[val]\"
 .    el \{\
 .      tmc \\n[.F]:\\n[.c]: Invalid vertical alignment `\\*[val]':
@@ -961,24 +956,26 @@
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg ff \\*[args]          \"	font family
+.  t*getarg ff \\*[args]          \"	font family
 .  if !"\\*[ff]"" \
 .    ds t*ff\\$1 \\*[ff]\"
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg fst \\*[args]         \"	font style
+.  t*getarg fst \\*[args]         \"	font style
 .  if !"\\*[fst]"" \
 .    ds t*fst\\$1 \\*[fst]\"
 .  if "\\*[args]"" \
 .    return
 .
-.  getarg fsz \\*[args]         \"	font size and spacing factor
+.  t*getarg fsz \\*[args]         \"	font size and spacing factor
 .  if !"\\*[fsz]"" \
 .    ds t*fsz\\$1 \\*[fsz]\"
 ..
 .
 .
+.\" Append to your page header macro ('pg@top' for MS)
+.\" to enable tables to span pages.
 .de t*hm
 .  ev t*tbl
 .  nr ** \\n[.t]
@@ -998,7 +995,7 @@
 .      break
 .    \}
 .
-.    DI \\*[*]
+.    t*DI \\*[*]
 .  \}
 .  ev
 ..
diff -ruN groff-1.20.1/contrib/hdtbl/Makefile.sub groff-1.21/contrib/hdtbl/Makefile.sub
--- groff-1.20.1/contrib/hdtbl/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/hdtbl/Makefile.sub	2010-12-31 08:33:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 #      Written by Werner Lemberg (wl@gnu.org)
 # 
 # This file is part of groff.
@@ -52,6 +52,7 @@
   examples/fonts_x.roff
 
 EXAMPLEFILES=\
+  examples/common.roff \
   examples/chess_board.roff \
   examples/color_boxes.roff \
   examples/color_nested_tables.roff \
@@ -90,7 +91,8 @@
 .SUFFIXES: .roff .in .ps
 
 .roff.ps:
-	$(GROFF) -Tps -dfontpath=$(top_srcdir)/font -mhdtbl $< >$@
+	$(GROFF) -Tps -dfontpath=$(top_srcdir)/font -dsopath=$(srcdir)/ \
+		 -mhdtbl $< >$@
 
 .in.roff:
 	sed -e "s|@fontdir@|$(fontdir)|" $< >$@
@@ -98,7 +100,7 @@
 
 all: $(PROCESSEDEXAMPLEFILES) stamp-strip
 
-$(PROCESSEDEXAMPLEFILES): gnu.eps examples/stamp
+$(PROCESSEDEXAMPLEFILES): gnu.eps examples/stamp examples/common.roff
 
 gnu.eps:
 	if test -f $(top_srcdir)/doc/gnu.eps; then \
diff -ruN groff-1.20.1/contrib/mm/ChangeLog groff-1.21/contrib/mm/ChangeLog
--- groff-1.20.1/contrib/mm/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mm/ChangeLog	2010-12-31 08:33:09.000000000 +0100
@@ -1,3 +1,64 @@
+Mon Dec 27 09:39:20 2010  Werner LEMBERG  <wl@gnu.org>
+
+	* groff_mm.man: Fix indentation.
+
+Thu Jun 24 12:43:27 2010  Tadziu Hoffmann  <hoffmann@usm.uni-muenchen.de>
+
+	* m.tmac (misc@pop-nr): Fix assignment.
+	Reported as
+	http://lists.gnu.org/archive/html/groff/2010-06/msg00096.html
+
+Sat Jun  5 08:06:21 2010  Larry Jones <lawrence.jones@siemens.com>
+
+	* m.tmac (\*[BU]): Always define.
+
+Sat Jun  5 08:00:10 2010  Larry Jones <lawrence.jones@siemens.com>
+
+	Improve compatibility.
+
+	* m.tmac (}b, }f, }p): Define aliases for orthogonality with the
+	already available }t, }e, and }o for page headers.
+
+Wed Jun  2 16:03:39 2010  Larry Jones <lawrence.jones@siemens.com>
+
+	Fix .EOP handling and non-numeric format of \n[P].
+
+	* m.tmac (pg@header): Set `.af' temporarily to numeric format.
+	(pg@print-footer): Disable vertical traps for call to .EOP also.
+
+Wed Jun  2 16:03:39 2010  Larry Jones <lawrence.jones@siemens.com>
+
+	* m.tmac (toc@entry): Use MM page number (\nP).
+
+Sun May 30 07:14:15 2010  Larry Jones  <lawrence.jones@siemens.com>
+
+	* m.tmac (P, nP): Fix handling of short paragraphs.
+	Otherwise,
+
+	  .H 1 Bug
+	  .P
+	  one
+	  .P
+	  two
+	  .P
+	  three
+
+	results in:
+
+	  1.  Bug
+
+	  one two three
+
+	whereas it should, of course, produce:
+
+	  1.  Bug
+
+	  one
+
+	  two
+
+	  three
+
 Sat Jan  3 08:55:15 2009  Werner LEMBERG  <wl@gnu.org>
 
 	* groff_mm.man: Use new `x' table modifier for all tables which use
@@ -792,7 +853,7 @@
 	* warnings for unimplemented macros
 
 Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-	  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+	  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
diff -ruN groff-1.20.1/contrib/mm/groff_mm.man groff-1.21/contrib/mm/groff_mm.man
--- groff-1.20.1/contrib/mm/groff_mm.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mm/groff_mm.man	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,6 @@
 '\" t
 .ig
-Copyright (C) 1989, 2000, 2001, 2002, 2003, 2006, 2007, 2009
+Copyright (C) 1989, 2000, 2001, 2002, 2003, 2006, 2007, 2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -582,7 +582,6 @@
 T}
 .TE
 .RE
-.RE
 .
 .TP
 .BI DL\  \fR[\fPtext-indent\  "\fR[\fP\fB1\fP \fR[\fP\fB1\fP\fR]]]\fP"
@@ -1146,6 +1145,7 @@
 The text is lined up with the first word of the heading.
 T}
 .TE
+.RE
 .
 .IP
 .B Centered section headings
@@ -2646,15 +2646,22 @@
 .TP
 .BI "VM \fR[\fP\-T\fR] [\fP" "top \fR[\fPbottom\fR]]\fP"
 Vertical margin.
-Adds extra vertical top and margin space.
-Option
+Increase the top and bottom margin by
+.I top
+and
+.IR bottom ,
+respectively.
+If option
 .B \-T
-sets the total space instead.
+is specified, set those margins to
+.I top
+and
+.IR bottom .
 If no argument is given, reset the margin to zero,
-or the default (`7v 5v') if
+or to the default (`7v 5v') if
 .B \-T
-has been used.
-It is higly recommended that macros
+is used.
+It is highly recommended that macros
 .B TP
 and/or
 .B EOP
diff -ruN groff-1.20.1/contrib/mm/mm/0.MT groff-1.21/contrib/mm/mm/0.MT
--- groff-1.20.1/contrib/mm/mm/0.MT	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mm/mm/0.MT	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2000, 2009
+Copyright (C) 1991-2000, 2009, 2010
   Free Software Foundation, Inc.
 mgm is written by Jörgen Hägg <jh@axis.com>
 
@@ -17,7 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Please send bugreports with examples to jh@axis.com.
+Please send bug reports with examples to bug-groff@gnu.org.
 ..
 .
 .\"------------
diff -ruN groff-1.20.1/contrib/mm/mm/4.MT groff-1.21/contrib/mm/mm/4.MT
--- groff-1.20.1/contrib/mm/mm/4.MT	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mm/mm/4.MT	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2000, 2009
+Copyright (C) 1991-2000, 2009, 2010
   Free Software Foundation, Inc.
 mgm is written by Jörgen Hägg <jh@axis.com>
 
@@ -17,7 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Please send bugreports with examples to jh@axis.com.
+Please send bug reports with examples to bug-groff@gnu.org.
 ..
 .
 .\"------------
diff -ruN groff-1.20.1/contrib/mm/mm/5.MT groff-1.21/contrib/mm/mm/5.MT
--- groff-1.20.1/contrib/mm/mm/5.MT	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mm/mm/5.MT	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2000, 2009
+Copyright (C) 1991-2000, 2009, 2010
   Free Software Foundation, Inc.
 mgm is written by Jörgen Hägg <jh@axis.com>
 
@@ -17,7 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Please send bugreports with examples to jh@axis.com.
+Please send bug reports with examples to bug-groff@gnu.org.
 ..
 .
 .\"------------
diff -ruN groff-1.20.1/contrib/mm/mm/ms.cov groff-1.21/contrib/mm/mm/ms.cov
--- groff-1.20.1/contrib/mm/mm/ms.cov	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mm/mm/ms.cov	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2000, 2005, 2009
+Copyright (C) 1991-2000, 2005, 2009, 2010
   Free Software Foundation, Inc.
 mgm is written by Jörgen Hägg <jh@axis.com>
 
@@ -17,7 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Please send bugreports with examples to jh@axis.com.
+Please send bug reports with examples to bug-groff@gnu.org.
 ..
 .
 .\"------------
diff -ruN groff-1.20.1/contrib/mm/mse.tmac groff-1.21/contrib/mm/mse.tmac
--- groff-1.20.1/contrib/mm/mse.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mm/mse.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991, 2006, 2009
+Copyright (C) 1991, 2006, 2009, 2010
   Free Software Foundation, Inc.
 mgm is written by Jörgen Hägg <jh@axis.com>
 
@@ -17,7 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Please send bugreports with examples to jh@axis.com.
+Please send bug reports with examples to bug-groff@gnu.org.
 ..
 .
 .\"
diff -ruN groff-1.20.1/contrib/mm/m.tmac groff-1.21/contrib/mm/m.tmac
--- groff-1.20.1/contrib/mm/m.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mm/m.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -3,11 +3,12 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.36 2009/01/05 20:10:43 wl Exp $
-.@revision $Revision: 2.36 $
+.\" $Id: m.tmac,v 2.43 2010/06/24 10:45:57 wl Exp $
+.@revision $Revision: 2.43 $
 .ig
 
-Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+              2010
   Free Software Foundation, Inc.
 mgm is written by Jörgen Hägg <jh@axis.com>
 
@@ -24,7 +25,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Please send bugreports with examples to jh@axis.com.
+Please send bug reports with examples to bug-groff@gnu.org.
 
 Naming convention stolen from mgs.
 Local names	module*name
@@ -54,6 +55,9 @@
 .nr Ej 0
 .\"	Equation label adjust 0=left, 1=right
 .nr Eq 0
+.\"	Bullet string (for .BL)
+.ie n .ds BU \(bu
+.el .ds BU \s-2\(bu\s0
 .\"	Em dash string
 .ie n .ds EM " --
 .el .ds EM \(em
@@ -430,7 +434,7 @@
 .	tm Paragraph nl=\\n[nl], last=\\n[hd*last-pos]
 .	tm Paragraph .k=\\n[.k], hsize=\\n[hd*last-hsize]
 .\}
-.if !((\\n[nl]=\\n[hd*last-pos]):(\\n[hd*last-hsize]=\\n[.k])) \{\
+.if !((\\n[nl]=\\n[hd*last-pos])&(\\n[hd*last-hsize]=\\n[.k])) \{\
 .	if \\n[D]>2 .tm Paragraph set ind-flag=1
 .	nr par@ind-flag 1
 .	\" any collected unprinted text?
@@ -445,7 +449,7 @@
 .	tm Paragraph nl=\\n[nl], last=\\n[hd*last-pos]
 .	tm Paragraph .k=\\n[.k], hsize=\\n[hd*last-hsize]
 .\}
-.if !((\\n[nl]=\\n[hd*last-pos]):(\\n[hd*last-hsize]=\\n[.k])) \{\
+.if !((\\n[nl]=\\n[hd*last-pos])&(\\n[hd*last-hsize]=\\n[.k])) \{\
 .	if \\n[D]>2 .tm Paragraph set ind-flag=1
 .	nr par@ind-flag 1
 .\}
@@ -530,7 +534,7 @@
 .\" .misc@pop-nr stackname varname
 .de misc@pop-nr
 .misc@pop \\$1
-.nr \\$2 \\*[misc*pop]
+.nr \\$2 0\\*[misc*pop]
 ..
 .\"-------------
 .\" .misc@pop-ds stackname varname
@@ -1198,6 +1202,9 @@
 .als TPeh pg*even-header
 .als TPoh pg*odd-header
 .\"
+.als }b pg*footer
+.als }f pg*even-footer
+.als }p pg*odd-footer
 .als EOPf pg*footer
 .als EOPef pg*even-footer
 .als EOPof pg*odd-footer
@@ -1232,8 +1239,11 @@
 .		ie d TP .TP
 .		el \{\
 '			sp 3
+.			ds hd*format \\g[P]
+.			af P 0
 .			ie ((\\n[P]=1)&((\\n[N]=1):(\\n[N]=2))) .sp
 .			el .tl \\*[pg*header]
+.			af P \\*[hd*format]
 .			ie o .tl \\*[pg*odd-header]
 .			el .tl \\*[pg*even-header]
 '			sp 2
@@ -1301,17 +1311,20 @@
 .\" print the footer and eject new page
 .ev pg*tl-ev
 .pg@set-env
+.vpt 0
 .\" user defined end-of-page macro
 .ie d EOP .EOP
 .el \{\
-.	vpt 0
 .	ie o .tl \\*[pg*odd-footer]
 .	el .tl \\*[pg*even-footer]
+.	ds hd*format \\g[P]
+.	af P 0
 .	ie (\\n[P]=1)&(\\n[N]=1) .tl \\*[pg*header]
 .	el .tl \\*[pg*footer]
+.	af P \\*[hd*format]
 .	tl ''\\*[Pg_type!\\n[@copy_type]]''
-.	vpt 1
 .\}
+.vpt 1
 .ev
 .\" be sure that floating displays and footnotes will be
 .\" printed at the end of the document.
@@ -2240,10 +2253,8 @@
 .ie \\n[.$]<3 .LB 0\\$1 0\\$2 0 0
 .el .LB 0\\$1 0\\$2 0 0 \& 0 1
 ..
-.\"	Bullet (for .BL)
 .de BL
 .if \\n[D]>2 .tm BL $*
-.ds BU \s-2\(bu\s0
 .if \\n[.$]>2 .@error "BL: too many arguments"
 .if \\n[.$]<1 .LB \\n[Pi] 0 1 0 \\*[BU]
 .if \\n[.$]=1 .LB 0\\$1 0 1 0 \\*[BU]
@@ -2461,7 +2472,7 @@
 .ie \\n[Sectp] \{\
 .	toc@save \\$1 "\\*[hd*mark]" "\\$2" \\*[hd*sect-pg]
 .\}
-.el .toc@save \\$1 "\\*[hd*mark]" "\\$2" \\n[%]
+.el .toc@save \\$1 "\\*[hd*mark]" "\\$2" \\n[P]
 ..
 .als )E toc@entry
 .\"-----------
diff -ruN groff-1.20.1/contrib/mm/README groff-1.21/contrib/mm/README
--- groff-1.20.1/contrib/mm/README	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mm/README	2010-12-31 08:33:09.000000000 +0100
@@ -1,4 +1,4 @@
-    Copyright (C) 1989-2000, 2001, 2002, 2009
+    Copyright (C) 1989-2000, 2001, 2002, 2009, 2010
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -10,7 +10,7 @@
 It is supposed to be compatible with the DWB mm macros,
 and has several extensions.
 
-Send bug reports to jh@axis.com with a description of the problem
+Send bug reports to bug-groff@gnu.org with a description of the problem
 and a sample of text which reproduces the error.
 
 Don't forget to mention the version of mgm (look in the beginning
diff -ruN groff-1.20.1/contrib/mom/BUGS groff-1.21/contrib/mom/BUGS
--- groff-1.20.1/contrib/mom/BUGS	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/BUGS	2010-12-31 08:33:09.000000000 +0100
@@ -12,7 +12,7 @@
 Post to the groff mailing list with bug reports, questions and
 suggestions, or contact me directly at:
 
-    pschaffter@magma.ca
+    peter@schaffter.ca
 
 If writing me directly, please include the word "groff" or "mom" in
 the Subject line or you risk my spam filters nuking your message.
@@ -21,8 +21,42 @@
 --Peter Schaffter
 
 ========================================================================
+Version 1.5-d
+=============
+
+ILX not quitting left indents set within ITEM.
+---Fixed----
+
 Version 1.5-c
 =============
+
+COVER_COUNTS_PAGES incrementing pagenum by 1 too many.
+---Fixed---
+
+HEADER/FOOTER_RECTO strings vanishing when the default CAPS option
+is turned off.
+---Fixed---
+
+TQ not removing QUAD arg from cleared tabs.
+---Fixed---
+
+DROPCAP_OFF trap remaining in effect after dropcap has been
+processed.
+---Fixed---
+
+PARAHEAD_SIZE 0 resulting in 0-sized type!
+---Fixed---
+
+When DOC_LEAD is called to change document leading in collated docs,
+document leading steadily increases by small amounts at each
+subsequent call to COLLATE.
+---Fixed---
+
+(DOC_)COVER requests annihilating families used in various document
+elements if those families differ from the document's overall
+family.
+---Fixed---
+
 Covers and doccovers not always respecting null pagenumbering.
 --Fixed---
 
diff -ruN groff-1.20.1/contrib/mom/ChangeLog groff-1.21/contrib/mom/ChangeLog
--- groff-1.20.1/contrib/mom/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/ChangeLog	2010-12-31 08:33:09.000000000 +0100
@@ -1,3 +1,68 @@
+* Sun Oct 3 2010
+
+o Complete overhaul of refer macros and documentation
+
+o Inclusion of Tadziu Hoffman's postscript code for underlining
+
+* Wed Aug 18 2010
+
+o Complete overhaul of documentation
+
+* Thu Aug 5 2010
+
+o Changes to COVER and DOCCOVER for greater flexibility in placement
+  of elements
+
+o Improved handling of MISC info on cover pages for greater style
+  flexibility
+
+o Added _FAMILY, _FONT, _SIZE and _COLOR control macros for CODE
+
+* Mon July 6 2009
+
+o Added CLOSING_INDENT and SIGNATURE_SPACE to DOCTYPE LETTER macros.
+
+* Sun Jun 14 2009
+
+o DROPCAP handling changed; uses local vertical motions now instead
+  of .mk/.rt.
+
+o Added macro SUPERSCRIPT_RAISE_AMOUNT
+
+o Added registers and strings to keep track of .RW and .EW and the
+  amounts passed to them.
+
+* Sat May 2 2009
+
+o Fixed error in docs: COVERS_COUNT_PAGES changed to
+  COVER_COUNTS_PAGES.  Ditto DOC_COVERS_COUNT_PAGES.
+
+* Fri May 1 2009
+
+o Fixed PARAHEAD size so it properly adds the value of
+  \*[$PH_SIZE_CHANGE] to \n[#DOC_LEAD].
+
+* Sat Jan 17 2009
+
+o Changed FAMILY, FT and PT_SIZE requests in DO_COVER to groff
+  primitives (fam, ft and ps respectively).  Fixes (DOC_)COVER bug
+  where (DOC_)COVER was resetting families and fonts of various
+  document elements (QUOTE, BLOCKQUOTE, etc) to document default.
+
+o Removed (excessive) cleanup of (doc)cover and docheader strings and
+  registers from macro CLEANUP.  Changes to mom's default style for
+  these document elements now survive COLLATE.
+
+* Fri Jan 2 2009
+
+o Added possibility of quadding docheader left or right, as well as
+  center, which remains the default.
+
+* Wed Dec 31 2008
+
+o Default definition of $QUOTE0 and $QUOTE1 in om.tmac changed from
+  \[dq] to \[lq] and \[rq], respectively.
+
 * Sun Jan 4 2009
 
 o Makefile.sub (CLEANADD): Add om.tmac-s.
@@ -9,8 +74,6 @@
 o Control of null pagenumbering of covers passed to \n%; formerly
   handled by \n[#PAGE_NUM_ADJ]
 
-====================================================================
-
 * Tue Dec 23 2008
 
 o Added a CAPS option to HDRFTR_RECTO and HDRFTR_VERSO to allow
@@ -58,8 +121,6 @@
 
 o Added missing spaced paras bit in blockquotes.
 
-====================================================================
-
 * Tue Jan 22 2008
 
 o Fixed indent handling of refer items in endnotes.
diff -ruN groff-1.20.1/contrib/mom/copyright groff-1.21/contrib/mom/copyright
--- groff-1.20.1/contrib/mom/copyright	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/copyright	2010-12-31 08:33:09.000000000 +0100
@@ -1,14 +1,13 @@
 AUTHOR
 ------
-Peter Schaffter (pschaffter@magma.ca)
-3-281, rue de Cannes
-Gatineau (QC)
-J8T 8B9
+Peter Schaffter (peter@schaffter.ca)
+1-355 Lafontaine Ave
+Ottawa (ON)  K1L 6X6
 
 ========================================================================
 
 The groff macro file om.tmac and the html documentation pertaining
-to it are copyright (c) 2004, 2005, 2006, 2007, 2008, 2009
+to it are copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010
   Peter Schaffter.
 
 om.tmac is issued under the GNU General Public License, a full copy of
diff -ruN groff-1.20.1/contrib/mom/examples/letter.mom groff-1.21/contrib/mom/examples/letter.mom
--- groff-1.20.1/contrib/mom/examples/letter.mom	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/examples/letter.mom	2010-12-31 08:33:09.000000000 +0100
@@ -10,7 +10,7 @@
 .PRINTSTYLE TYPESET
 .START
 .DATE
-August 25, 2004
+August 25, 2010
 .TO
 GUILLAUME BARRIÈRES
 Minidoux Corporation
diff -ruN groff-1.20.1/contrib/mom/examples/sample_docs.mom groff-1.21/contrib/mom/examples/sample_docs.mom
--- groff-1.20.1/contrib/mom/examples/sample_docs.mom	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/examples/sample_docs.mom	2010-12-31 08:33:09.000000000 +0100
@@ -344,6 +344,7 @@
 .NUMBER_HEADS      OFF  \" Because we turned them on in the first example
 .NUMBER_SUBHEADS   OFF  \" Ibid
 \#
+.COVER_MISC_QUAD   L    \" Because we set it to R earlier
 .COVER TITLE AUTHOR COPYRIGHT MISC
 \#
 .START
diff -ruN groff-1.20.1/contrib/mom/groff_mom.man groff-1.21/contrib/mom/groff_mom.man
--- groff-1.20.1/contrib/mom/groff_mom.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/groff_mom.man	2010-12-31 08:33:09.000000000 +0100
@@ -89,7 +89,7 @@
 .
 .B mom
 was written by
-.MT pschaffter@magma.ca
+.MT peter@schaffter.ca
 Peter Schaffter
 .ME .
 Please send bug reports to the
diff -ruN groff-1.20.1/contrib/mom/Makefile.sub groff-1.21/contrib/mom/Makefile.sub
--- groff-1.20.1/contrib/mom/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/Makefile.sub	2010-12-31 08:33:09.000000000 +0100
@@ -46,6 +46,7 @@
   om.tmac
 
 HTMLDOCFILES=\
+  momdoc/stylesheet.css \
   momdoc/appendices.html \
   momdoc/color.html \
   momdoc/cover.html \
@@ -53,7 +54,9 @@
   momdoc/docelement.html \
   momdoc/docprocessing.html \
   momdoc/goodies.html \
+  momdoc/graphical.html \
   momdoc/headfootpage.html \
+  momdoc/images.html \
   momdoc/inlines.html \
   momdoc/intro.html \
   momdoc/letters.html \
@@ -61,8 +64,8 @@
   momdoc/rectoverso.html \
   momdoc/refer.html \
   momdoc/reserved.html \
+  momdoc/tables-of-contents.html \
   momdoc/toc.html \
-  momdoc/typemacdoc.html \
   momdoc/typesetting.html \
   momdoc/using.html
 
diff -ruN groff-1.20.1/contrib/mom/momdoc/appendices.html groff-1.21/contrib/mom/momdoc/appendices.html
--- groff-1.20.1/contrib/mom/momdoc/appendices.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/appendices.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,305 +16,264 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Appendices</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Appendices</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<body style="background-color: #f5faff;">
 
-<p>
-<a href="reserved.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="macrolist.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- ==================================================================== -->
 
-<a name="APPENDICES"><h2 align="center"><u>APPENDICES</u></h2></a>
+<div id="top" class="page">
 
-<ul>
-    <li><a href="#MOREDOC">Further notes on this documentation</a></li>
-    <li><a href="#FONTS">Adding PostScript fonts to groff</a></li>
-    <ul>
-        <li><a href="#HOWTO">How to create a PostScript font for use with groff</a></li>
-    </ul>
-    <li><a href="#CODENOTES">Some reflections on mom, with an apology</a></li>
-    <li><a href="#CONTACT">Contact the author</a></li>
-    <li><a href="reserved.html">List of reserved words</a></li>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="reserved.html#top">Next: Reserved words</a></td>
+</tr>
+</table>
+
+<h1 id="appendices" class="docs">Appendices</h1>
+
+<div style="width: 54%; margin: auto;">
+<ul class="no-enumerator">
+  <li><a href="#moredoc">Notes on the documentation</a></li>
+  <li><a href="#fonts">Adding PostScript fonts to groff</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#howto">How to create a PostScript font for use with groff</a></li>
+  </ul></li>
+  <li><a href="#codenotes">Some reflections on mom</a></li>
+  <li><a href="#contact">Contact the author</a></li>
 </ul>
+</div>
 
-<a name="MOREDOC"><h2><u>Further notes on this documentation</u></h2></a>
+<div class="rule-medium"><hr/></div>
+
+<h2 id="moredoc" class="docs">Notes on the documentation</h2>
 
 <p>
-Some <strong>mom</strong> users are sure to ask: &quot;Why is this
-documentation in html?  If <strong>mom</strong>'s so great, why not
-typeset the whole thing to show her off?  And if groff's so great,
-why not write a man page?&quot;
+Some mom users are sure to ask: &#8220;Why is the documentation in
+html?  If mom&#8217;s so great, why not pdfs to show her off?  And
+if groff&#8217;s so great, why not write a man page?&#8221;
 </p>
 
 <p>
-Valid questions, to be sure, and <strong>mom</strong> has
-answers.  (Okay &mdash; I have answers, but I speak for
-<strong>mom</strong>.)
+Valid questions, to be sure, and mom has answers.  (Okay&mdash;I
+have answers, but I speak for mom.)
 </p>
 
 <p>
 The documentation is in html because I still find it the best tool
 for navigating lengthy manuals.  Html, with its anchors and links,
-came into being precisely so people could do something they'd never
-been able to with the printed word: instantly track down internal
-and external references in a document.
+came into being precisely so people could do something they&#8217;d
+never been able to with the printed word: instantly track down
+internal and external references in a document.
 </p>
 
 <p>
-To me, it's essential that people reading <strong>mom</strong>'s
-documentation never have difficulty finding precisely the macro
-they need for a particular task.  Equally, when reading up on
-a macro, they should never be presented with terms or other
-macro names for which they cannot instantly find accurate explanations.
-Short of having written the documentation in TeX for the info browser
-(and TeX bloat is one of the reasons I prefer to typeset with groff),
-I can think of no better way to achieve the kind of truly useful
-documentation I wanted than html.
+It&#8217;s essential that people reading mom&#8217;s documentation
+never have difficulty finding precisely the macro they need for a
+particular task.  Equally, when reading up on a macro, they should
+never be presented with terms or other macro names for which they
+cannot instantly find accurate explanations.  Short of having
+written the documentation in TeX for the info browser (and TeX bloat
+is one of the reasons I prefer to typeset with groff), I can think
+of no better way to achieve the kind of truly useful documentation I
+wanted than html.
 </p>
 
-<p>
-Another reason for html is that working with <strong>mom</strong>
-necessarily involves creating files inside a text editor.  I use
-elvis, a truly fabulous vi clone that does a terrific job of rendering
-basic (text only) html.  I may have written <strong>mom</strong>,
-but I still regularly call on her documentation.  Elvis, with its
-html capabilities, lets me write and format <strong>mom</strong>
-documents AND peruse her documentation, clicking on links as
-necessary, without ever leaving the comfy confines of my
-text editor.
-</p>
-
-<p>
-Not everyone, of course, uses an editor with html capabilities.
-For them, firing up a browser is obviously necessary for reading
-<strong>mom</strong>'s documentation.  Browsers being what they are,
-and not everyone on the globe having the cash for muscle machines
-to run Galeon, or Konqueror or Mozilla, their browser
-needs to be fast and light &mdash; and probably &quot;text-only&quot;.
-</p>
-
-<p>
-Some <strong>mom</strong> users may notice the absence of graphics,
-frames, and (for the most part) tables in this documentation.  The
-reason is simple: text-only browsers.  People who, for whatever
-reason (choice or necessity), use lynx, or links or w3m to read
-the documentation must be able to make sense of it.  All of it.
-Graphical examples of <strong>mom</strong> in action might have made
-some parts of the documentation easier to write, but would have
-excluded text-only browser users.  And it goes without saying that
-the documentation looks fine if you're reading it in a graphical
-browser.
-</p>
-
-<hr/>
+<div class="rule-medium"><hr/></div>
 
 <!-- ===================================================================== -->
 
-<a name="FONTS"><h2><u>Adding PostScript fonts to groff</u></h2></a>
-
-<p>
-Robert Valiant has set up a web page containing information,
-instructions and strategies for adding PostScript and TrueType fonts
-to <strong>groff</strong>.  The page is directed at Debian
-GNU/Linux users, but knowledgable users of other GNU/Linux
-distributions should have no difficulty adapting it to their needs.
-The site is located at
+<h2 id="fonts" class="docs">Adding PostScript fonts to groff</h2>
 
-<pre>
-    <a href="http://russia.shaps.hawaii.edu/software/software.html">http://russia.shaps.hawaii.edu/software/software.html</a>
-</pre>
-</p>
-
-<a name="SMALL_NOTE"></a>
-
-<p>
-<em><strong>Small note:</strong> the term</em>
-<kbd>&lt;prefix&gt;</kbd> <em>in this section refers to the
-directory in which groff is installed, typically something
-like</em> <kbd>/usr/share/groff/&lt;version&gt;</kbd> <em>(for
-distro-specific, pre-compiled groff packages) or</em>
-<kbd>/usr/local/share/groff/&lt;version&gt;</kbd> <em>(if you've
-built groff from source).</em>
+<div id="small-note" class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The term <kbd>&lt;prefix&gt;</kbd> in this section refers
+to the directory in which groff is installed, typically
+something like <kbd>/usr/share/groff/&lt;version&gt;</kbd>
+(for distro-specific, pre-compiled groff packages) or
+<kbd>/usr/local/share/groff/&lt;version&gt;</kbd> (if you&#8217;ve
+built groff from source).
 </p>
+</div>
 
 <p>
 Groff comes with a small library of PostScript
-<a href="definitions.html#TERMS_FAMILY">families</a>
+<a href="definitions.html#family">families</a>
 (see the
-<a href="typesetting.html#FAMILY">FAMILY</a>
+<a href="typesetting.html#family">FAMILY</a>
 macro for a list).  The families have four
-<a href="definitions.html#TERMS_FONT">fonts</a>
+<a href="definitions.html#font">fonts</a>
 associated with them.  These fonts are a combination of
-<a href="definitions.html#TERMS_WEIGHT">weight</a>
+<a href="definitions.html#weight">weight</a>
 and
-<a href="definitions.html#TERMS_SHAPE">shape</a>:
-
-<pre>
-    <strong>R</strong>  (Roman, usually Medium weight),
-    <strong>I</strong>  (Italic, usually Medium weight),
-    <strong>B</strong>  (Bold, usually Roman shape) and
-    <strong>BI</strong> (Bold Italic)
-</pre>
-</p>
-
-<p>
-If you do a lot of document processing or typesetting with
-<strong>mom</strong>, you'll find, sooner or later, that these
-families and their associated fonts aren't sufficient.  You'll want
-to supplement them, either with more fonts for the families already
-provided &mdash; &quot;Damn!  I need Helvetica Bold Condensed
-Italic!&quot; &mdash; or with entire new families.
+<a href="definitions.html#shape">shape</a>:
+<br/>
+<span class="pre-in-pp">
+  R  (Roman, usually Medium weight),
+  I  (Italic, usually Medium weight),
+  B  (Bold, usually Roman shape) and
+  BI (Bold Italic)
+</span>
+If you work with mom a lot, you&#8217;ll find, sooner or later, that these
+families and their associated fonts aren&#8217;t sufficient.  You&#8217;ll
+want to supplement them, either with more fonts for the families
+already provided&mdash;<i>Damn!  I need Helvetica Bold Condensed
+Italic!</i>&mdash;or with entire new families.
 </p>
 
 <p>
-Without going into the gory details (yet), while it's true that
-adding fonts to groff is a relatively straightforward
-process, extending existing families or adding new ones requires
-some planning.
+Without going into the gory details (yet), while it&#8217;s true
+that adding fonts to groff is a relatively straightforward process,
+extending existing families or adding new ones requires some
+planning.
 </p>
 
 <p>
-The traditional approach to extending groff families has been
-to create new families for non-default weights and
-shapes (e.g.  Light, which is a weight; Condensed, which is a
-shape), then to associate them with groff's predefined <strong>R,
-I, B</strong> and <strong>BI</strong> font styles.  An example
-of this can be seen in the groff PostScript font library itself
-<nobr>(&lt;prefix&gt;/font/devps/):</nobr> there's one
-&quot;family&quot; for Helvetica (HR, HI, HB, HBI) and another for
-Helvetica Narrow (HNR, HNI, HNB, HNBI).
+The traditional approach to extending groff families has been to
+create new families for non-default weights and shapes (e.g.  Light,
+which is a weight; Condensed, which is a shape), then to associate
+them with groff&#8217;s predefined <b>R, I, B</b> and <b>BI</b> font
+styles.  An example of this can be seen in the groff PostScript
+font library itself (&lt;prefix&gt;/font/devps/): there&#8217;s one
+&#8220;family&#8221; for Helvetica (<b>HR</b>, <b>HI</b>, <b>HB</b>,
+<b>HBI</b>) and another for Helvetica Narrow (<b>HNR</b>,
+<b>HNI</b>, <b>HNB</b>, <b>HNBI</b>).
 </p>
 
 <p>
-The difficulty with this approach is that typographers
-tend to think of &quot;families&quot; as referring to the
-entire set of font weights and shapes associated with a
-particular family name.  For example, when a typesetter says
-&quot;the Helvetica family&quot;, s/he is including the
-<a href="definitions.html#TERMS_WEIGHT">weights</a>
+The difficulty with this approach is that typographers tend to
+think of families as referring to the entire set of font weights
+and shapes associated with a particular family name.  For example,
+when a typesetter says &#8220;the Helvetica family&#8221;, s/he is
+including the
+<a href="definitions.html#weight">weights</a>
 Helvetica Thin, Helvetic Light, Helvetica Regular, Helvetica Bold,
 Helvetica Heavy, etc, and all their associated
-<a href="definitions.html#TERMS_SHAPE">shapes</a>
+<a href="definitions.html#shape">shapes</a>
 (Roman, Italic, Condensed, Narrow, Extended, Outline, etc).
 </p>
 
 <p>
-Thus, intuitively, when a typesetter gives <strong>mom</strong> a
-<kbd>.FAM(ILY)</kbd> directive, s/he reasonably expects that any
-subsequent <kbd>.FT</kbd> directive will access the desired font
-from the Helvetica family &mdash; without the need to state explicitly both
-family and font to <kbd>.FT</kbd>, as it is explained one can do in
-the
-<a href="typesetting.html#FAMILY">FAMILY</a>
+Thus, intuitively, when a typesetter gives mom a
+<kbd>.FAM(ILY)&nbsp;H</kbd> directive, s/he reasonably expects that
+any subsequent <kbd>.FT</kbd> directive will access the desired font
+from the Helvetica family&mdash;without the need to state explicitly
+both family and font to <kbd>.FT</kbd>, as it is explained one can
+do in the
+<a href="typesetting.html#family">FAMILY</a>
 and
-<a href="typesetting.html#FONT">FT</a>
+<a href="typesetting.html#font">FT</a>
 sections of these documents.
 </p>
 
 <p>
 If one had, say, the fonts, Helvetica Light Roman and Helvetica
 Light Italic as well as Helvetica Light Condensed Roman and
-Helvetica Light Condensed Italic, the traditional approach would
-require two &quot;partial&quot; families: HLR/HLI and HLCDR/HLCDI.
-Accessing these family/font combos routinely throughout a document
-would then require changing family (with <kbd>.FAM(ILY)</kbd>) and
-selecting the desired font (with <nobr><kbd>.FT R</kbd></nobr>
-or <nobr><kbd>.FT I</kbd>),</nobr> or passing <kbd>.FT</kbd> the
-lengthy family+fontname (.e.g. <nobr><kbd>.FT HLCDI</kbd>).</nobr>
-</p>
-
-<p>
-Fortunately, groff provides a mechanism whereby it's possible to
-extend the basic <strong>R, I, B</strong> and <strong>BI</strong>
-fonts (&quot;styles&quot; in groff-speak) so that one can, in
-fact, create extensive type families, and access all the fonts
-in them with <kbd>.ft</kbd> (groff) or <kbd>.FT</kbd> (mom).
-</p>
-
-<p>
-<strong>Mom</strong> uses this mechanism to offer, in addition to
-groff's default PostScript font styles, the following:
-
-<a name="STYLE_EXTENSIONS"></a>
-
-<pre>
-Mom's extensions to groff's basic font styles
-=============================================
-
-    L      =  Light Roman
-    LI     =  Light Italic
-    LCD    =  Light Condensed Roman
-    LCDI   =  Light Condensed Italic
-    LEX    =  Light Extended Roman
-    LEXI   =  Light Extended Italic
-    CD     =  Medium/Book Condensed Roman
-    CDI    =  Medium/Book Condensed Italic
-    EX     =  Medium/Book Extended Roman
-    EXI    =  Medium/Book Extended Italic
-    DB     =  DemiBold Roman
-    DBI    =  DemiBold Italic
-    BCD    =  Bold Condensed Roman
-    BCDI   =  Bold Condensed Italic
-    BEX    =  Bold Extended Roman
-    BEXI   =  Bold Extended Italic
-    HV     =  Heavy Roman
-    HVI    =  Heavy Italic
-    HVCD   =  Heavy Condensed Roman
-    HVCDI  =  Heavy Condensed Italic
-    HVEX   =  Heavy Extended Roman
-    HVEXI  =  Heavy Extended Italic
-    BL     =  Black Roman
-    BLI    =  Black Italic
-    BLCD   =  Black Condensed Roman
-    BLCDI  =  Black Condensed Italic
-    BLEX   =  Black Extended Roman
-    BLEXI  =  Black Extended Italic
-    UBL    =  Ultra-Black Roman
-    UBLI   =  Ultra-Black Italic
-</pre>
-</p>
-
-<p>
-Thus, with <strong>mom</strong>, if you've installed, say, some
-extra Helvetica fonts and named them according to the convention FS
-(where &quot;F&quot; means family and &quot;S&quot; means font
-style), once having entered
-
-<pre>
-    .FAMILY H
-      or
-    .FAM H
-</pre>
-
-you can access any of those Helvetica fonts simply by
-passing the correct argument from the list above to
-<a href="typesetting.html#FONT">FT</a>.
+Helvetica Light Condensed Italic, the established groff approach
+would require two &#8220;partial&#8221; families: HLR/HLI and
+HLCDR/HLCDI.  Accessing these family/font combos routinely
+throughout a document would then require changing family
+(with <kbd>.FAM(ILY)</kbd>) and selecting the desired font
+(with <kbd>.FT&nbsp;R</kbd> or <kbd>.FT&nbsp;I</kbd>), or
+passing <kbd>.FT</kbd> the lengthy family+fontname (.e.g.
+<kbd>.FT&nbsp;HLCDI</kbd>).
+</p>
+
+<p>
+Fortunately, groff provides a mechanism whereby it&#8217;s possible
+to extend the basic <b>R</b>, <b>I</b>, <b>B</b> and <b>BI</b> fonts
+(&#8220;styles&#8221; in groff-speak) so that one can, in fact,
+create extensive type families, and access all the fonts in them
+with <kbd>.ft</kbd> (groff) or <kbd>.FT</kbd> (mom).
+</p>
+
+<p>
+Mom uses this mechanism to offer, in addition to groff&#8217;s
+default PostScript font styles, the following:
+</p>
+
+<div class="examples-container" style="padding-bottom: 1em;">
+<div id="style-extensions" style="width: 53%; float: left;">
+<span class="pre">
+L     =  Light Roman
+LI    =  Light Italic
+LCD   =  Light Condensed Roman
+LCDI  =  Light Condensed Italic
+LEX   =  Light Extended Roman
+LEXI  =  Light Extended Italic
+CD    =  Medium/Book Condensed Roman
+CDI   =  Medium/Book Condensed Italic
+EX    =  Medium/Book Extended Roman
+EXI   =  Medium/Book Extended Italic
+DB    =  DemiBold Roman
+DBI   =  DemiBold Italic
+BCD   =  Bold Condensed Roman
+BCDI  =  Bold Condensed Italic
+BEX   =  Bold Extended Roman
+</span>
+</div>
+<span class="pre">
+BEXI   =  Bold Extended Italic
+HV     =  Heavy Roman
+HVI    =  Heavy Italic
+HVCD   =  Heavy Condensed Roman
+HVCDI  =  Heavy Condensed Italic
+HVEX   =  Heavy Extended Roman
+HVEXI  =  Heavy Extended Italic
+BL     =  Black Roman
+BLI    =  Black Italic
+BLCD   =  Black Condensed Roman
+BLCDI  =  Black Condensed Italic
+BLEX   =  Black Extended Roman
+BLEXI  =  Black Extended Italic
+UBL    =  Ultra-Black Roman
+UBLI   =  Ultra-Black Italic
+</span>
+</div>
+
+<p style="clear: both;">
+Thus, with mom, if you&#8217;ve installed, say, some extra
+Helvetica fonts and named them according to the convention
+<kbd>&lt;F&gt;&lt;S&gt;</kbd> (where <kbd>&lt;F&gt;</kbd> means
+family and <kbd>&lt;S&gt;</kbd> means font style), once having
+entered
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .FAMILY H
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .FAM H
+</span>
+you can access any of those Helvetica fonts simply by passing the
+correct argument to
+<a href="typesetting.html#font">FT</a>.
+from the list, above.
 </p>
 
 <p>
 For example, if you were working in Medium Roman
-<nobr>(<kbd>.FT R</kbd>)</nobr> and you needed Medium Condensed
-Italic for a while (assuming it's installed), you'd just type
-
-<pre>
-    .FT CDI
-</pre>
-
+(<kbd>.FT&nbsp;R</kbd>) and you needed Medium Condensed Italic for a
+while (assuming it&#8217;s installed), you&#8217;d just type
+<br/>
+<span class="pre-in-pp">
+  .FT CDI
+</span>
 to access the Medium Condensed Italic font from the Helvetica
 family.
 </p>
 
 <p>
-<strong>Mom</strong>'s list of font styles doesn't pretend to
-be exhaustive, but rather tries to cover the basic weight/shape
+Mom&#8217;s list of font styles doesn&#8217;t pretend to be
+exhaustive, but rather tries to cover the basic weight/shape
 combinations likely to be found in any reasonably complete type
 family.
 </p>
@@ -322,493 +281,482 @@
 <p>
 The actual extension names are arbitrary and can be used in a
 flexible manner.  For example, if you create a family that has a
-DemiBold font (DB) but no Bold font (B), you might find it more
-convenient to give the DemiBold font the extension &quot;B&quot;.
-Equally, if the family has an ExtraBold font, you might find it more
-convenient to use the extension &quot;HV&quot; (Heavy).
-</p>
-
-<a name="REGISTER_STYLE"></a>
-
-<p>
-However, you may, at needs, want to add to <strong>mom</strong>'s
-list of font styles.  You can do this by editing the file, om.tmac.
-Near the top, you'll see lines of the form
-
-<pre>
-    .sty \n[.fp] L       \" Light Roman
-    .sty \n[.fp] LI      \" Light Italic
-    .sty \n[.fp] LCD     \" Light Condensed Roman
-</pre>
+DemiBold font (<b>DB</b>) but no Bold font (<b>B</b>), you might
+find it more convenient to give the DemiBold font the extension
+&#8220;<b>B</b>&#8221;.  Equally, if the family has an ExtraBold
+font, you might find it more convenient to use the extension
+&#8220;<b>HV</b>&#8221; (Heavy).
+</p>
+
+<p id="register-style">
+However, you may, at needs, want to add to mom&#8217;s list of font
+styles.  You can do this by editing the file, om.tmac (typical
+location: <kbd>&lt;prefix&gt;tmac/om.tmac</kbd>).  Near the top,
+you&#8217;ll see lines of the form
+<br/>
+<span class="pre-in-pp">
+  .sty \n[.fp] L       \" Light Roman
+  .sty \n[.fp] LI      \" Light Italic
+  .sty \n[.fp] LCD     \" Light Condensed Roman
+</span>
+Simply add your new font style by imitating what you see, above,
+and plugging in your new font style (having, of course, first
+created the font, correctly named, in groff&#8217;s PostScript font
+directory; see
+<a href="#howto">How to create a PostScript font for use with groff</a>).
 </p>
 
 <p>
-Simply add your new font style by imitating what you see and
-plugging in your new font style (having, of course, first created the
-font, correctly named, in groff's PostScript font directory; see
-<a href="#HOWTO">How to create a PostScript font for use with groff</a>).
-</p>
-
-<p>
-For example, if you already have some fonts from the Univers
-family installed and have called the family <strong>UN</strong>,
-you might decide at some point to add the Bold Outline font
-(<strong>UNBO</strong>).  In which case, you'd add
-
-<pre>
-    .sty \n[.fp] BO      \" Bold Outline
-</pre>
-
-to the <nobr><kbd>.sty \n[.fp] &lt;font style&gt;</kbd></nobr> list
+For example, if you already have some fonts from the Univers family
+installed and have called the family <b>UN</b>, you might decide at
+some point to add the Bold Outline font (<b>UNBO</b>).  In which
+case, you&#8217;d add
+<br/>
+<span class="pre-in-pp">
+  .sty \n[.fp] BO      \" Bold Outline
+</span>
+to the <kbd>.sty&nbsp;\n[.fp]&nbsp; &lt;font style&gt;</kbd> list
 in om.tmac.
 </p>
 
-<p>
-Be careful, though, that any styles you add do not conflict
-with <strong><u>family</u></strong> names that already exist.
-&quot;C&quot;, for example, conflicts with the Courier family
-(<strong>CR, CI, CB, CI</strong>).  Were you to create a font
-style &quot;C&quot;, thinking that <nobr><kbd>.FT C</kbd></nobr>
-would give you access to font style once you'd given a
-<kbd>.FAM(ILY)</kbd> directive, you'd get a nasty surprise: your
-type would come out in Courier Roman!
+<div class="box-important">
+<p class="tip">
+<span class="important">Important:</span>
+Be careful that any styles you add do not conflict with
+<i>family</i> names that already exist.  &#8220;<b>C</b>&#8221;,
+for example, conflicts with the Courier family (<b>CR</b>,
+<b>CI</b>, <b>CB</b>, <b>CI</b>).  Were you to create a font
+style &#8220;<b>C</b>&#8221;, thinking that <kbd>.FT&nbsp;C</kbd>
+would give you access to font style once you&#8217;d given a
+<kbd>.FAM(ILY)</kbd> directive, you&#8217;d get a nasty surprise:
+your type would come out in Courier Roman!
+</p>
+</div>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Mom&#8217;s font extensions are not &#8220;user-space&#8221;
+controllable via a macro.  If you&#8217;ve been using groff for
+a long time, and have already rolled your own solution to adding
+PostScript families, fonts, weights, shapes, etc. to groff, you may
+find that mom&#8217;s font extensions conflict with your own scheme.
+Should that be the case, comment out the <kbd>.sty&nbsp;\n[.fp] &lt;font
+style&gt;</kbd> lines found near the top of the <kbd>om.tmac</kbd>
+file.
 </p>
+</div>
 
-<p>
-<strong>VERY IMPORTANT NOTE: mom</strong>'s font extensions are
-not &quot;user-space&quot; controllable via a macro.  If you've
-been using groff for a long time, and have already rolled your own
-solution to adding PostScript families, fonts, weights, shapes, etc. to
-groff, you may find that <strong>mom</strong>'s font extensions
-conflict with your own scheme.  Should that be the case, comment out
-the <nobr><kbd>.sty \n[.fp] &lt;font style&gt;</kbd></nobr> lines
-found near the top of the <kbd>om.tmac</kbd> file.
-</p>
+<div class="rule-medium"><hr/></div>
 
-<a name="HOWTO"><h3><u>How to create a PostScript font for use with groff</u></h3></a>
+<h2 id="howto" class="docs">How to create a PostScript font for use with groff</h2>
 
 <p>
-These instructions aren't meant to cover all possibilities, merely
+These instructions aren&#8217;t meant to cover all possibilities, merely
 to present one way of making PostScript families/fonts available to
-groff and <strong>mom</strong>.
+groff and mom.
 </p>
 
 <p>
 GNU/Linux distributions being what they are, directory locations may
-differ and the presence of some executables can't be guaranteed.
+differ and the presence of some executables can&#8217;t be guaranteed.
 I run a Debian system.  The instructions reflect that.  Users of
 other distros will have to interpret them according to the way their
 distro operates.
 </p>
 
-<h4><u>What you need before you start</u>:</h4>
-
-<ul>
-    <li>groff, version 1.18 or higher
-        <br/>
-
-        (Debian package: groff)
-    </li>
-    <li>a full installation of gs and associated tools
-        <br/>
-
-        (Debian package: gs or gs-gpl or gs-esp or gs-afpl)
-    </li>
-    <li>a library of gs fonts
-        <br/>
-
-        (Debian package: gsfonts)
-    </li>
-    <li>a utility for converting TrueType fonts to Type1 fonts
-        <br/>
-
-        (Debian package: ttf2pt1)
-    </li>
-    <li>a font manager
-        <br/>
+<h3 class="docs appendices">1. What you need before you start</h3>
 
-        (Debian packages: defoma, psfontmgr, dfontmgr)
-    </li>
-    <li>perl
-        <br/>
-
-        (Debian package: perl)
-     </li>
+<ul style="margin-top: 1em; margin-left: -.5em;">
+  <li>groff, version 1.18 or higher<br/>
+      (Debian package: groff)
+  </li>
+  <li>a full installation of ghostscript and associated tools<br/>
+      (suggested Debian package: ghostscript-x)
+  </li>
+  <li>a library of PostScript fonts<br/>
+      (suggest Debian packages: gsfonts, gsfonts-x11, gsfonts-other)
+  </li>
+  <li>a utility for converting TrueType fonts to Type1 fonts<br/>
+      (Debian package: ttf2pt1)
+  </li>
+  <li>a font manager<br/>
+      (Debian packages: defoma, psfontmgr)
+  </li>
+  <li>perl<br/>
+      (Debian package: perl)
+   </li>
 </ul>
 
-<p>
+<p style="margin-top: -.5em;">
 A reasonably complete installation of any major GNU/Linux distro
 should already have these on your system, except perhaps for the
-utility to convert TrueType fonts to Type1 fonts.
+utility to convert TrueType fonts to Type1 fonts (<b>ttf2pt2</b>).
 </p>
 
-<h4><u>Initial preparation (you only have to do this once)</u>:</h4>
+<h3 class="docs appendices">2. Initial preparation (you only need do this once)</h3>
 
-<ol>
-    <li>If you don't already have one, create a directory in your
-        home directory to hold new fonts.  Any directory name will do.
-        I use <kbd>~/Fonts</kbd>, with subdirectories for Type1,
-        TrueType and Groff fonts.
-    </li>
-<a name="SITE-FONT"></a>
-    <li>Locate the groff directory, site-font.  The exact location is
-        difficult to predict, owing to differences between distros
-        and whether you're using a pre-packaged groff or have built
-        it from source.  Some typical locations are
-        <br/><br/>
-
-        <ul>
-            <li><kbd>/usr/share/groff</kbd></li>
-            <li><kbd>/usr/local/share/groff</kbd></li>
-            <li><kbd>/etc/groff</kbd></li>
-        </ul>
-        <br/>
-
-        If you can't find the site-font directory, locate
-        groff's site-tmac directory, and, as root, create site-font
-        in the same directory as the one that holds site-tmac.
-        E.g., if you find site-tmac in <kbd>/usr/share/groff</kbd>,
-        create site-font in <kbd>/usr/share/groff</kbd>.
-    </li>
-    <li>Locate the file <kbd>&lt;prefix&gt;/font/devps/generate/textmap</kbd>
-        and symlink it to <kbd>textmap</kbd> in the directory that
-        contains your personal collection of PostScript fonts.  (See the
-        <a href="#SMALL_NOTE">Small Note</a>,
-        above, for the meaning of
-        <nobr><kbd>&lt;prefix&gt;</kbd>).</nobr>  On my system,
-        at the time of writing, <kbd>&lt;prefix&gt;</kbd> is
-        <nobr><kbd>/usr/local/share/groff/1.19.2/</kbd>,</nobr>
-        therefore, I symlink it in <kbd>~/Fonts/Type1</kbd> with
-
-        <pre>
-<kbd>ln -s /usr/local/share/groff/1.19.2/font/devps/generate/textmap textmap</kbd>
-        </pre>
-    </li>
-    <li>Locate the file <kbd>&lt;prefix&gt;/font/devps/text.enc</kbd> and
-        symlink it to <kbd>text.enc</kbd> in your personal font
-        directory.  On my system, in <kbd>~/Fonts/Type1</kbd>
-
-        <pre>
-ln -s /usr/local/share/groff/1.19.2/font/devps/text.enc text.enc
-        </pre>
-    </li>
-    <li>Make sure you know which directory/ies holds your gs fonts.
-        You'll need the information later.  On a Debian box, some
-        typical locations are
-        <br/><br/>
-        <ul>
-            <li><kbd>/usr/lib/ghostscript/fonts</kbd></li>
-            <li><kbd>/usr/share/ghostscript/fonts</kbd></li>
-            <li><kbd>/usr/share/fonts/type1/gsfonts</kbd></li>
-        </ul></li>
+<ol style="margin-left: -.5em;">
+  <li>If you don&#8217;t already have one, create a directory in
+      your home directory to hold new fonts.  Any directory name
+      will do.  I use <kbd>~/Fonts</kbd>, with subdirectories for
+      <kbd>Type1</kbd>, <kbd>TrueType</kbd> and <kbd>Groff</kbd>
+      fonts. Thus,
+      <br/>
+      <span class="pre-in-pp">
+  ~/Fonts/Type1
+  ~/Fonts/TrueType
+  ~/Fonts/Groff
+      </span>
+  </li>
+  <li id="site-font" style="margin-top: -2em;">Locate the groff
+      directory, <kbd>site-font</kbd>.  The exact location is
+      difficult to predict, owing to differences between distros and
+      whether you&#8217;re using a pre-packaged groff or have built
+      it from source.  Some typical locations are:
+      <br/>
+      <span class="pre-in-pp" style="margin-bottom: -2em;">
+  /usr/share/groff
+  /usr/local/share/groff
+  /etc/groff
+      </span>
+      If you can&#8217;t find the site-font directory, locate
+      groff&#8217;s <kbd>site-tmac</kbd> directory, and, as
+      root, create site-font in the same directory as the
+      one that holds site-tmac.  E.g., if you find site-tmac
+      in <kbd>/usr/share/groff</kbd>, create site-font in
+      <kbd>/usr/share/groff</kbd>.
+  </li>
+  <li style="margin-top: .5em;">Locate the file
+      <kbd>&lt;prefix&gt;/font/devps/generate/textmap</kbd> and
+      symlink it to the name <kbd>textmap</kbd> in the directory
+      that contains your personal collection of PostScript fonts.
+      (See the
+      <a href="#small-note">note</a>,
+      above, for the meaning of <kbd>&lt;prefix&gt;</kbd>).  On my
+      system, at the time of writing, <kbd>&lt;prefix&gt;</kbd>
+      is
+      <br/>
+      <span class="pre-in-pp" style="margin-bottom: -2em;">
+  /usr/local/share/groff/1.20.1/
+      </span>
+      therefore, I symlink it in <kbd>~/Fonts/Type1/</kbd> with
+      <br/>
+      <span class="pre-in-pp">
+ ln -s /usr/local/share/groff/1.20.1/font/devps/generate/textmap textmap
+      </span>
+  </li>
+  <li style="margin-top: -2em;">Locate the file
+      <kbd>&lt;prefix&gt;/font/devps/text.enc</kbd> and
+      symlink it to the name <kbd>text.enc</kbd> in your personal
+      font directory.  On my system, in <kbd>~/Fonts/Type1/</kbd>
+      <br/>
+      <span class="pre-in-pp">
+  ln -s /usr/local/share/groff/1.19.2/font/devps/text.enc text.enc
+      </span>
+  </li>
+  <li style="margin-top: -2em;">Make sure you know which
+      directory holds your PostScript fonts.  You&#8217;ll need the
+      information later.  On a Debian box, a typical location is
+      <kbd>/usr/share/fonts/type1/gsfonts</kbd>
+  </li>
 </ol>
 
-<h4><u>Font creation/installation</u>:</h4>
+<h3 class="docs appendices">3. Font creation/installation</h3>
 
-<ol>
-    <li>Acquire the font in either Type1 (.pfb) or TrueType (.ttf) format.</li>
-    <li>Place the font in your personal font directory; for me,
-        that's <kbd>~/Fonts/Type1</kbd> or <kbd>~/Fonts/TrueType.</kbd>
-    </li>
-    <li>In your personal font directory, run one of the following:</li>
-    <ul>
-        <li>For Type1 fonts</li>
-        <ul>
-            <li><kbd>getafm fontfilename.pfb | gsnd - > fontfilename.afm</kbd>
-                <br/>
-
-                <em>For Type1 fonts, this will generate something called
-                an .afm (Adobe Font Metrics) file, which is
-                required to create PostScript fonts for groff.</em>
-            </li>
-        </ul>
-        <li>For TrueType fonts</li>
-        <ul>
-            <li><kbd>ttf2pt1 \-b fontfilename.ttf</kbd>
-
-                <em>For TrueType fonts, this will generate a PostScript
-                .pfb file as well as an .afm file.</em>
-            </li>
-        </ul>
-    </ul>
-    <li>Still in your personal font directory, run</li>
-    <ul>
-        <li><kbd>afmtodit -e text.enc fontfilename.afm textmap GROFF_FONTNAME</kbd>
-            <br/><br/>
-
-            Q: <em>How do I choose a GROFF_FONTNAME?</em>
-            <br/><br/>
-
-            A: Start by considering the
-            <a href="definitions.html#TERMS_FAMILY">family</a>
-            to which the font belongs.  If you're adding to a family that
-            already exists in groff's <kbd>&lt;prefix&gt;/font/devps</kbd>
-            directory, that will be the first part of the font name.  (See
-            <a href="typesetting.html#FAMILY">here</a>
-            for a list of families already installed, along with their groff
-            names.)  Add to that name the appropriate weight/style extension,
-            listed
-            <a href="#STYLE_EXTENSIONS">here</a>.
-            <br/><br/>
-    
-            For example, if you're adding Helvetica Light Roman, your
-            GROFF_FONTNAME would be <kbd>HL</kbd>.  If you're adding
-            Helvetica Light Italic, your GROFF_FONTNAME would be
-            <kbd>HLI</kbd>.
-            <br/><br/>
-    
-            If you're adding a font not already in groff's PostScript
-            families, first choose a meaningful name for the
-            <a name="definitions.html#TERMS_FAMILY">family</a>
-            to which the font belongs.  The name can be anything you
-            like.  If, for example, the family is Garamond, you could
-            choose GARAMOND, GARA, GD, or even just plain G as the
-            family name.  Then tack on the appropriate style/weight
-            extension.  Thus, if you were installing Garamond Bold
-            Condensed Italic and had chosen <kbd>GD</kbd> as the family
-            name for Garamond, your GROFF_FONTNAME would be
-            <kbd>GDBCDI</kbd>.
-            <br/><br/>
-    
-            In <strong>mom</strong>, you can then access the Garamond
-            family with <kbd>.FAM GD</kbd>, and the Bold Condensed
-            Italic font wth <kbd>.FT BCDI</kbd>.
-            <br/><br/>
-    
-            <strong>Note:</strong> The family name need not be in upper
-            case, and there's no limit to the length of the name.
-            &quot;Garamond&quot;, for example, could be the name you
-            give the Garamond family.  In fact, you might find it
-            preferable, since a) you wouldn't have to remember how
-            you'd named the family, and b) should you be scanning
-            your
-            <a href="#SITE-FONT">site-font directory</a>,
-            something like GaramondBCDI will be more meaningful than,
-            say, <strong>GDBCDI</strong>.
-        </li>
-    </ul>
-    <li>Copy or move GROFF_FONTNAME to your
-        <a href="#SITE-FONT">site-font directory</a>,
-        or change to the site-font directory and make a symlink to
-        GROFF_FONTNAME in your personal directory.
-    </li>
-    <li>Copy or move the .pfb file to the directory that
-        holds your gs fonts, or change to that directory and make a
-        symlink to the .pfb file in your personal directory.
-    </li>
-    <li>Do whatever your system or distro requires in order to
-        register the new PostScript font (the .pfb file).  On a
-        Debian system, as root, you can run dfontmgr for a
-        graphical interface that will take care of registering the
-        font.
-    </li>
+<ol style="margin-left: -.5em/">
+  <li>Acquire the font as either Type1 (.pfb) or TrueType (.ttf).</li>
+  <li style="margin-top: .5em;">Place the font in your personal font directory; for me,
+      that&#8217;s
+      <br/>
+      <span class="pre-in-pp" style="margin-bottom: -2.5em;">
+  ~/Fonts/Type1
+      </span>
+      or
+      <br/>
+      <span class="pre-in-pp" style="margin-top: -.5em; margin-bottom: -2em;">
+  ~/Fonts/TrueType
+      </span>
+  </li>
+  <li>In your personal font directory, run one of the following.
+  <ul style="margin-left: -1.5em;">
+    <li style="margin-top: .5em;">for <b>Type1 fonts</b>:
+        <br/>
+        <span class="pre-in-pp" style="margin-bottom: -2em;">
+  getafm fontfilename.pfb | gsnd - > fontfilename.afm
+        </span>
+       <i>(This generates something called
+       an .afm (Adobe Font Metrics) file from the .pfb file, which is required to
+       create PostScript fonts for groff.)</i>
+      </li>
+      <li style="margin-top: .5em;">for <b>TrueType fonts</b>:
+        <br/>
+        <span class="pre-in-pp" style="margin-bottom: -2em;">
+  ttf2pt1 \-b fontfilename.ttf
+        </span>
+        <i>(For TrueType fonts, this generates a PostScript .pfb file
+         as well as an .afm file.)</i>
+      </li>
+  </ul></li>
+  <li style="margin-top: .5em;">Still in your personal font directory, run
+      <br/>
+      <span class="pre-in-pp" style="margin-bottom: -2em;">
+  afmtodit -e text.enc fontfilename.afm textmap &lt;GROFF_FONTNAME&gt;
+      </span>
+      <p id="groff-font-name" style="margin-top: .25em;">
+      Q: <i>How do I choose a</i> <kbd>GROFF_FONTNAME</kbd><i>?</i>
+      </p>
+
+      <p>
+      A: Start by considering the
+      <a href="definitions.html#family">family</a>
+      to which the font belongs.  If you&#8217;re adding to a family
+      that already exists in groff&#8217;s
+      <kbd>&lt;prefix&gt;/font/devps</kbd> directory, that will be
+      the first part of the font name.  (See
+      <a href="typesetting.html#family">here</a>
+      for a list of families already installed, along with their
+      groff names.)  Add to that name the appropriate weight/style
+      extension, listed
+      <a href="#style-extensions">here</a>.
+      </p>
+      
+      <p>
+      For example, if you&#8217;re adding Helvetica Light Roman,
+      your <kbd>GROFF_FONTNAME</kbd> would be <kbd>HL</kbd>.
+      If you&#8217;re adding Helvetica Light Italic, your
+      <kbd>GROFF_FONTNAME</kbd> would be <kbd>HLI</kbd>.
+      </p>
+
+      <p>
+      If you&#8217;re adding a font not already in groff&#8217;s
+      PostScript families, first choose a meaningful name for the
+      <a href="definitions.html#family">family</a>
+      to which the font belongs.  The name can be anything you like.
+      If, for example, the family is Garamond, you could choose
+      <kbd>GARAMOND</kbd>, <kbd>GARA</kbd>, <kbd>GD</kbd>, or even
+      just plain G as the family name.  Then tack on the appropriate
+      style/weight extension.  Thus, if you were installing Garamond
+      Bold Condensed Italic and had chosen <kbd>GD</kbd> as the
+      family name for Garamond, your <kbd>GROFF_FONTNAME</kbd> would
+      be <kbd>GDBCDI</kbd>.
+      </p>
+
+      <p>
+      In mom, you can then access the Garamond family with
+      <kbd>.FAM GD</kbd>, and the Bold Condensed Italic font wth
+      <kbd>.FT&nbsp;BCDI</kbd>.
+      </p>
+
+      <div class="box-tip">
+      <p class="tip">
+      <span class="note">Note:</span>
+      The family name need not be in upper case, and there&#8217;s
+      no limit to the length of the name.  &#8220;Garamond&#8221;,
+      for example, could be the name you give the Garamond
+      family.  In fact, you might find it preferable, since a) you
+      wouldn&#8217;t have to remember how you&#8217;d named the
+      family, and b) should you be scanning your
+      <a href="#site-font">site-font directory</a>,
+      something like GaramondBCDI will be more meaningful than,
+      say, GDBCDI.
+      </p>
+      </div>
+  </li>
+  <li>Copy or move <kbd>GROFF_FONTNAME</kbd> to your
+      <a href="#site-font">site-font directory</a>,
+      or change to the site-font directory and make a symlink to
+      <kbd>GROFF_FONTNAME</kbd> in your personal directory.
+  </li>
+  <li style="margin-top: .5em;">Copy or move the .pfb file to the directory that
+      holds your PostScript fonts, or change to that directory and
+      make a symlink to the .pfb file in your personal directory.
+  </li>
 </ol>
 
 <p>
 Written out in full, adding fonts looks like a lot of work.  It
-isn't.  Basically, it's just:
-
-<ul>
-    <li>acquire the font</li>
-    <li>generate an .afm file for the font</li>
-    <li>create the groff font</li>
-    <li>put the groff font in<kbd> &lt;prefix&gt;/font/devps</kbd></li>
-    <li>make sure gs knows about the font</li>
-</ul>
+isn&#8217;t.  Basically, it&#8217;s just:
 </p>
+<ul style="margin-top: -.5em;">
+  <li>generate an .afm (and .pfb if the font is TrueType)</li>
+  <li>create the groff font</li>
+  <li>put the groff font in<kbd> &lt;prefix&gt;/font/devps</kbd></li>
+  <li>put the .pfb file (the actual font) with your other PostScript fonts</li>
+</ul>
 
 <p>
-After you've done it a couple of times, it all makes sense, and
-is really quite easy.  Not to mention that once you understand
+After you&#8217;ve done it a couple of times, it all makes sense
+and is really quite easy.  Not to mention that once you understand
 the process, you can write a bash script to automate the process.
-Here's an example, which you can adapt to your own needs.  The
-script requires an argument (the .pfb filename), then prompts for
-the GROFF_FONTNAME.
+Here&#8217;s an example, which you can adapt to your own needs.
+The script, for installing TrueType fonts, requires an argument (the
+.ttf filename), then prompts for a family directory name (e.g.
+AmericanTypewriter or Futura) and a name to give the groff font
+(see
+<a href="#groff-font-name">here</a>
+for suggestions concerning groff font naming.)  The script assumes a
+<kbd>~/Font</kbd> directory with subdirectories <kbd>Type1</kbd>,
+<kbd>TrueType</kbd> and <kbd>Groff</kbd>.
 </p>
 
-<pre>
-#!/bin/bash
-#
-# A script for installing Type1 fonts.
+<div class="examples" style="margin-bottom: 0px;">Code:</div> 
+<div class="box-code" style="width: 726px; max-width: 726px; height: 400px; overflow: auto;">
+<span class="pre" style="color: #302419;">
+#!/bin/sh
 #
-# Builds .afm files from .pfb files, generates a groff font from the
-# .afm file, makes a symlink in /usr/lib/ghostscript/font/ to the
-# .pfb file, and a symlink in site-font to the groff font
+# Converts .ttf file to .pfb and generates .afm
+# Moves the .afm and .pfb to $HOME/Fonts/Type1
+# Generates a groff font from the .afm file and installs it
+# in $HOME/Fonts/Groff
+# Symlinks the groff font to groff's site-font/devps directory
+# Symlinks the .afm and .pfb to /usr/share/fonts/type1/gsfonts
 #
 
-# .pfb filename, stripped of .pfb extension
-FONT=`basename $1 .pfb`
-
-# Directory holding my personal collection of type1 fonts
-FONTDIR="$HOME/Fonts/Type1"
-
-# Directory holding system ghostscript fonts
-GS_FONTDIR="/usr/lib/ghostscript/fonts"
-
-# Location of site-font/devps
+FONT=`basename $1 .ttf`
+FONTDIR="$HOME/Fonts/TrueType"
+T1_FONTDIR="$HOME/Fonts/Type1"
+GS_FONTDIR="/usr/share/fonts/type1/gsfonts"
 GROFF_SITE_FONTDIR="/usr/local/share/groff/site-font/devps"
-
-# Personal groff fonts directory
 GROFF_FONTS="$HOME/Fonts/Groff"
+TEXTMAP="$T1_FONTDIR/textmap"
+TEXTENC="$T1_FONTDIR/text.enc"
+
+echo -n "Family directory name: "
+read FAMILYDIR
 
-# Symlinks to textmap and text.enc
-TEXTMAP="$FONTDIR/textmap"
-TEXTENC="$FONTDIR/text.enc"
-
-if [ ! `pwd` = "$FONTDIR" ] ; then
-    echo "Changing into $FONTDIR directory.."
-    cd $FONTDIR
-    sleep 1
-else
-    sleep 1
+if [ ! -d "$T1_FONTDIR/$FAMILYDIR" ] ; then
+  echo "Creating $FAMILYDIR in $T1_FONTDIR"
+  mkdir $T1_FONTDIR/$FAMILYDIR
 fi
 
 echo -n "Groff name for this font: "
 read FONTNAME
-sleep 1
 
-echo "Getting .afm.."
-getafm $FONT.pfb | gsnd - > $FONT.afm
-sleep 1
+echo "Creating .pfb and .afm files from $FONT.ttf"
+(ttf2pt1 \-b $FONT.ttf)
+
+echo "Moving .afm and .pfb file to $T1_FONTDIR/$FAMILYDIR.."
+mv $FONT.afm $T1_FONTDIR/$FAMILYDIR
+mv $FONT.pfb $T1_FONTDIR/$FAMILYDIR
+
+echo "Changing to $T1_FONTDIR/$FAMILYDIR.."
+cd $T1_FONTDIR/$FAMILYDIR
 
 echo "Creating $FONTNAME.."
-afmtodit -e $TEXTENC $FONTDIR/$FONT.afm $TEXTMAP $FONTNAME
+afmtodit -e $TEXTENC $T1_FONTDIR/$FAMILYDIR/$FONT.afm $TEXTMAP $FONTNAME
 mv -i $FONTNAME $GROFF_FONTS
+echo "Linking $FONTNAME in $GROFF_SITE_FONTDIR.."
 sudo ln -s $GROFF_FONTS/$FONTNAME $GROFF_SITE_FONTDIR/$FONTNAME
-sleep 1
 
-echo "Linking $FONT in $GS_FONTDIR.."
+echo "Linking $FONT.pfb and $FONT.afm in $GS_FONTDIR.."
 cd $GS_FONTDIR
-sudo ln -s $FONTDIR/$FONT.afm $FONT.afm
-sudo ln -s $FONTDIR/$FONT.pfb $FONT.pfb
-sleep 1
-
-# This next bit is Debian specific.  If you're not running a
-# Debian system, replace it with whatever your distro requires
-# in order to register Type1 fonts.
-
-if [ !`pidof -x /usr/bin/dfontmgr` ] ; then
-    echo "I will now run dfontmgr so you can register the font."
-    exec sudo dfontmgr &amp;
-else
-    echo "You may now register the font with dfontmgr."
-fi
-</pre>
-
-<hr/>
-
-<!-- ===================================================================== -->
-
-<a name="CODENOTES"><h2><u>Some reflections on mom</u></h2></a>
-
-<p>
-<strong>Mom</strong>, as a complete macro set, had her origins
-in a &quot;library&quot; of groff routines I wrote over the
-years to handle various aspects of typesetting and document
-processing that weren't adequately covered by ms, me, mm, and so
-on.  Typically, I'd use the library to cobble together macro
-sets for new challenges as they came my way.
-</p>
-
-<p>
-If, as Eric Raymond asserts, open source begins with a programmer
-scratching a personal itch, then <strong>mom</strong> can truly be
-called open source, even if, a mere humble set of macros standing on
-the shoulders of a giant named troff, she isn't programming at all.
-</p>
+sudo ln -s $T1_FONTDIR/$FAMILYDIR/$FONT.afm $FONT.afm
+sudo ln -s $T1_FONTDIR/$FAMILYDIR/$FONT.pfb $FONT.pfb
 
-<p>
-As a writer living in a perpetual state of penury, all the computers
-I've ever owned have been hand-me-downs &mdash; several generations
-out-of-date and &quot;resource challenged&quot;.  Disk space has
-always been an issue, as has processor speed and available RAM.
-One of the reasons I run GNU/Linux is that it has helped enormously
-to get the most out of my poor little boxes.  (It has been pointed
-out to me that NetBSD might be an even better choice of operating
-systems for computers with limited resources.)
-</p>
+echo "Font installation complete"
 
-<p>
-In Linux-land, the choice of typesetting systems basically comes down
-to groff or TeX.  Both are wonderful &mdash; monumental achievements if you
-ask me &mdash; and both have their own particular strengths.  However, for
-people in my financial position (and there are millions of us around
-the globe, in both developed and developing countries), TeX and groff
-have one big difference: size.  TeX is huge.  Even its most ardent
-supporters agree it suffers from bloat, on top of being complex and
-unwieldy to manage.  Groff is tiny by comparison, occupying minimal
-disk space and having only a small memory footprint while at the same
-time being flexible and powerful, typographically speaking.  I've run
-it successfully on a 386 with 8 megs of RAM and a 250 meg hard disk.
-</p>
+exit 0
+</span>
+</div>
 
-<p>
-However, groff has always had a liability: it's incredibly geeky.
-Owing to its very long history, it &mdash; and its &quot;power users&quot;
-&mdash; have remained stuck in a time warp.  Most common macro packages
-still look as they did in those decades when memory was exorbitantly
-expensive and every byte mattered.  Documentation &mdash; not always
-easy to find &mdash; is written as if all readers are computer whizzes,
-or at least have a university degree in one of the higher sciences.
-</p>
+<div class="rule-medium" style="margin-top: 2em;"><hr/></div>
 
-<p>
-By no means a stupid man, nor unfamiliar with the precepts of
-programming, I've more than once torn my hair out over the terseness
-and ambiguity of groff's documentation.  Making sense of certain
-primitives has often involved days of testing, interpreting the
-documentation instead of just using the primitive.
-</p>
+<!-- ===================================================================== -->
 
-<p>
-(ADDENDUM to the previous two paragraphs:  A tremendous amount of
-effort has gone into creating a groff manual that can be read with
-the <strong><kbd>info</kbd></strong> browser, as well as creating
-truly useful man pages.  The <strong><kbd>info</kbd></strong> manual
-is clear and well-written, so my comments are actually out of date.
-I leave them in for the benefit of groff newbies, who may still find
-the documents a bit intimidating.)
-</p>
+<h2 id="codenotes" class="docs">Some reflections on mom</h2>
 
 <p>
-For some time now, groff users and macro writers have had the
-option to use &quot;long&quot; names, yet have mostly chosen not to.
-With long names, it's possible to create macro sets that are humanly
-readable and easy to interpret, encouraging development and evolution.
-What's more, the macros themselves need not be terse, intimidating,
-and easily forgotten 1- or 2-letter commands inserted in the body
-of a document.  They can be sensible and helpful to everyone, groff
-newbies and old hands alike.
+If, as Eric Raymond asserts, open source begins with a programmer
+scratching a personal itch, then mom can truly be called open
+source.
 </p>
 
 <p>
-<strong>Mom</strong>'s macro file, om.tmac, uses long names, aliases,
-and a host of other groff goodies that have become part of the
-whole groff picture under the unflagging guidance of groff's current
-maintainer, Werner Lemberg.  Nearly every macro, number register and
-string is &quot;recognisable&quot; simply by its name.  The file is
-heavily commented.  A consistent, if idiosyncratic, indenting style
-is used as well, significantly improving readability.  Anyone
-wanting to futz around with <strong>mom</strong>'s macros should be
-able to do so with a minimum of head scratching.
+Mom had her origins in a library of groff routines I wrote over
+the years to handle various aspects of typesetting and document
+processing that weren&#8217;t adequately covered by ms, me, mm, and
+friends.  Typically, I&#8217;d use the library to cobble together
+macro sets for new challenges as they came my way.
 </p>
 
 <p>
-<strong>Addendum</strong> As of version 1.4-a, the main macro
-file, om.tmac, is now stripped of comments when groff is built
-from sources.  om.tmac in the sources themselves still contains the
-comments, as do the tarballs posted on <strong>mom</strong>'s
-homepage.
+As a writer living in a perpetual state of penury, all the computers
+I&#8217;ve ever owned have been hand-me-downs&mdash;several
+generations out-of-date and resource challenged.  Disk space has
+always been an issue, as has processor speed and available RAM.  One
+of the reasons I run GNU/Linux rather than the offering from Redmond
+is that it has helped enormously to get the most out of my poor
+little boxes.
+</p>
+
+<p>
+In Linux-land (all Unix variants, in fact), the choice of
+typesetting systems basically comes down to groff or TeX.  Both are
+wonderful&mdash;monumental achievements if you ask me&mdash;and both
+have their own particular strengths.  However, for people in my
+financial position (and there are millions of us around the globe,
+in both developed and developing countries), TeX and groff have one
+big difference: size.  TeX is huge.  Even its most ardent supporters
+agree it suffers from bloat, on top of being complex and unwieldy to
+manage.  Groff is tiny by comparison, occupying minimal disk space
+and having only a small memory footprint while at the same time
+being flexible and powerful, typographically speaking.  Back in the
+Jurassic Period, I ran it successfully on a 386 with 8 megs of RAM
+and a 250 meg hard disk.
+</p>
+
+<p>
+However, groff has always had a liability: it&#8217;s incredibly geeky.
+Owing to its very long history, it&mdash;and its &#8220;power users&#8221;
+&mdash;seem to have remained stuck in a time warp.  The canonical  macro packages
+still look as they did back in those decades when memory was exorbitantly
+expensive and every byte mattered.
+</p>
+
+<p>
+For some time now, groff users and macro writers have had the option
+to use &#8220;long&#8221; names for macros (i.e. longer than two
+letters, the original limit), yet have mostly chosen not to.  With
+long names, it&#8217;s possible to create macro sets that are
+humanly readable and easy to interpret, encouraging development and
+evolution.  What&#8217;s more, the macros themselves need not be
+terse, intimidating, and easily forgotten 1- or 2-letter commands
+inserted in the body of a document.  They can be sensible and
+helpful to everyone, groff newbies and old hands alike.
+</p>
+
+<p>
+Mom&#8217;s macro file, om.tmac, uses long names, aliases, and a
+host of other groff goodies that have become part of the whole
+groff picture under the unflagging guidance of groff&#8217;s
+current maintainer, Werner Lemberg.  The function of nearly
+every macro, number register and string can be infered simply
+from its name.  The file is heavily commented.  A consistent, if
+idiosyncratic, indenting style is used as well, significantly
+improving readability.  Anyone wanting to futz around with
+mom&#8217;s macros should be able to do so with a minimum of head
+scratching.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Addendum:</span>
+As of version 1.4-a, the main macro file, om.tmac, is now stripped
+of comments when groff is built from sources. om.tmac in the sources
+themselves still contains the comments, as do the tarballs posted on
+mom&#8217;s homepage.
 </p>
+</div>
 
-<hr/>
+<div class="rule-medium"><hr/></div>
 
 <!-- ===================================================================== -->
 
-<a name="CONTACT"><h2><u>Contact the author</u></h2></a>
+<h2 id="contact" class="docs">Contact the author</h2>
 
 <p>
-If you have any questions or comments about <strong>mom</strong>,
+If you have any questions or comments about mom,
 suggestions to make, criticisms to offer, or bugs to report, use the
 groff mailing list at
 <a href="mailto:groff@ffii.org">groff@ffii.org</a>
@@ -816,38 +764,41 @@
 <a href="http://ffii.org/mailman/listinfo/groff/">here</a>)
 or contact me, Peter Schaffter,  directly at of the following
 address:
-</p>
-
-<p>
-<strong><i>&nbsp;&nbsp;&nbsp;&nbsp;&#112;&#115;&#99;&#104;&#97;&#102;&#102;&#116;&#101;&#114;&#64;&#109;&#97;&#103;&#109;&#97;&#46;&#99;&#97;</i></strong>
-</p>
-
-<p>
-Please include the word &quot;mom&quot; or &quot;groff&quot; in the
+<br/>
+<span class="pre-in-pp">
+  &#112;&#101;&#116;&#101;&#114;&#64;&#115;&#99;&#104;&#97;&#102;&#102;&#116;&#101;&#114;&#46;&#99;&#97;
+</span>
+Please include the word &#8220;mom&#8221; or &#8220;groff&#8221; in the
 Subject: line of any message sent to my personal address, or you
 risk the wrath of my implacable spam filters. :)
 </p>
 
 <p>
-If you want to visit <strong>mom</strong>'s homepage, you'll find
-it at
-</p>
-
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://gretchen.homelinux.org/mom/mom.html"><kbd>http://gretchen.homelinux.org/mom/mom.html</kbd></a>.
-</p>
+If you want to visit mom&#8217;s website, you&#8217;ll find a link
+to it at
+<br/>
+<span class="pre-in-pp">
+  http://www.schaffter.ca
+</span>
+The site contains links to some of my fiction, all of which was
+typeset with mom and groff.
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="reserved.html">Next: Reserved words</a></td>
+</tr>
+</table>
 
-<hr/>
+</div>
 
-<p>
-<a href="reserved.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="macrolist.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/color.html groff-1.21/contrib/mom/momdoc/color.html
--- groff-1.20.1/contrib/mom/momdoc/color.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/color.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,192 +16,190 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Colour</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Colour</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="docprocessing.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="inlines.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="graphical.html#top">Next: Graphical objects</a></td>
+</tr>
+</table>
 
-<h1 align="center"><a name="COLOR_INTRO"><u>Coloured text</u></a></h1>
+<h1 class="docs">Coloured text</h1>
 
-<p>
-<a href="#INTRO_COLOR">Introduction to coloured text</a>
-<br/>
+<div style="text-align: center;">
+<a href="#index-color">List of color macros</a>
+</div>
 
-<a href="#MACROS_COLOR">Index of colour macros</a>
-</p>
+<div class="rule-medium"><hr/></div>
 
-<a name="INTRO_COLOR"><h2><u>Introduction to coloured text</u></h2></a>
+<h2 class="docs">Introduction</h2>
 
 <p>
-<strong>Mom</strong>'s support for coloured text is straightforward.
-You begin by telling <strong>mom</strong> about the colours you want
-with
-<a href="#NEWCOLOR">NEWCOLOR</a>
+Mom&#8217;s support for coloured text is straightforward.  You begin
+by telling mom about the colours you want with
+<kbd><a href="#newcolor">NEWCOLOR</a></kbd>
 or
-<a href="#XCOLOR">XCOLOR</a>.
+<kbd><a href="#xcolor">XCOLOR</a></kbd>.
 Afterward, any time you want text to be coloured, you either colour
 it with an
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-that contains the colour name (e.g. <kbd>\*[red]</kbd> or
-<kbd>\*[blue]</kbd>) or invoke the macro,
-<a href="#COLOR">COLOR</a>,
+<a href="definitions.html#inlines">inline escape</a>
+that contains the colour name (e.g. <kbd>\*[red]</kbd>
+or <kbd>\*[blue]</kbd>) or invoke the macro,
+<kbd><a href="#color">COLOR</a></kbd>,
 with the name of the colour you want.
 </p>
 
-<a name="COLOR_EXAMPLE"></a>
-
-<p>
-For example, say you want to have the name &quot;Jack&quot; in the
-sentence &quot;All work and no play makes Jack a dull boy&quot;
-appear in yellow.  You'd begin by telling <strong>mom</strong> about
-the colour, yellow.  There are two ways of doing this; see
-<a href="#NEWCOLOR">NEWCOLOR</a>
+<p id="color-example">
+For example, say you want to have the name &#8220;Jack&#8221; in the
+sentence &#8220;All work and no play makes Jack a dull boy&#8221;
+appear in yellow.  You'd begin by telling mom about the colour,
+yellow.  There are two ways of doing this; see
+<kbd><a href="#newcolor">NEWCOLOR</a></kbd>
 and
-<a href="#XCOLOR">XCOLOR</a>
+<kbd><a href="#xcolor">XCOLOR</a></kbd>
 for a full explanation of the difference between the two.
 </p>
 
 <p>
-If you use <strong>XCOLOR</strong>, you'd enter this:
-
-<pre>
-    .XCOLOR yellow
-</pre>
-</p>
-
-<p>
-If you use <strong>NEWCOLOR</strong>, you might enter
-
-<pre>
-    .NEWCOLOR yellow RGB #FFFF00
-</pre>
+If you use XCOLOR, you'd enter this:
+<br/>
+<span class="pre-in-pp">
+  .XCOLOR yellow
+</span>
+If you use NEWCOLOR, you might enter:
+<br/>
+<span class="pre-in-pp">
+  .NEWCOLOR yellow RGB #FFFF00
+</span>
 </p>
 
-<a name="COLOR_EXAMPLE2"></a>
-
-<p>
-After &quot;defining&quot; (or &quot;initializing&quot;) the colour
-&quot;yellow&quot;, you'd colourize the name, Jack, either with an
-inline escape
-
-<pre>
-    All work and no play makes \*[yellow]Jack\*[black] a dull boy.
-</pre>
-
+<p id="color-example2" style="margin-top: -1em;">
+After &#8220;defining&#8221; (or &#8220;initializing&#8221;) the
+colour &#8220;yellow&#8221;, you'd colourize the name, Jack, either
+with an inline escape
+<br/>
+<span class="pre-in-pp">
+  All work and no play makes \*[yellow]Jack\*[black] a dull boy.
+</span>
 or with the
-<a href="#COLOR">COLOR</a>
+<kbd><a href="#color">COLOR</a></kbd>
 macro
-
-<pre>
-    All work and no play makes
-    .COLOR yellow
-    Jack
-    .COLOR black
-    a dull boy.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  All work and no play makes
+  .COLOR yellow
+  Jack
+  .COLOR black
+  a dull boy.
+</span>
 Notice, in both examples, that a) you have to set the colour back
-to black after &quot;Jack&quot;, and b) you don't have to define
-or intialize the colour, black. <strong>Mom</strong> predefines
-it for you.
+to black after &#8220;Jack&#8221;, and b) you don&#8217;t have to
+define or intialize the colour, black. Mom predefines it for you.
 </p>
 
 <p>
 For information on using colour during
-<a href="docprocessing.html#INTRO_MACROS_DOCPROCESSING">document processing</a>,
+<a href="docprocessing.html#intro-macros-docprocessing">document processing</a>,
 see
-<a href="docprocessing.html#COLOR">Colour support in document processing</a>.
+<a href="docprocessing.html#color">Colour support in document processing</a>.
 </p>
 
-<p>
-<strong>Please note: Mom</strong>'s colour support is for text only.
-She doesn't support &quot;fill&quot; (or &quot;background&quot;)
-colour for solid, enclosed graphical objects (polygons, ellipses)
-drawn with <strong>groff</strong>'s <kbd>\D</kbd>
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Mom&#8217;s colour support is for text only.  She doesn&#8217;t
+support &#8220;fill&#8221; (or &#8220;background&#8221;) colour for
+solid, enclosed graphical objects (polygons, ellipses) drawn with
+groff&#8217;s <kbd>\D</kbd>
+<a href="definitions.html#inlines">inline escapes</a>,
 although you may give a colour as one of the arguments to
-<strong>mom</strong>'s &quot;box&quot; and &quot;circle&quot;
-macros,
-<a href="graphical.html#DBX">DBX</a>
+mom&#8217;s &#8220;box&#8221; and &#8220;circle&#8221; macros,
+<a href="graphical.html#dbx">DBX</a>
 and
-<a href="graphical.html#DCL">DCL</a>
+<a href="graphical.html#dcl">DCL</a>
 when the first argument to these macros is <kbd>SOLID</kbd>.
 </p>
+</div>
 
-<p>
-Please also note that if you're accustomed to using groff's
-<kbd>.defcolor</kbd> to define colours, and groff's inline
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span>
+If you&#8217;re accustomed to using groff&#8217;s
+<kbd>.defcolor</kbd> to define colours, and groff&#8217;s inline
 <kbd>\m[&lt;colorname&gt;]</kbd> to call them, you may continue to
-do so without confusing <strong>mom</strong>.
+do so without confusing mom.
 </p>
+</div>
 
-<a name="MACROS_COLOR"><h3><u>Index of colour macros</u></h3></a>
+<div class="macro-list-container">
+<h3 id="index-color" class="macro-list">Coloured text macros</h3>
 
-<ul>
-    <li><a href="#NEWCOLOR">NEWCOLOR</a></li>
-    <li><a href="#XCOLOR">XCOLOR</a></li>
-    <li><a href="#COLOR">COLOR</a></li>
-    <li><a href="#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a> inline escape</li>
+<ul class="macro-list">
+  <li><a href="#newcolor">NEWCOLOR</a></li>
+  <li><a href="#xcolor">XCOLOR</a></li>
+  <li><a href="#color">COLOR</a></li>
+  <li><a href="#color-inline">\*[&lt;colorname&gt;]</a> (inline escape)</li>
 </ul>
+</div>
 
-<!-- -NEWCOLOR- -->
-
-<hr width="66%" align="left"/>
+<div class="rule-medium" style="margin-bottom: 1.5em;"><hr/></div>
 
-<a name="NEWCOLOR"><h3><u>Creating (initializing) a colour with NEWCOLOR</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>NEWCOLOR</strong> <kbd>&lt;colour name&gt; [&lt;colour scheme&gt;] &lt;colour components&gt;</kbd></nobr>
-</p>
+<!-- -NEWCOLOR- -->
 
-<p>
-<strong>NEWCOLOR</strong> lets you create a colour, rather
-like an artist mixing paint on a palette.  The colour isn't
-used immediately; <strong>NEWCOLOR</strong> merely tells
-<strong>mom</strong> how to mix the colour when you need it.  If you
-haven't invoked <kbd>.NEWCOLOR</kbd> (or
-<a href="#XCOLOR">XCOLOR</a>),
-<strong>mom</strong> doesn't have a clue what you mean when you
-reference a colour (with 
-<a href="#COLOR">COLOR</a>
+<div class="macro-id-overline">
+<h3 id="newcolor" class="macro-id">Creating (initializing) a colour with NEWCOLOR</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>NEWCOLOR</b> <kbd class="macro-args">&lt;colour name&gt; [&lt;colour scheme&gt;] &lt;colour components&gt;</kbd>
+</div>
+
+<p>
+NEWCOLOR lets you create a colour, rather like an artist mixing
+paint on a palette.  The colour isn&#8217;t used immediately;
+NEWCOLOR merely tells mom how to mix the colour when you need it.
+If you haven&#8217;t invoked <kbd>.NEWCOLOR</kbd> (or
+<kbd><a href="#xcolor">.XCOLOR</a></kbd>),
+mom doesn&#8217;t have a clue what you mean when you reference a
+colour (with
+<a href="#color">COLOR</a>
 or
-<a href="#COLOR_INLINE"><kbd>\*[&lt;color name&gt;]</kbd></a>).
+<a href="#color-inline"><kbd>\*[&lt;color name&gt;]</kbd></a>).
 </p>
 
 <p>
-The first argument to <strong>NEWCOLOR</strong> is a name for your
-colour.  It can be anything you like &mdash; provided it's just one
-word long &mdash; and can be caps, lower case, or any combination of
-the two.
+The first argument to NEWCOLOR is a name for your colour.  It
+can be anything you like&mdash;provided it&#8217;s just one word
+long&mdash;and can be caps, lower case, or any combination of the
+two.
 </p>
 
 <p>
-The second argument, which is entirely optional, is the &quot;colour
-scheme&quot; you want <strong>mom</strong> to use when mixing the
+The second argument, which is entirely optional, is the
+&#8220;colour scheme&#8221; you want mom to use when mixing the
 colour.  Valid arguments are
-
-<pre>
-    RBG   (3 components: red green blue)
-    CYM   (3 components: cyan yellow magenta)
-    CMYK  (4 components: cyan magenta yellow black)
-    GRAY  (1 component)
-</pre>
-
-If you omit the second argument, <strong>mom</strong> assumes you
-want <strong>RGB</strong>.
+<br/>
+<span class="pre-in-pp">
+  RBG   (3 components: red green blue)
+  CYM   (3 components: cyan yellow magenta)
+  CMYK  (4 components: cyan magenta yellow black)
+  GRAY  (1 component)
+</span>
+If you omit the second argument, mom assumes you
+want RGB.
 </p>
 
 <p>
@@ -212,209 +210,175 @@
 decimal digits, separated by spaces, one digit per component, with
 the argument enclosed in double quotes.  (If this is all gibberish
 to you, see
-<a href="#COLOR_TIP">Tips for newbies</a>.)
+<a href="#color-tip">Tips for newbies</a>.)
 </p>
 
 <p>
-Thus, to tell <strong>mom</strong> about a colour named
-&quot;YELLOW&quot;, you could enter one of the following:
-
-<pre>
-    .NEWCOLOR YELLOW #FFFF00         \"or ##FFFFFFFF0000 or "1 1 0"
-    .NEWCOLOR YELLOW RGB #FFFF00     \"or ##FFFFFFFF0000 or "1 1 0"
-    .NEWCOLOR YELLOW CYM #00FF00     \"or ##0000FFFF0000 or "0 1 0"
-    .NEWCOLOR YELLOW CYMK #00FF0000  \"or ##0000FFFF00000000 or "1 1 0"
-</pre>
-</p>
-
-<p>
-After you've told <strong>mom</strong> about a colour, you can then
-get her to set text in that colour either with the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<a href="#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a>,
+Thus, to tell mom about a colour named &#8220;YELLOW&#8221;, you
+could enter one of the following:
+<br/>
+<span class="pre-in-pp">
+  .NEWCOLOR YELLOW #FFFF00         \"or ##FFFFFFFF0000 or "1 1 0"
+  .NEWCOLOR YELLOW RGB #FFFF00     \"or ##FFFFFFFF0000 or "1 1 0"
+  .NEWCOLOR YELLOW CYM #00FF00     \"or ##0000FFFF0000 or "0 1 0"
+  .NEWCOLOR YELLOW CYMK #00FF0000  \"or ##0000FFFF00000000 or "1 1 0"
+</span>
+After you've told mom about a colour, you can then get her to set
+text in that colour either with the
+<a href="definitions.html#inlines">inline escape</a>,
+<a href="#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>,
 or the macro,
-<a href="#COLOR">COLOR</a>.
+<a href="#color">COLOR</a>.
 (See the
-<a href="#COLOR_EXAMPLE">example</a>,
+<a href="#color-example">example</a>,
 above.)
 </p>
 
-<p>
-<strong>Please note:</strong> the colorname you give to
-<strong>NEWCOLOR</strong> may be used with <strong>groff</strong>'s
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+The colorname you give to NEWCOLOR may be used with groff&#8217;s
 <kbd>\m[&lt;colorname&gt;]</kbd> inline escape (the <kbd>\m</kbd>
-escape is used to set text and rule colours).  Thus, assuming a
-colorname &quot;blueblack&quot; set with <strong>NEWCOLOR</strong>,
+escape is used to set text and rule colours).  Thus, assuming
+a colorname &#8220;blueblack&#8221; set with NEWCOLOR,
 <kbd>\*[blueblack]</kbd> and <kbd>\m[blueblack]</kbd> are
 equivalent.  Furthermore, the colorname can be given as an argument
-to <strong>groff</strong>'s
-<a href="definitions.html#TERMS_PRIMITIVES">primitive</a>
+to <b>groff</b>&#8217;s
+<a href="definitions.html#primitives">primitive</a>
 request, <kbd>.gcolor</kbd> (which does the same thing as
 <kbd>\m[&lt;colorname&gt;]</kbd>).
 </p>
 
-<p>
+<p class="tip-bottom">
 Equally, the colorname may be used with
 <kbd>\M[&lt;colorname&gt;]</kbd> and <kbd>.fcolor</kbd>, which set
-the &quot;fill&quot; colour for solid graphical objects.
+the &#8220;fill&#8221; colour for solid graphical objects.
 </p>
+</div>
 
-<a name="COLOR_TIP"></a>
-
-<h3><u>Tips for newbies</u></h3>
-
-<p>
-Colour manipulation can be tremendously confusing if you don't have
-a background in graphic arts or computing.  My advice, if color
-intimidates you, is to stick to using <strong>mom</strong>'s default
-RGB colour scheme, and to fire up a color chooser that gives you
-the RGB values you want for the colour you select.  Plug those
-values into the components argument to <strong>NEWCOLOR</strong>,
-and you'll get the colour you want.  Both the KDE and gnome
-desktops have colour selectors that provide you with the shorter
-RGB hexadecimal string.  If you're not running KDE or gnome, the
-X utility, xcolorsel, provides you with a similar functionality,
-although it only provides RGB values for 256 pre-defined colours.
-If you use xcolorsel, be sure to click the button &quot;Display
-format&quot; and select &quot;8 bit truncated rgb&quot;.
-</p>
-
-<p>
-Alternatively, you can use <strong>mom</strong>'s simpler
-<a href="#XCOLOR">XCOLOR</a>
+<div class="box-tip">
+<p id="color-tip" class="tip-top">
+<span class="tip">Tips for newbies:</span>
+Colour manipulation can be tremendously confusing if you don&#8217;t
+have a background in graphic arts or computing.  My advice, if color
+intimidates you, is to stick to using mom&#8217;s default RGB colour
+scheme, and to fire up a color chooser that gives you the RGB values
+you want for the colour you select.  Plug those values into the
+components argument to NEWCOLOR, and you&#8217;ll get the colour
+you want.  Both the KDE and gnome desktops have colour selectors
+that provide you with the shorter RGB hexadecimal string.  If
+you&#8217;re not running KDE or gnome, the X utility, xcolorsel,
+provides you with a similar functionality, although it only provides
+RGB values for 256 pre-defined colours.  If you use xcolorsel, be
+sure to click the button &#8220;Display format&#8221; and select
+&#8220;8 bit truncated rgb&#8221;.
+</p>
+
+<p class="tip-bottom">
+Alternatively, you can use mom&#8217;s simpler
+<kbd><a href="#xcolor">XCOLOR</a></kbd>
 macro to initialize one of the 256 pre-defined X colours by
 supplying the name of the color as an argument.
 </p>
+</div>
 
 <!-- -XCOLOR- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="xcolor" class="macro-id">Initializing a colour with XCOLOR</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>XCOLOR</b> <kbd class="macro-args">&lt;X colorname&gt; [&lt;alias&gt;]</kbd>
+</div>
 
-<a name="XCOLOR"><h3><u>Initializing a colour with XCOLOR</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>XCOLOR</strong> <kbd>&lt;X colorname&gt; [&lt;alias&gt;]</kbd></nobr>
-<br/>
-
-<kbd>*&lt;X colorname&gt;</kbd> <em>must be all one word, all lower case.</em>
+<p class="requires">
+<kbd style="font-style: normal">&lt;X colorname&gt;</kbd> <i>must be all one word, all lower case.</i>
 <br/>
-
-<em>(See</em>
-<a href="#XCOLOR_NAMES">Finding X color names</a>
-<em>for how to get a list of valid colour names.)</em>
+(See
+<a href="#xcolor-names" style="font-style: normal;">Finding X color names</a>
+for how to get a list of valid colour names.)
 </p>
 
 <p>
-<strong>XCOLOR</strong> is similar to <strong>NEWCOLOR</strong> in
-that it tells <strong>mom</strong> to initialize a colour, but it's
-easier to use.  All you have to do is pass it, as an argument, the
-valid name of one of the 256 pre-defined X colours.  The name must
-be all one word, and, breaking with <strong>mom</strong> policy, it
-must be entered in lower case.
+XCOLOR is similar to NEWCOLOR in that it tells mom to initialize a
+colour, but it&#8217;s easier to use.  All you have to do is pass
+it, as an argument, the valid name of one of the 256 pre-defined
+X colours.  The name must be all one word, and, breaking with mom
+policy, it must be entered in lower case.
 </p>
 
 <p>
 For example, if you want to intialize the X colour, coral, all you
 have to do is enter
-
-<pre>
-    .XCOLOR coral
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .XCOLOR coral
+</span>
 Afterwards
-
-<pre>
-    .COLOR coral
-</pre>
-
-will colourize subsequent text coral until you instruct
-<strong>mom</strong> to return to black, or some other pre-defined,
-initialized colour.  (The
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+<br/>
+<span class="pre-in-pp">
+  .COLOR coral
+</span>
+
+will colourize subsequent text coral until you instruct mom to
+return to black, or some other pre-defined, initialized colour.
+(The
+<a href="definitions.html#inlines">inline escape</a>
 <kbd>\*[coral]</kbd> will equally colourize text coral after you've
-initialized the colour with <strong>XCOLOR</strong>.)
+initialized the colour with XCOLOR.)
 </p>
 
 <p>
-The downside of <strong>XCOLOR</strong> is that you can't create
-custom colours.  This restriction, however, is mitigated by the
-fact that for many users, 256 colours is more than enough to play
-around with.
+The downside of XCOLOR is that you can&#8217;t create custom
+colours.  This restriction, however, is mitigated by the fact that
+for many users, 256 colours is more than enough to play around with.
 </p>
 
 <p>
 While some X colours have fanciful names (peachpuff, papayawhip,
 thistle, snow), many are self-explanatory and self-descriptive
-in ordinary colour terms. &quot;blue&quot; is pure (rgb) blue,
-&quot;green&quot; is pure (rgb) green, and so on.  Furthermore,
-for many X colors, there exist four variants, each representing
-increasingly darker shades of the same colour.  For example,
-&quot;blue1&quot; is a relatively bright blue; &quot;blue2&quot;,
-&quot;blue3&quot; and &quot;blue4&quot; are increasingly darker
-shades.  For that reason, you may find <strong>XCOLOR</strong> is
-a better choice than <strong>NEWCOLOR</strong> when it comes to
-initializing common colors.
+in ordinary colour terms. &#8220;blue&#8221; is pure (rgb)
+blue, &#8220;green&#8221; is pure (rgb) green, and so on.
+Furthermore, for many X colors, there exist four variants, each
+representing increasingly darker shades of the same colour.
+For example, &#8220;blue1&#8221; is a relatively bright blue;
+&#8220;blue2&#8221;, &#8220;blue3&#8221; and &#8220;blue4&#8221; are
+increasingly darker shades.  For that reason, you may find XCOLOR is
+a better choice than NEWCOLOR when it comes to initializing common
+colors.
 </p>
 
 <p>
 The whimsical nature of X colour names sometimes makes for names
-that are long to type in, e.g. &quot;mediumspringgreen&quot;.
-The optional second argument to <strong>XCOLOR</strong> allows you
-to come up with more convenient name by which to reference the
-colour.  For example, you could enter
-
-<pre>
-    .XCOLOR mediumspringgreen mygreen
-        or
-    .XCOLOR mediumspringgreen MYGREEN
-</pre>
-
-so that whenever you want text mediumspringgreen-ed, you can use
-either <kbd>.COLOR mygreen</kbd> (or <kbd>.COLOR MYGREEN</kbd>) or
-the inline escape <kbd>\*[mygreen]</kbd> (or
-<kbd>\*[MYGREEN]</kbd>.)
-</p>
-
-<p>
-<strong>Please note:</strong> both the colorname and the
-alias you give to <strong>XCOLOR</strong> may be used with
-<strong>groff</strong>'s <kbd>\m[&lt;colorname&gt;]</kbd>
-inline escape (the <kbd>\m</kbd> escape is used to set
-text and rule colours).  Thus, assuming an X-colorname
-&quot;mediumspringgreen&quot; set with <strong>XCOLOR</strong>, and
-an alias, &quot;mygreen&quot;, <kbd>\*[mediumspringgreen]</kbd>,
-<kbd>\m[mediumspringgreen]</kbd>, <kbd>\*[mygreen]</kbd> and
-<kbd>\m[mygreen]</kbd> are all equivalent.  Furthermore, both
-the colorname and the alias can be given as an argument to
-<strong>groff</strong>'s
-<a href="definitions.html#TERMS_PRIMITIVES">primitive</a>
-request, <kbd>.gcolor</kbd> (which does the same thing as
-<kbd>\m[&lt;colorname&gt;]</kbd>).
+that are long to type in, e.g. &#8220;mediumspringgreen&#8221;.  The
+optional second argument to XCOLOR allows you to come up with more
+convenient name by which to reference the colour.  For example, you
+could enter
+<br/>
+<span class="pre-in-pp">
+  .XCOLOR mediumspringgreen mygreen
+</span>
+or
+<span class="pre-in-pp">
+  .XCOLOR mediumspringgreen MYGREEN
+</span>
+so that whenever you want text mediumspringgreen-ed, you
+can use either <kbd>.COLOR mygreen</kbd> (or
+<kbd>.COLOR MYGREEN</kbd>) or the inline escape
+<kbd>\*[mygreen]</kbd> (or <kbd>\*[MYGREEN]</kbd>.)
 </p>
 
-<p>
-The colorname initialized with <strong>XCOLOR</strong>
-<em><strong><u>but not the alias</u></strong></em> may also
-be used with <strong>groff</strong>'s inline escape,
-<kbd>\M[&lt;colorname&gt;]</kbd>, and the corresponding primitive,
-<kbd>.fcolor</kbd>, both of which set the &quot;fill&quot; colour
-for solid graphical objects.  If you need a colour initialized with
-<strong>XCOLOR</strong> for <kbd>\M</kbd> or <kbd>.fcolor</kbd>, you
-<strong>MUST</strong> give the full colorname; the alias won't work.
-
-</p>
-<a name="XCOLOR_NAMES"><h4><u>Finding X color names</u></h4></a>
+<h3 id="xcolor-names" class="docs">Finding X color names</h3>
 
 <p>
 There are two ways of finding the names of the pre-defined X
-colours.  One is to consult the file, rgb.txt, included with
-all X11 installations.  The location of the file on a Debian
-GNU/Linux distribution is typically /etc/X11/rgb.txt.  Other
-distributions and other X installations may have the file in
-another location.  The file lists the colour names, but doesn't
-show you what the colours actually look like.
+colours.  One is to consult the file, rgb.txt, included with all
+X11 installations.  The location of the file on a Debian GNU/Linux
+distribution is typically /etc/X11/rgb.txt.  Other distributions and
+other X installations may have the file in another location.  The
+file lists the colour names, but doesn&#8217;t show you what the
+colours actually look like.
 </p>
 
 <p>
@@ -426,44 +390,73 @@
 
 <p>
 Whichever method you use to find X color names, remember that the
-names, passed as arguments to <strong>XCOLOR</strong>, <em>must</em>
-be all one word, all in lower case.
+names, passed as arguments to XCOLOR, must be all one word, all in
+lower case.
 </p>
 
-<!-- -COLOR- -->
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+Both the colorname and the alias you give to XCOLOR may be
+used with groff&#8217;s <kbd>\m[&lt;colorname&gt;]</kbd>
+inline escape (the <kbd>\m</kbd> escape is used to set
+text and rule colours).  Thus, assuming an X-colorname
+&#8220;mediumspringgreen&#8221; set with XCOLOR, and an alias,
+&#8220;mygreen&#8221;, <kbd>\*[mediumspringgreen]</kbd>,
+<kbd>\m[mediumspringgreen]</kbd>, <kbd>\*[mygreen]</kbd> and
+<kbd>\m[mygreen]</kbd> are all equivalent.  Furthermore, both the
+colorname and the alias can be given as an argument to groff&#8217;s
+<a href="definitions.html#primitives">primitive</a>
+request, <kbd>.gcolor</kbd> (which does the same thing as
+<kbd>\m[&lt;colorname&gt;]</kbd>).
+</p>
 
-<hr width="33%" align="left"/>
+<p class="tip-bottom">
+The colorname initialized with XCOLOR <i>but not the
+alias</i> may also be used with groff&#8217;s inline escape,
+<kbd>\M[&lt;colorname&gt;]</kbd>, and the corresponding primitive,
+<kbd>.fcolor</kbd>, both of which set the &#8220;fill&#8221; colour
+for solid graphical objects.  If you need a colour initialized with
+XCOLOR for <kbd>\M</kbd> or <kbd>.fcolor</kbd>, you MUST give the
+full colorname; the alias won&#8217;t work.
+</p>
+</div>
 
-<a name="COLOR"><h3><u>Invoking a color</u></h3></a>
+<!-- -COLOR- -->
 
-<p>
-<nobr>Macro: <strong>COLOR</strong> <kbd>&lt;colorname&gt;</kbd></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="color" class="macro-id">Invoking a color</h3>
+</div>
 
-<a name="COLOR_INLINE"><nobr>Inline: <kbd>\*[&lt;colorname&gt;]</kbd></nobr></a>
-</p>
+<div class="box-macro-args">
+Macro: <b>COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd>
+</div>
 
-<a name="COLOR_INLINE"></a>
+<p id="color-inline" class="requires" style="font-style: normal;">
+Inline: <kbd>\*[&lt;colorname&gt;]</kbd>
+</p>
 
 <p>
-Once you've told <strong>mom</strong> about a colour (via
-<a href="#NEWCOLOR">NEWCOLOR</a>
+Once you've told mom about a colour (via
+<a href="#newcolor">NEWCOLOR</a>
 or
-<a href="#XCOLOR">XCOLOR</a>,
-you use either the macro, <strong>COLOR</strong>, or the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<kbd>\*[&lt;colorname&gt;]</kbd>, to cause <strong>mom</strong> to
+<a href="#xcolor">XCOLOR</a>,
+you use either the macro, COLOR, or the
+<a href="definitions.html#inlines">inline escape</a>,
+<kbd>\*[&lt;colorname&gt;]</kbd>, to cause mom to
 set subsequent text in that colour.  See the
-<a href="#COLOR_EXAMPLE2">example</a>,
+<a href="#color-example2">example</a>,
 above, which shows both in action.
 </p>
 
-<p>
-<strong>NOTE:</strong> You can use the
-<kbd>\*[&lt;colorname&gt;]</kbd> inline escape in any
-<a href="docprocessing.html#TOP">document processing</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+You can use the <kbd>\*[&lt;colorname&gt;]</kbd> inline escape in
+any
+<a href="docprocessing.html#top">document processing</a>
 macro that takes a
-<a href="definitions.html#TERMS_STRINGARGUMENT">string argument</a>.
+<a href="definitions.html#stringargument">string argument</a>.
 However, you must remember to reset the colour at the end of the
 argument (typically with <kbd>\*[black]</kbd>) unless you want all
 subsequent invocations of that particular macro to be colourized.
@@ -472,37 +465,42 @@
 <p>
 Furthermore, if you use <kbd>\*[&lt;colorname&gt;]</kbd> in the
 string argument passed to
-<a href="docelement.html#HEAD">HEAD</a>,
-<a href="docelement.html#SUBHEAD">SUBHEAD</a>
+<a href="docelement.html#head">HEAD</a>,
+<a href="docelement.html#subhead">SUBHEAD</a>
 or
-<a href="docelement.html#PARAHEAD">PARAHEAD</a>,
+<a href="docelement.html#parahead">PARAHEAD</a>,
 and you've requested that any of these types of heads be numbered,
 the numbers themselves will not be coloured, only the text you
-passed the macro.  If you wish the numbers to be colourized as
-well, you must explicitly tell <strong>mom</strong> that you wish
-all of the head(s), subhead(s) or parahead(s), including the
-numbers, colourized by invoking the appropriate
-<a href="docelement.html#DOCELEMENT_CONTROL">control macro</a>.
+passed the macro.  If you wish the numbers to be colourized as well,
+you must explicitly tell mom that you wish all of the head(s),
+subhead(s) or parahead(s), including the numbers, colourized by
+invoking the appropriate
+<a href="docelement.html#docelement-control">control macro</a>.
 </p>
 
-<p>
+<p class="tip-bottom">
 For colorizing underscored text, see
-<a href="goodies.html#UNDERSCORE_COLOR">Colorizing underscored text</a>
+<a href="goodies.html#underscore-color">Colorizing underscored text</a>
 in the notes at the end of
-<a href="goodies.html#UNDERSCORE">UNDERSCORE</a>.
+<a href="goodies.html#underscore">UNDERSCORE</a>.
 </p>
+</div>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="docprocessing.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="inlines.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="graphical.html#top">Next: Graphical objects</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/cover.html groff-1.21/contrib/mom/momdoc/cover.html
--- groff-1.20.1/contrib/mom/momdoc/cover.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/cover.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,646 +16,618 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Document processing, creating a cover page</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Document processing, creating cover pages</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="refer.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="rectoverso.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
-
-<a name="COVER_TOP"><h1 align="center"><u>Creating a cover page</u></h1></a>
-
-<ul>
-    <li><a href="#COVER_INTRO">Introduction to cover pages</a></li>
-    <ul>
-        <li><a href="#PLEASE">Important note &mdash; please read</a></li>
-        <li><a href="#DESC">Description of what mom does on cover pages</a></li>
-        <li><a href="#PAGINATION">A note on headers/footers and pagination</a></li>
-        <li><a href="#DESIGN">What to do if you want to design your own cover pages</a></li>
-    </ul>
-    <li><a href="#COVER">The cover and document cover macros</a></li>
-    <ul>
-        <li><a href="#COVER">COVER/DOC_COVER</a></li>
-        <ul>
-            <li><a href="#REQUIRED">The required argument</a></li>
-            <li><a href="#CHAPTER">How the CHAPTER argument and friends work</a></li>
-            <li><a href="#OPTIONAL">The optional arguments</a></li>
-            <li><a href="#DOCTYPE">What the DOCTYPE argument means</a></li>
-            <li><a href="#BLANKPAGE">What the BLANKPAGE argument means</a></li>
-        </ul>
-    </ul>
-    <li><a href="#ON_OFF">Enabling/disabling automatic generation of cover pages</a></li>
-    <li><a href="#COVER_CONTROL">Control macros &mdash; changing the defaults for covers and document covers</a></li>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="tables-of-contents.html#top">Next: Tables of contents</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Creating cover pages</h1>
+
+<div style="width: 63%; margin: auto;">
+<ul class="no-enumerator">
+  <li><a href="#cover-intro">Introduction to cover pages</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#important-note">Important note</a></li>
+    <li><a href="#desc">Description of cover pages</a></li>
+    <li><a href="#pagination">Headers/footers/pagination and cover pages</a></li>
+    <li><a href="#design">Designing your own cover pages</a></li>
+  </ul></li>
+  <li><a href="#index-covers">Cover and document cover macros</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#cover">COVER / DOC_COVER</a>
+    <ul style="margin-left: -.5em; list-style-type: circle;">
+      <li><a href="#required-arg">The required argument</a></li>
+      <li><a href="#chapter">How the CHAPTER argument and friends work</a></li>
+      <li><a href="#optional-args">The optional arguments</a></li>
+      <li><a href="#doctype">What the DOCTYPE argument means</a></li>
+      <li><a href="#blankpage">What the BLANKPAGE argument means</a></li>
+    </ul></li>
+  </ul></li>
+  <li><a href="#on-off">Enabling/disabling automatic generation of cover pages</a></li>
+  <li><a href="#cover-control">Control macros for covers and doc covers</a></li>
 </ul>
+</div>
 
-<a name="COVER_INTRO"><h2><u>Introduction to cover pages</u></h2></a>
+<div class="rule-medium"><hr/></div>
 
-<p>
-As of version 1.19 of <strong>mom</strong>, you can now have cover
-pages generated automatically.
-</p>
+<h2 id="cover-intro" class="docs">Introduction to cover pages</h2>
 
 <p>
-Though identical in treatment, <strong>mom</strong> provides two
-kinds of cover pages: section cover pages (which I shall refer to
-simply as &quot;cover pages&quot;) and document cover pages
-(&quot;doc covers&quot;).
+Though identical in treatment, mom provides two kinds of cover
+pages: section cover pages (which I shall refer to simply as
+cover pages) and document cover pages (&#8221;doc
+covers&#8221;).
 </p>
 
 <p>
-A document cover page
-(<a href="#DOC_COVER">doc cover</a>)
-is what you'd most likely use at the start of a
-<a href="rectoverso.html#COLLATE_INTRO">collated</a>
-document, where you might want the name of the complete document,
-the author(s) and the copyright line to appear.  Another place you
-might use a doc cover is for a novel, where you want the title of
-the novel, not the chapter title or chapter number, as the first
-cover page.
+A doc cover is what you&#8217;d most likely use at the start of a
+collated document, where you might want the name of the complete
+document, the author(s) and the copyright line to appear.  Another
+place you might use a doc cover is for a novel, where you want the
+title of the novel, not the chapter title or chapter number, as the
+first cover page.
 </p>
 
 <p>
-A section
-<a href="#COVER">cover</a>
-page is what you'd use for cover pages that separate sections of a
-collated document, i.e. title pages.  A section cover page (but not
-a doc cover page) in a collated document could, for example, simply
-read &quot;PART I&quot;.
+A cover is what you&#8217;d use for pages that separate sections
+of a collated document, i.e. title pages.  A cover page (but not a
+doc cover) in a collated document could, for example, simply read:
+&#8221;PART 1&#8221;.
 </p>
 
 <p>
-In non-collated documents (say, an essay) you can use either a
-section cover (title page) or a doc cover to generate a cover sheet.
+In non-collated documents (say, an essay) you can use either a cover
+or doc cover to generate the cover sheet.
 </p>
 
 <p>
 In addition, nothing prevents you from generating both a doc cover
-page and a section cover page for every document in a collated
-document.  Or you can selectively disable the automatic generation
-of either doc covers or section covers in a collated document
-on-the-fly.
+and a cover for every document in a collated document.  Or you can
+selectively disable the automatic generation of either doc covers or
+covers in a collated document on-the-fly.
 </p>
 
-<p>
-<a name="PLEASE"><strong>Important note:</strong></a>
-automatic generation of cover or doc cover pages after the first
-one(s) only takes place if you are working with collated documents.
-<strong>Mom</strong> provides no mechanism for saying &quot;print
-a section cover here even though I'm still working on the same
-(non-collated) document.&quot;
+<div id="important-note" class="box-important">
+<p class="tip">
+<span class="important">Important note:</span>
+Automatic generation of covers or doc covers after the first one(s)
+only takes place if you are working with collated documents.  Mom
+provides no mechanism for saying &#8221;print a section cover
+here even though I'm still working on the same (non-collated)
+document.&#8221;
 </p>
+</div>
 
-<a name="DESC"><h3><u>Description of what mom does on cover pages</u></h3></a>
+<h3 id="desc" class="docs">Description of cover pages</h3>
 
 <p>
-By default, <strong>mom</strong> typesets cover (and doc cover)
-pages identically to
-<a href="definitions.html#TERMS_DOCHEADER">docheaders</a>
+By default, mom typesets covers and doc covers  identically to
+<a href="definitions.html#docheader">docheaders</a>
 (see
-<a href="docprocessing.html#DOCHEADER_CONTROL">How to change the look of docheaders</a>
+<a href="docprocessing.html#docheader-control">How to change the look of docheaders</a>
 for a description of what a docheader looks like).  The only
 differences are
-
-<ul>
-    <li>the position on the page where the information is output</li>
-    <li>the (optional) addition of copyright and miscellaneous information</li>
-    <li>there's no running text underneath</li>
-</ul>
 </p>
+<ul style="margin-top: -.5em;  margin-bottom: -.5em;">
+  <li>the position on the page where the information is output</li>
+  <li>the (optional) addition of copyright and miscellaneous information</li>
+  <li>there&#8217;s no running text underneath</li>
+</ul>
 
 <p>
-You tell <strong>mom</strong> what you want to appear on cover pages
-through the arguments you pass to
-<a href="#COVER">COVER</a>
+You tell mom what you want to appear on cover pages through the
+arguments you pass to
+<a href="#cover">COVER</a>
 and/or
-<a href="#COVER">DOC_COVER</a>.
-Provided you have already given <strong>mom</strong> the
-appropriate reference macros (e.g.
-<a href="docprocessing.html#TITLE">TITLE</a>
+<a href="#cover">DOC_COVER</a>.
+Provided you have already given mom the appropriate reference macros
+(e.g.
+<a href="docprocessing.html#title">TITLE</a>
 or
-<a href="docprocessing.html#AUTHOR">AUTHOR</a>),
-she will output cover (and doc cover) pages identically to how she
+<a href="docprocessing.html#author">AUTHOR</a>),
+she will output covers and doc covers identically to how she
 would output docheaders containing the same information.
 </p>
 
 <p>
-By default, <strong>mom</strong> starts cover (and doc cover) pages
-one-third of the way down the page.  This can be changed through
-the use of the control macros
-<a href="#COVER_CONTROL_INDEX">COVER_ADVANCE/DOC_COVER_ADVANCE</a>.
+By default, mom starts covers and doc covers one-third of the way
+down the page.  This can be changed through the use of the control
+macros COVER_ADVANCE / DOC_COVER_ADVANCE.
 </p>
 
 <p>
-If you request copyright information (and have already given
-<strong>mom</strong> the reference macro,
-<a href="docprocessing.html#COPYRIGHT">COPYRIGHT</a>),
+If you request copyright information (and have already given mom the
+reference macro,
+<a href="docprocessing.html#copyright">COPYRIGHT</a>),
 she sets it, by default, in a smaller
-<a href="definitions.html#TERMS_PS">point size</a>
-in the bottom right hand corner of the cover (or doc cover) page.
-The default point size and the position can be controlled with
-<a href="#COVER_CONTROL_INDEX">COVER_COPYRIGHT_SIZE/DOC_COVER_COPYRIGHT_SIZE</a>
-and
-<a href="#COVER_CONTROL_INDEX">COVER_COPYRIGHT_QUAD/DOC_COVER_COPYRIGHT_QUAD</a>.
+<a href="definitions.html#ps">point size</a>
+in the bottom right hand corner of the cover or doc cover.  The
+position, as well as all of the standard typesetting parameters, can be
+altered via control macros.
 </p>
 
 <p>
 Similarly, if you request miscellaneous information (and have
-already given <strong>mom</strong> the reference macro,
-<a href="docprocessing.html#MISC">MISC</a>),
+already given mom the reference macro,
+<a href="docprocessing.html#misc">MISC</a>),
 she sets it, by default, in a smaller point size in the bottom left
-hand corner of the cover (or doc cover) page.  The default point
-size is dependent on
-<strong>COVER_COPYRIGHT_SIZE/DOC_COVER_COPYRIGHT_SIZE</strong>,
-but the position can be controlled with
-<a href="#COVER_CONTROL_INDEX">COVER_MISC_QUAD/DOC_COVER_MISC_QUAD</a>.
+hand corner of the cover or doc cover.  As with the copyright, the
+position and type specs can be altered via control macros.
 </p>
 
-<a name="PAGINATION"></a>
+<h3 id="pagination" class="docs">Headers/footers/pagination and cover pages</h3>
 
 <p>
-<strong>NOTE: mom</strong> does not set any
-<a href="definitions.html#TERMS_HEADER">headers</a>
+Mom does not set any
+<a href="definitions.html#header">headers</a>
 or
-<a href="definitions.html#TERMS_FOOTER">footers</a>
+<a href="definitions.html#footer">footers</a>
 on cover pages.  Neither does she set any page numbers.  From
-the point of view of pagination, cover (and doc cover) pages are
-by default considered &quot;null&quot; pages.  If you wish them to
+the point of view of pagination, covers and doc covers are by
+default considered &#8221;null&#8221; pages.  If you wish them to
 be included in the pagination scheme (even though no page numbers
-appear), you must tell <strong>mom</strong> that's what you want
-with the macros <strong>DOC_COVERS_COUNT_PAGES</strong> and/or
-<strong>COVERS_COUNT_PAGES</strong>.
+appear), you must tell mom that&#8217;s what you want with the
+macros DOC_COVERS_COUNT_PAGES and/or COVERS_COUNT_PAGES.
 </p>
 
-<a name="DESIGN"></a>
+<h3 id="design" class="docs">Designing your own cover pages</h3>
 
 <p>
 Finally, if you want to design your own cover page(s), you can
 always typeset them (using the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>),
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>),
 invoke
-<a href="typesetting.html#NEWPAGE"><kbd>.NEWPAGE</kbd></a>,
-set up your document <em>in full</em> (see
-<a href="docprocessing.html#DOCPROCESSING_TUT">Tutorial &mdash; Setting up a mom document</a>),
+<a href="typesetting.html#newpage"><kbd>.NEWPAGE</kbd></a>,
+set up your document (see
+<a href="docprocessing.html#docprocessing-tut">Tutorial &ndash; Setting up a mom document</a>),
 and lastly invoke
-<a href="docprocessing.html#START"><kbd>.START</kbd></a>.
-The cover page (and any typesetting commands on it) will have no
-effect on <strong>mom</strong>'s processing of the document itself,
-the first page of which, moreover, will be numbered &quot;1&quot;
-unless you instruct her otherwise with
-<a href="headfootpage.html#PAGENUMBER">PAGENUMBER</a>.
-</p>
+<a href="docprocessing.html#start"><kbd>.START</kbd></a>.
+The cover page, and any typesetting commands on it, will have no
+effect on mom&#8217;s processing of the document after you invoke
+<kbd><a href="docprocessing.html#START">.START</a></kbd>.
+</p>
+
+<div class="macro-list-container">
+<h3 id="index-covers" class="macro-list">Cover and document cover macros</h3>
+<ul class="macro-list">
+  <li><a href="#cover">COVER and DOC_COVER</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#required-and-optional-args">Required and optional arguments</a></li>
+  </ul></li>
+  <li><a href="#on-off">Enabling/disabling automatic generation of cover pages</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#covers">COVERS</a></li>
+    <li><a href="#doc-covers">DOC_COVERS</a></li>
+  </ul></li>
+  <li><a href="#cover-control">Control macros for covers and doc covers</a></li>
+</ul>
+</div>
 
 <!-- -COVER- -->
 
-<hr width="66%" align="left"/>
-
-<a name="COVER"></a>
-
-<p>
-Macro: <strong>COVER</strong>
-<br/>
-
-<a name="DOC_COVER"></a>
-
-Macro: <strong>DOC_COVER</strong>
-<br/>
-
-<nobr>Required argument: <kbd>TITLE | DOCTITLE | COVERTITLE | CHAPTER | CHAPTER_TITLE | CHAPTER+TITLE</kbd></nobr>
-<br/>
-
-<nobr>Optional arguments: <kbd>[ SUBTITLE AUTHOR DOCTYPE COPYRIGHT MISC BLANKPAGE ]</kbd></nobr>
-<br/>
-
-<em>*Note: these macros should be placed in the
-&quot;style-sheet&quot; section of your document setup (see the</em>
-<a href="docprocessing.html#DOCPROCESSING_TUT">Tutorial &mdash; Setting up a mom document</a>),
-<em>i.e. after PRINTSTYLE (and/or DOCTYPE and/or COPYSTYLE), but
-before START.</em>
-</p>
-
-<p>
-<strong>COVER</strong> and <strong>DOC_COVER</strong> behave
-identically.  The reason <strong>mom</strong> provides two macros
-for automatic cover page generation is so that you can have two
+<div class="macro-id-overline">
+<h3 id="cover" class="macro-id">COVER and DOC_COVER</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>COVER</b> <kbd class="macro-args">(see required and optional arguments, below)</kbd>
+</div>
+
+<div id="doc-cover" class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>DOC_COVER</b> <kbd class="macro-args">(see required and optional arguments, below)</kbd>
+</div>
+
+<div id="required-and-optional-args" style="margin-top: 1em; padding-bottom: 3px; white-space: nowrap; overflow: auto;">
+<b><a href="#required-arg">Required argument:</a></b> <kbd class="macro-args">TITLE | DOCTITLE | COVERTITLE | CHAPTER | CHAPTER_TITLE | CHAPTER+TITLE</kbd>
+</div>
+
+<div style="margin-top: .5em; padding-bottom: 3px; white-space: nowrap; overflow: auto;">
+<b><a href="#optional-args">Optional arguments:</a></b> <kbd class="macro-args">[ SUBTITLE AUTHOR DOCTYPE COPYRIGHT MISC BLANKPAGE ]</kbd>
+</div>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+These macros should be placed in the
+&#8220;style-sheet&#8221; section of your document setup (see
+<a href="docprocessing.html#docprocessing-tut">Tutorial &ndash; Setting up a mom document</a>),
+i.e. after PRINTSTYLE (and/or DOCTYPE and/or COPYSTYLE), but before START.
+</p>
+</div>
+
+<p style="margin-top: -.25em;">
+COVER and DOC_COVER behave identically.  The reason mom provides
+two macros for cover page generation is so that you can have two
 different kinds of covers with different information on each.
 </p>
 
 <p>
-Imagine, for a moment, you've written a document comprised of three
-sections.  When you
-<a href="rectoverso.html#COLLATE">COLLATE</a>
-the document for output, you could use <kbd>.DOC_COVER</kbd>
-to generate a cover page that contained the name of the entire
-document, your (the author's) name, and perhaps the copyright date.
-Subsequently, you could use <kbd>.COVER</kbd>, after each
-<kbd>.COLLATE</kbd> but before each
-<a href="docprocessing.html#START">START</a>,
-to generate a cover page (or cover &quot;sheet&quot;, if you prefer)
-containing just the name of the section.
-</p>
-
-<a name="REQUIRED"><h4><u>The required argument</u></h4></a>
-
-<p>
-Both <strong>COVER</strong> and <strong>DOC_COVER</strong>,
-whenever invoked, require a first argument, as listed above.
-This first argument will become the first bit of information
-<strong>mom</strong> prints on the cover (or doc cover) page (i.e.
-it will be the &quot;title&quot;).
+Imagine, for a moment, you&#8217;ve written a document comprised of
+three sections.  When you
+<a href="rectoverso.html#collate">COLLATE</a>
+the document for output, you could use DOC_COVER to generate a cover
+page that contained the name of the entire document, your (the
+author&#8217;s) name, and perhaps the copyright date.  Subsequently,
+you could use COVER, after each <kbd>.COLLATE</kbd> but before each
+<kbd><a href="docprocessing.html#start">.START</a></kbd>,
+to generate a cover page (or cover &#8221;sheet&#8221;, if you
+prefer) containing just the name of the section.
+</p>
+
+<h4 id="required-arg" class="docs" style="margin-top: -.5em;">The required argument</h4>
+
+<p>
+Both COVER and DOC_COVER, whenever invoked, require a first
+argument, as listed above.  This first argument will become the
+first bit of information mom prints on the cover or doc cover (i.e.
+the title).
 </p>
 
 <p>
-In order for the information to appear, you must, of course, first
-have given <strong>mom</strong> the appropriate
-<a href="docprocessing.html#REFERENCE_MACROS">reference macro</a>.
-A list of the arguments with their equivalent reference macros follows.
-</p>
-
-<dl>
-    <dt><kbd>TITLE</kbd></dt>
-    <dd>
-    &mdash; means the argument you gave to <a href="docprocessing.html#TITLE">TITLE</a>
-    </dd>
-
-    <dt><kbd>DOCTITLE</kbd></dt>
-    <dd>
-    &mdash; means the argument you gave to <a href="docprocessing.html#DOCTITLE">DOCTITLE</a>
-    </dd>
-
-    <dt><kbd>COVERTITLE</kbd></dt>
-    <dd>
-    &mdash; means the argument you gave to <a href="docprocessing.html#COVERTITLE">COVERTITLE</a>
-    or
-    <a href="docprocessing.html#DOC_COVERTITLE">DOC_COVERTITLE</a>
-    </dd>
-
-    <dt><kbd>CHAPTER, CHAPTER_TITLE, CHAPTER+TITLE</kbd></dt>
-    <dd>
-    &mdash; see below (How the CHAPTER argument and friends work)
-    </dd>
+In order for the information to appear, you must, of course, have
+given mom the appropriate
+<a href="docprocessing.html#reference-macros">reference macro</a>.
+A list of first arguments with their equivalent reference macros follows.
+</p>
+
+<dl style="margin-top: -.5em;">
+  <dt class="no-italic"><kbd>TITLE</kbd></dt>
+  <dd>
+  &ndash; means the argument you gave to <a href="docprocessing.html#title">TITLE</a>
+  </dd>
+  <dt class="no-italic"><kbd>DOCTITLE</kbd></dt>
+  <dd>
+  &ndash; means the argument you gave to <a href="docprocessing.html#doc-title">DOCTITLE</a>
+  </dd>
+  <dt class="no-italic"><kbd>COVERTITLE</kbd></dt>
+  <dd>
+  &ndash; means the argument you gave to <a href="docprocessing.html#covertitle">COVERTITLE</a>
+  or
+  <a href="docprocessing.html#doc-covertitle">DOC_COVERTITLE</a>
+  </dd>
+  <dt class="no-italic"><kbd>CHAPTER, CHAPTER_TITLE, CHAPTER+TITLE</kbd></dt>
+  <dd>
+  &ndash; see below, <i>How the CHAPTER argument and friends work</i>
+  </dd>
 </dl>
 
-<a name="CHAPTER"><h5><u>How the CHAPTER argument and friends work</u></h5></a>
+<h5 id="chapter" class="docs" style="margin-top: -.5em; text-transform: none;">How the CHAPTER argument and friends work</h5>
 
 <p>
-<kbd>CHAPTER</kbd>, by itself, will print the
-<a href="docprocessing.html#CHAPTER_STRING">CHAPTER_STRING</a>
-as well as the chapter number that you gave to
-<a href="docprocessing.html#CHAPTER">CHAPTER</a>.
-For example, assuming a vanilla setup for your chapter
-
-<pre>
-    \# Reference macros
-    .CHAPTER 1
-    .CHAPTER_TITLE "The Bonny Blue Yonder"
-    &lt;other stuff&gt;
-    .COVER CHAPTER \" (or .DOC_COVER CHAPTER)
-    .START
-</pre>
-
-will simply print
-
-<pre>
-    Chapter 1
-</pre>
+<span style="display: block; margin-bottom: -1.25em; font-weight: bold;">&bull;&nbsp;CHAPTER</span>
+<br/>
+The <kbd>CHAPTER</kbd> argument will print the
+<a href="docprocessing.html#chapter-string">CHAPTER_STRING</a>
+concatenated with the chapter number you gave to
+<a href="docprocessing.html#chapter">CHAPTER</a>.
+For example, assuming a vanilla setup for your chapter:
+<br/>
+<span class="pre-in-pp" style="color: #64614a;">
+  .CHAPTER 1
+  .CHAPTER_TITLE "The Bonny Blue Yonder"
+  <span style="color: #941614;">.COVER CHAPTER</span>  \"(or <span style="color: #941614;">.DOC_COVER CHAPTER</span>)
+</span>
+will print (and only print)
+<br/>
+<span class="pre-in-pp">
+  Chapter 1
+</span>
 </p>
 
-<p>
-<kbd>CHAPTER_TITLE</kbd> will print the chapter title you
-gave to
-<a href="docprocessing.html#CHAPTER_TITLE">CHAPTER_TITLE</a>.
-For example, assuming a vanilla setup for your chapter
-
-<pre>
-    \# Reference macros
-    .CHAPTER 1
-    .CHAPTER_TITLE "The Bonny Blue Yonder"
-    &lt;other stuff&gt;
-    .COVER CHAPTER_TITLE \" (or .DOC_COVER CHAPTER_TITLE)
-    .START
-</pre>
-
-will simply print
-
-<pre>
+<p style="margin-top: -1em;">
+<span style="display: block; margin-bottom: -1.25em; font-weight: bold;">&bull;&nbsp;CHAPTER_TITLE</span>
+<br/>
+The <kbd>CHAPTER_TITLE</kbd> argument will print the chapter title
+you gave to
+<a href="docprocessing.html#chapter-title">CHAPTER_TITLE</a>.
+For example, assuming a vanilla setup for your chapter:
+<br/>
+<span class="pre-in-pp" style="color: #64614a;">
+  .CHAPTER 1
+  .CHAPTER_TITLE "The Bonny Blue Yonder"
+  <span style="color: #941614;">.COVER CHAPTER_TITLE</span>  \"(or <span style="color: #941614;">.DOC_COVER CHAPTER_TITLE</span>)
+</span>
+will print (and only print)
+<br/>
+<span class="pre-in-pp">
     The Bonny Blue Yonder
-</pre>
+</span>
 </p>
 
-<p>
-<kbd>CHAPTER+TITLE</kbd> will print <strong>both</strong> the
-chapter string + number AND the chapter title.  For example,
-assuming a vanilla setup for your chapter
-
-<pre>
-    \# Reference macros
-    .CHAPTER 1
-    .CHAPTER_TITLE "The Bonny Blue Yonder"
-    &lt;other stuff&gt;
-    .COVER CHAPTER+TITLE \" (or .DOC_COVER CHAPTER+TITLE)
-    .START
-</pre>
-
+<p style="margin-top: -1em;">
+<span style="display: block; margin-bottom: -1.25em; font-weight: bold;">&bull;&nbsp;CHAPTER+TITLE</span>
+<br/>
+The <kbd>CHAPTER+TITLE</kbd> argument will print both the
+concatenated chapter string+number and the chapter title.  For
+example, assuming a vanilla setup for your chapter:
+<br/>
+<span class="pre-in-pp" style="color: #64614a;">
+  .CHAPTER 1
+  .CHAPTER_TITLE "The Bonny Blue Yonder"
+  <span style="color: #941614;">.COVER CHAPTER+TITLE</span> \"(or <span style="color: #941614;">.DOC_COVER CHAPTER+TITLE</span>)
+</span>
 will print
-
-<pre>
-          Chapter 1
-    The Bonny Blue Yonder
-</pre>
+<br/>
+<span class="pre-in-pp">
+        Chapter 1
+  The Bonny Blue Yonder
+</span>
 </p>
 
-<a name="OPTIONAL"><h4><u>The optional arguments</u></h4></a>
+<h4 id="optional-args" class="docs" style="margin-top: -1em;">The optional arguments</h4>
 
 <p>
-The remainder of the arguments to <strong>COVER</strong> and
-<strong>DOC_COVER</strong> are optional.  They refer specifically to
+The remainder of the arguments to COVER and
+DOC_COVER are optional.  They refer specifically to
 the information you gave the
-<a href="docprocessing.html#REFERENCE_MACROS">reference macros</a>
+<a href="docprocessing.html#reference-macros">reference macros</a>
 bearing the same name as the arguments.
 </p>
 
 <p>
 You may enter as many or as few as you would like to see on your
-cover (or doc cover) page.  The only hitch is &mdash; PAY ATTENTION,
-CLASS! &mdash; they must be entered in the order given above.  For
-example, if you want <kbd>TITLE</kbd>, <kbd>AUTHOR</kbd>,
+cover or doc cover.  The only hitch is&mdash;pay attention,
+class&mdash;they must be entered in the order given above.
+For example, if you want <kbd>TITLE</kbd>, <kbd>AUTHOR</kbd>,
 <kbd>COPYRIGHT</kbd> and <kbd>MISC</kbd>
-
-<pre>
+<br/>
+<span class="pre-in-pp">
     .COVER TITLE AUTHOR COPYRIGHT MISC
-</pre>
+</span>
 
 is correct, while
-
-<pre>
+<br/>
+<span class="pre-in-pp">
     .COVER TITLE AUTHOR MISC COPYRIGHT
-</pre>
+</span>
 
 is not.
 </p>
 
-<a name="DOCTYPE"><h5><u>What the DOCTYPE argument means</u></h5></a>
+<h5 id="doctype" class="docs" style="text-transform: none; margin-top: -.5em;">What the DOCTYPE argument means</h5>
 
 <p>
-When you pass <strong>COVER</strong> or <strong>DOC_COVER</strong>
+When you pass COVER or DOC_COVER
 the argument, <kbd>DOCTYPE</kbd>, it refers to the argument you gave
 to
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>&nbsp;<kbd>NAMED</kbd>.
+<a href="docprocessing.html#doctype">DOCTYPE</a>&nbsp;<kbd>NAMED</kbd>.
 For example, if, in your
-<a href="docprocessing.html#DOCSTYLE_MACROS">docstyle macros</a>
+<a href="docprocessing.html#docstyle-macros">docstyle macros</a>
 you gave a
-
-<pre>
+<br/>
+<span class="pre-in-pp">
     .DOCTYPE NAMED "Abstract"
-</pre>
-
-the argument, <kbd>DOCTYPE</kbd>, in the <strong>COVER</strong> or
-<strong>DOC_COVER</strong> macros, would mean that you wanted the
-word, Abstract, to appear on the cover (or doc cover), just as it
-would in the
-<a href="docprocessing.html#DOCHEADER">docheader</a>.
+</span>
+the argument, <kbd>DOCTYPE</kbd>, given to the COVER or DOC_COVER
+macros, would mean that you wanted the word, Abstract, to appear on
+the cover or doc cover underneath the title and/or author(s), just
+as it would in the
+<a href="docprocessing.html#docheader">docheader</a>.
 </p>
 
-<a name="BLANKPAGE"><h5><u>What the BLANKPAGE argument means</u></h5></a>
+<h5 id="blankpage" class="docs" style="text-transform: none; margin-top: -.5em;">What the BLANKPAGE argument means</h5>
 
 <p>
-If the final argument to <strong>DOC_COVER</strong> or
-<strong>COVER</strong> is <kbd>BLANKPAGE</kbd>, <strong>mom</strong>
-will insert a blank page after the doc cover or cover.  This is
+If the final argument to DOC_COVER or COVER is <kbd>BLANKPAGE</kbd>,
+mom will insert a blank page after the doc cover or cover.  This is
 particularly useful if you intend to print your document two-sided,
-since, in two-sided printing, no text should appear on the reverse
-side of cover or title pages.  If <strong>DOC_COVERS_COUNT_PAGES</strong>
-and/or <strong>COVERS_COUNT_PAGES</strong> is enabled, the blank
-page will be considered in the pagination scheme.
+since, in two-sided printing, there may be instances where you do
+not want text on the reverse side of cover or title pages.
+</p>
+
+<p>
+If you enable DOC_COVERS_COUNT_PAGES and/or COVERS_COUNT_PAGES, the
+blank page will be taken into account in the pagination scheme,
+though no page number appears on it.  Otherwise, blank pages are
+invisible to mom's pagination.
 </p>
 
 <!-- -ENABLING/DISABLING- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="on-off" class="macro-id">Enabling/disabling automatic generation of cover pages</h3>
+</div>
 
-<a name="ON_OFF"></a>
+<div id="covers" class="box-macro-args">
+Macro: <b>COVERS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>COVERS</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-<br/>
-
-<nobr>Macro: <strong>DOC_COVERS</strong> &lt;toggle&gt;</nobr>
-</p>
+<div id="doc-covers" class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>DOC_COVERS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
-By default, if you give <strong>mom</strong> a
-<a href="#COVER">COVER</a>
+By default, if you give mom a
+<a href="#cover">COVER</a>
 or
-<a href="#DOC_COVER">DOC_COVER</a>
-macro, she will print it.  In a document that contains sections,
-articles or chapters formerly treated as &quot;one-off's&quot; but
-now being
-<a href="rectoverso.html#COLLATE_INTRO">collated</a>,
+<a href="#doc-cover">DOC_COVER</a>
+directive, she will print the cover or doc cover.  In a document
+that contains sections, articles or chapters formerly treated as
+&#8221;one-off&#8217;s&#8221; but now being
+<a href="rectoverso.html#collate-intro">collated</a>,
 such behaviour may not be desirable.
 </p>
 
 <p>
-<strong>Mom</strong> lets you selectively enable or disable the
-generation of covers and/or doc covers with the toggle macros
-<strong>COVERS</strong> and <strong>DOC_COVERS</strong>.  Because
-they're toggle macros, simply invoking them by themselves enables
-automatic cover (or doc cover) generation, while invoking them with
-any argument at all (<strong>OFF, QUIT, X</strong>, etc) disables
-cover (or doc cover) generation.
-</p>
-
-<p>
-<strong>NOTE:</strong> You must place these macros prior to any
-instance of
-<a href="docprocessing.html#START">START</a>.
-Since they're &quot;on&quot; by default, there's no need to use
-them if you want covers.  However, if you don't, especially in the
-kind of scenario described above, the best place to put them (most
-likely with an <strong>OFF, NO, X</strong>, etc.  argument), is
-immediately after the first invocation of <strong>START</strong>.
-By doing so, you ensure they precede all subsequent instances of
-<strong>START</strong>.
-</p>
-
-<hr align="left" width="66%"/>
-
-<a name="COVER_CONTROL"><h3><u>Control macros &mdash; changing the defaults for covers and document covers</u></h3></a>
-
-<p>
-The default typographic appearance of the items on a cover (or doc
-cover) page is identical to that of the items in a
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>.
+Mom lets you selectively enable or disable the generation of covers
+and/or doc covers with the toggle macros, COVERS and DOC_COVERS.
+Because they&#8217;re toggle macros, simply invoking them by
+themselves enables automatic cover or doc cover generation, while
+invoking them with any argument at all (<kbd>OFF, QUIT, X</kbd>,
+etc) disables cover or doc cover generation.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+You must place these macros prior to any instance of
+<a href="docprocessing.html#start">START</a>.
+Since they&#8217;re &#8221;on&#8221; by default, there&#8217;s no
+need to use them if you want covers.  However, if you don&#8217;t,
+especially in the kind of scenario described above, the best place
+to put them (most likely with an <kbd>OFF, NO, X</kbd>, etc. argument),
+is immediately after the first invocation of START.  By doing so,
+you ensure they meet the requirement of preceding all subsequent
+instances of START.
+</p>
+</div>
+
+<div class="rule-short"><hr/></div>
+
+<h2 id="cover-control" class="macro-group">Control macros for covers and doc covers</h2>
+
+<p>
+The default typographic appearance of the items on a cover or doc
+cover is identical to that of the items in a
+<a href="definitions.html#docheader">docheader</a>.
 (See
-<a href="docprocessing.html#DOCHEADER_CONTROL">How to change the look of docheaders</a>
+<a href="docprocessing.html#docheader-desc">Docheader description</a>
 for a description of the defaults.)
 </p>
 
 <p>
-<a href="docprocessing.html#COPYRIGHT">COPYRIGHT</a>
+<a href="docprocessing.html#copyright">COPYRIGHT</a>
 and
-<a href="docprocessing.html#MISC">MISC</a>,
+<a href="docprocessing.html#misc">MISC</a>,
 which do not appear in docheaders, have the following default
 characteristics:
-
-<ol>
-    <li>The copyright line is set in the bottom right hand corner
-        of the page, 2
-        <a href="definitions.html#TERMS_PS">point sizes</a>
-        smaller than the size of
-        <a href="definitions.html#TERMS_RUNNING">running text</a>
-    </li>
-    <li>The &quot;misc&quot; line is set in the bottom left hand
-        corner of the page, in the same family, font and point size
-        as the copyright line.
-    </li>
-</ol>
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>the COPYRIGHT line is set in the bottom right hand corner
+      of the page, 2
+      <a href="definitions.html#ps">point sizes</a>
+      smaller than the size of
+      <a href="definitions.html#running">running text</a>
+  </li>
+  <li>MISC lines are set in the bottom left hand
+      corner of the page, in the same family, font and point size
+      as the copyright line.
+  </li>
+</ul>
 
 <p>
-With the exception of the copyright and &quot;misc&quot; lines, the
-defaults for the entirety of cover (and doc cover) pages, and all
-the elements thereon, can be changed with control macros whose
-behaviour and arguments are identical to
-<a href="docprocessing.html#DOCHEADER_CONTROL_INDEX">the control macros used for docheaders</a>.
-The only difference is the name by which you invoke the control
-macro(s).
+The defaults for the entirety of covers and doc covers, and all the
+elements thereon, can be changed with control macros whose defaults
+and arguments are identical to the corresponding control macros
+governing docheaders.  The only difference is the name by which you
+invoke them.
 </p>
 
 <p>
-The complete list of cover (and doc cover) page control macros
-follows; please refer to the
-<a href="docprocessing.html#DOCHEADER_CONTROL_INDEX">docheader control macros index</a>
-in order to understand how to use them.
-</p>
-
-<a name="COVER_CONTROL_INDEX"><h4><u>Index of cover and doc cover control macros</u></h4></a>
-
-<pre>
-<a name="COVER_ADVANCE">.COVER_ADVANCE  .DOC_COVER_ADVANCE</a> -+
-<a name="COVER_FAMILY">.COVER_FAMILY   .DOC_COVER_FAMILY</a>   | like DOCHEADER_
-<a name="COVER_LEAD">.COVER_LEAD     .DOC_COVER_LEAD</a>    -+
-
-.COVER_TITLE_FAMILY  .DOC_COVER_TITLE_FAMILY -+
-.COVER_TITLE_FONT    .DOC_COVER_TITLE_FONT    | like
-.COVER_TITLE_COLOR   .DOC_COVER_TITLE_COLOR   | TITLE_
-.COVER_TITLE_SIZE    .DOC_COVER_TITLE_SIZE   -+
-
-.COVER_CHAPTER_TITLE_FAMILY  .DOC_COVER_CHAPTER_TITLE_FAMILY -+
-.COVER_CHAPTER_TITLE_FONT    .DOC_COVER_CHAPTER_TITLE_FONT    | like
-.COVER_CHAPTER_TITLE_COLOR   .DOC_COVER_CHAPTER_TITLE_COLOR   | CHAPTER_TITLE_
-.COVER_CHAPTER_TITLE_SIZE    .DOC_COVER_CHAPTER_TITLE_SIZE   -+
-
-.COVER_SUBTITLE_FAMILY  .DOC_COVER_SUBTITLE_FAMILY -+
-.COVER_SUBTITLE_FONT    .DOC_COVER_SUBTITLE_FONT    | like
-.COVER_SUBTITLE_COLOR   .DOC_COVER_SUBTITLE_COLOR   | SUBTITLE_
-.COVER_SUBTITLE_SIZE    .DOC_COVER_AUTHOR_SIZE     -+
+A complete list of cover and doc cover control macros follows.
+Please refer to
+<a href="docprocessing.html#index-docheader-control">docheader control</a>
+in order to get the defaults and any special instructions for usage.
+</p>
 
-.COVER_ATTRIBUTE_COLOR  .DOC_COVER_ATTRIBUTE_COLOR - like ATTRIBUTE_COLOR
- - the macro, .ATTRIBUTE_STRING, controls the attribution string
-   for both docheaders and cover pages; cover pages have no
-   separate ATTRIBUTE_STRING macro
+<h3 id="index-cover-control" class="docs" style="margin-bottom: .25em;">Cover / doc cover control macros and defaults</h3>
 
-.COVER_AUTHOR_FAMILY  .DOC_COVER_AUTHOR_FAMILY -+
-.COVER_AUTHOR_FONT    .DOC_COVER_AUTHOR_FONT    | like
-.COVER_AUTHOR_COLOR   .DOC_COVER_AUTHOR_COLOR   | AUTHOR_
-.COVER_AUTHOR_SIZE    .DOC_COVER_AUTHOR_SIZE   -+
-
-.COVER_DOCTYPE_FAMILY  .DOC_COVER_DOCTYPE_FAMILY -+
-.COVER_DOCTYPE_FONT    .DOC_COVER_DOCTYPE_FONT    | like
-.COVER_DOCTYPE_COLOR   .DOC_COVER_DOCTYPE_COLOR   | DOCTYPE_
-.COVER_DOCTYPE_SIZE    .DOC_COVER_DOCTYPE_SIZE   -+
-
-.COVER_COPYRIGHT_FAMILY  .DOC_COVER_COPYRIGHT_FAMILY -+
-.COVER_COPYRIGHT_FONT    .DOC_COVER_COPYRIGHT_FONT    | like any
-.COVER_COPYRIGHT_COLOR   .DOC_COVER_COPYRIGHT_COLOR   | of the above
-.COVER_COPYRIGHT_SIZE    .DOC_COVER_COPYRIGHT_SIZE   -+
-.COVER_COPYRIGHT_QUAD    .DOC_COVER_COPYRIGHT_QUAD
- - the copyright quad can be either L (left) or R (right); default is left
-
-.COVER_MISC_COLOR   .DOC_COVER_MISC_COLOR - like any of the above _COLOR macros
-.COVER_MISC_QUAD    .DOC_COVER_MISC_QUAD
- - the misc quad can be either L (left) or R (right); default is left
- - see <a href="#MISC">Notes</a>
+<div class="defaults-container" style="padding-bottom: 8px;">
 
-.COVER_UNDERLINE    .DOC_COVER_UNDERLINE - like DOCTYPE_UNDERLINE
- - see <a href="#UNDERLINE">Notes</a>
+<span class="pre defaults">
+COVER_ADVANCE  DOC_COVER_ADVANCE -+
+COVER_FAMILY   DOC_COVER_FAMILY   | like
+COVER_LEAD     DOC_COVER_LEAD     | DOCHEADER_&lt;spec&gt;
+COVER_QUAD     DOC_COVER_QUAD    -+
 
-.COVERS_COUNT_PAGES .DOC_COVERS_COUNT_PAGES
- - whether to consider cover pages in the pagination scheme; the
-   default is to ignore them
- - see <a href="#COUNT">Notes</a>
-</pre>
+COVER_TITLE_FAMILY  DOC_COVER_TITLE_FAMILY -+
+COVER_TITLE_FONT    DOC_COVER_TITLE_FONT    | like
+COVER_TITLE_COLOR   DOC_COVER_TITLE_COLOR   | TITLE_&lt;spec&gt;
+COVER_TITLE_SIZE    DOC_COVER_TITLE_SIZE   -+
 
-<h5><u>Notes</u></h5>
+COVER_CHAPTER_TITLE_FAMILY  DOC_COVER_CHAPTER_TITLE_FAMILY -+
+COVER_CHAPTER_TITLE_FONT    DOC_COVER_CHAPTER_TITLE_FONT    | like
+COVER_CHAPTER_TITLE_COLOR   DOC_COVER_CHAPTER_TITLE_COLOR   | CHAPTER_TITLE_&lt;spec&gt;
+COVER_CHAPTER_TITLE_SIZE    DOC_COVER_CHAPTER_TITLE_SIZE   -+
 
-<a name="MISC"></a>
+COVER_SUBTITLE_FAMILY  DOC_COVER_SUBTITLE_FAMILY -+
+COVER_SUBTITLE_FONT    DOC_COVER_SUBTITLE_FONT    | like
+COVER_SUBTITLE_COLOR   DOC_COVER_SUBTITLE_COLOR   | SUBTITLE_&lt;spec&gt;
+COVER_SUBTITLE_SIZE    DOC_COVER_AUTHOR_SIZE     -+
 
-<p>
-<strong>COVER_MISC</strong> and <strong>DOC_COVER_MISC</strong>
-have only two control macros, <strong>_COLOR</strong> and
-<strong>_QUAD</strong>.  The family, font and size of
-the <kbd>MISC</kbd> argument to <strong>COVER</strong>
-or <strong>DOC_COVER</strong> are always the same as for
-<kbd>COPYRIGHT</kbd>.  Should you wish the family, font or size
-to be different from <kbd>COPYRIGHT</kbd>, I suggest setting the
-type specs for <kbd>COPYRIGHT</kbd> to the ones you want for
-<kbd>MISC</kbd>, then altering them for <kbd>COPYRIGHT</kbd> using
-<a href="inlines.html#INDEX_INLINES">inline escapes</a>
-in the
-<a href="definitions.html#TERMS_STRINGARGUMENT">string argument</a>
-you pass to the macro,
-<a href="docprocessing.html#COPYRIGHT">COPYRIGHT</a>.
-(Of course, you could always do the reverse, but if you pass several
-arguments to
-<a href="docprocessing.html#MISC">MISC</a>,
-it's more likely you want to get <strong>MISC</strong> right first.)
-</p>
-
-<a name="UNDERLINE"></a>
-
-<p>
-<strong>COVER_UNDERLINE</strong> and <strong>DOC_COVER_UNDERLINE</strong>
-apply only to the doctype-name that appears on covers or doc
-covers, and then only if <kbd>DOCTYPE</kbd> is given as one of the
-arguments to
-<a href="#COVER">COVER</a>
-or
-<a href="#DOC_COVER">DOC_COVER</a>.  It is invoked in exactly the
-same way as
-<a href="docprocessing.html#DOCTYPE_UNDERLINE">DOCTYPE_UNDERLINE</a>.
-</p>
+COVER_ATTRIBUTE_COLOR  DOC_COVER_ATTRIBUTE_COLOR - like ATTRIBUTE_COLOR
+ - the macro, ATTRIBUTE_STRING, controls the attribution string
+   for both docheaders and cover pages; cover pages have no
+   separate ATTRIBUTE_STRING macro
 
-<a name="COUNT"></a>
+COVER_AUTHOR_FAMILY  DOC_COVER_AUTHOR_FAMILY -+
+COVER_AUTHOR_FONT    DOC_COVER_AUTHOR_FONT    | like
+COVER_AUTHOR_COLOR   DOC_COVER_AUTHOR_COLOR   | AUTHOR_&lt;spec&gt;
+COVER_AUTHOR_SIZE    DOC_COVER_AUTHOR_SIZE   -+
+
+COVER_DOCTYPE_FAMILY  DOC_COVER_DOCTYPE_FAMILY -+
+COVER_DOCTYPE_FONT    DOC_COVER_DOCTYPE_FONT    | like
+COVER_DOCTYPE_COLOR   DOC_COVER_DOCTYPE_COLOR   | DOCTYPE_&lt;spec&gt;
+COVER_DOCTYPE_SIZE    DOC_COVER_DOCTYPE_SIZE   -+
+
+COVER_COPYRIGHT_FAMILY  DOC_COVER_COPYRIGHT_FAMILY -+
+COVER_COPYRIGHT_FONT    DOC_COVER_COPYRIGHT_FONT    |
+COVER_COPYRIGHT_COLOR   DOC_COVER_COPYRIGHT_COLOR   | like any of the above
+COVER_COPYRIGHT_SIZE    DOC_COVER_COPYRIGHT_SIZE    |
+COVER_COPYRIGHT_QUAD    DOC_COVER_COPYRIGHT_QUAD   -+
+  - copyright quad sets both the position on the page and the quad
+    direction and can be either L (left) or R (right); default is right
+
+COVER_MISC_FAMILY  DOC_COVER_MISC_FAMILY -+
+COVER_MISC_FONT    DOC_COVER_MISC_FONT    |
+COVER_MISC_COLOR   DOC_COVER_MISC_COLOR   | like any of the above
+COVER_MISC_SIZE    DOC_COVER_MISC_SIZE    |
+COVER_MISC_QUAD    DOC_COVER_MISC_QUAD   -+
+  - misc quad sets both the position on the page and the quad
+    direction and can be either L (left) or R (right); default is left
+
+COVER_UNDERLINE    DOC_COVER_UNDERLINE - like DOCTYPE_UNDERLINE
+  - cover underline controls underlining of the argument given to
+    DOCTYPE NAMED "&lt;name&gt;" only
 
-<p>
-<strong>COVERS_COUNT_PAGES</strong> and
-<strong>DOC_COVERS_COUNT_PAGES</strong> are toggle macros, hence
-invoking them by themselves means that <strong>mom</strong> will
-consider cover and doc cover pages in the pagination scheme;
-invoking them with any argument (<strong>OFF, NO, X</strong>,
-etc.) means they are ignored.  The default is to ignore them.
-</p>
+COVER_COUNTS_PAGES DOC_COVER_COUNTS_PAGES
+ - whether to consider cover pages in the pagination scheme; the
+   default is to ignore them
+ - see Note
+</span>
+</div>
 
-<hr/>
+<p style="margin-top: -2em;">
+<b>Note:</b>
+<br/>
+COVER_COUNTS_PAGES and DOC_COVER_COUNTS_PAGES are toggle macros,
+hence invoking them by themselves means that mom will consider
+covers and doc covers in the pagination scheme; invoking them with
+any argument (<kbd>OFF, NO, X</kbd>, etc.) means they are ignored.
+The default is to ignore them.
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="tables-of-contents.html">Next: Tables of contents</a></td>
+</tr>
+</table>
 
-<p>
-<a href="refer.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="rectoverso.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/definitions.html groff-1.21/contrib/mom/momdoc/definitions.html
--- groff-1.20.1/contrib/mom/momdoc/definitions.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/definitions.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,945 +16,961 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Definitions and Terms</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Definitions and Terms</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
 
-<a name="TOP"></a>
-
-<p>
-<a href="using.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="intro.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<body style="background-color: #f5faff;">
 
-<a name="TERMS"><h1 align="center"><u>Definitions of terms used in this manual</u></h1></a>
+<!-- ==================================================================== -->
 
-<p>
-<a href="#TERMS_TYPESETTING">Typesetting Terms</a>
-<br/>
+<div id="top" class="page">
 
-<a href="#TERMS_GROFF">Groff Terms</a>
-<br/>
+<!-- Navigation links -->
+<table style="width: 100%;">
+  <tr>
+    <td><a href="toc.html">Back to Table of Contents</a></td>
+    <td style="text-align: right;"><a href="using.html#top">Next: Using mom</a></td>
+  </tr>
+</table>
 
-<a href="#TERMS_MOM">Mom Document Processing Terms</a>
-</p>
+<h1 id="terms" class="docs">Definitions of terms used in this manual</h1>
 
 <p>
 I use a number of typesetting-specific and groff-specific terms
 throughout this documentation, as well as a few terms that apply
-to <strong>mom</strong> herself.  To make life easier, I'll explain
+to mom herself.  To make life easier, I&#8217;ll explain
 them here.  Refer back to this section should you encounter a word
-or concept you're not familiar with.
+or concept you&#8217;re not familiar with.
 </p>
 
-<hr/>
-
-<a name="TERMS_TYPESETTING"><h2><u>Typesetting terms</u></h2></a>
+<div class="rule-short" style="margin-top: 18px; margin-bottom: 28px;"><hr/></div>
 
-<ul>
-    <li><a href="#TERMS_ASCENDER">Ascender</a></li>
-    <li><a href="#TERMS_BASELINE">Baseline</a></li>
-    <li><a href="#TERMS_BALLOTBOX">Ballot box</a></li>
-    <li><a href="#TERMS_BULLET">Bullet</a></li>
-    <li><a href="#TERMS_CAPHEIGHT">Cap-height</a></li>
-    <li><a href="#TERMS_DESCENDER">Descender</a></li>
-    <li><a href="#TERMS_DISCRETIONARYHYPHEN">Discretionary hyphen</a></li>
-    <li><a href="#TERMS_DROPCAP">Drop cap</a></li>
-    <li><a href="#TERMS_EM">Em/en</a></li>
-    <li><a href="#TERMS_FAMILY">Family</a></li>
-    <li><a href="#TERMS_FIGURESPACE">Figure space/Digit space</a></li>
-    <li><a href="#TERMS_FIXEDWIDTHFONT">Fixed width font</a></li>
-    <li><a href="#TERMS_FIXEDWIDTHSPACE">Fixed width space</a></li>
-    <li><a href="#TERMS_FONT">Font</a></li>
-    <li><a href="#TERMS_FORCE">Force justify</a></li>
-    <li><a href="#TERMS_JUST">Justify/justification</a></li>
-    <li><a href="#TERMS_GUTTER">Gutter</a></li>
-    <li><a href="#TERMS_KERN">Kerning</a></li>
-    <li><a href="#TERMS_KERNUNIT">Kern Units</a></li>
-    <li><a href="#TERMS_LEADING">Lead/leading</a></li>
-    <li><a href="#TERMS_LEADER">Leaders</a></li>
-    <li><a href="#TERMS_LIGATURES">Ligature</a></li>
-    <li><a href="#TERMS_PICASPOINTS">Picas/Points</a></li>
-    <li><a href="#TERMS_PS">Point Size</a></li>
-    <li><a href="#TERMS_QUAD">Quad</a></li>
-    <li><a href="#TERMS_RAG">Rag</a></li>
-    <li><a href="#TERMS_SHAPE">Shape</a></li>
-    <li><a href="#TERMS_SOLID">Solid/set solid</a></li>
-    <li><a href="#TERMS_TRACKKERNING">Track kerning/Line kerning</a></li>
-    <li><a href="#TERMS_UNBREAKABLESPACE">Unbreakable space</a></li>
-    <li><a href="#TERMS_WEIGHT">Weight</a></li>
-    <li><a href="#TERMS_WORDSPACE">Word space</a></li>
-    <li><a href="#TERMS_XHEIGHT">x-height</a></li>
-</ul>
+<div class="col-1-definitions">
+  <table class="definitions">
+    <tr><th class="definitions">Typesetting terms</th></tr>
+    <tr> 
+      <td>
+        <a href="#ascender">Ascender</a><br/>
+        <a href="#baseline">Baseline</a><br/>
+        <a href="#ballotbox">Ballot box</a><br/>
+        <a href="#bullet">Bullet</a><br/>
+        <a href="#capheight">Cap-height</a><br/>
+        <a href="#descender">Descender</a><br/>
+        <a href="#discretionaryhyphen">Discretionary hyphen</a><br/>
+        <a href="#dropcap">Drop cap</a><br/>
+        <a href="#em">Em/en</a><br/>
+        <a href="#family">Family</a><br/>
+        <a href="#figurespace">Figure space/Digit space</a><br/>
+        <a href="#fixedwidthfont">Fixed width font</a><br/>
+        <a href="#fixedwidthspace">Fixed width space</a><br/>
+        <a href="#font">Font</a><br/>
+        <a href="#force">Force justify</a><br/>
+        <a href="#just">Justify/justification</a><br/>
+        <a href="#gutter">Gutter</a><br/>
+        <a href="#kern">Kerning</a><br/>
+        <a href="#kernunit">Kern Units</a><br/>
+        <a href="#leading">Lead/leading</a><br/>
+        <a href="#leader">Leaders</a><br/>
+        <a href="#ligatures">Ligature</a><br/>
+        <a href="#picaspoints">Picas/Points</a><br/>
+        <a href="#ps">Point Size</a><br/>
+        <a href="#quad">Quad</a><br/>
+        <a href="#rag">Rag</a><br/>
+        <a href="#shape">Shape</a><br/>
+        <a href="#solid">Solid/set solid</a><br/>
+        <a href="#trackkerning">Track kerning/Line kerning</a><br/>
+        <a href="#unbreakablespace">Unbreakable space</a><br/>
+        <a href="#weight">Weight</a><br/>
+        <a href="#wordspace">Word space</a><br/>
+        <a href="#xheight">x-height</a><br/>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<div class="col-2-definitions">
+  <table class="definitions">
+    <tr><th class="definitions">Groff terms</th></tr>
+    <tr> 
+      <td>
+        <a href="#alias">Alias</a><br/>
+        <a href="#arguments">Arguments</a><br/>
+        <a href="#commentlines">Comment lines</a><br/>
+        <a href="#controllines">Control Lines</a><br/>
+        <a href="#filled">Filled lines</a><br/>
+        <a href="#inlines">Inline escapes</a><br/>
+        <a href="#inputline">Input line</a><br/>
+        <a href="#macros">Macros</a><br/>
+        <a href="#units">Machine units</a><br/>
+        <a href="#numericargument">Numeric argument</a><br/>
+        <a href="#outputline">Output line</a><br/>
+        <a href="#primitives">Primitives</a><br/>
+        <a href="#stringargument">String Argument</a><br/>
+        <a href="#unitofmeasure">Unit of measure</a><br/>
+        <a href="#zerowidthcharacter">Zero-width character</a><br/>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<div class="col-3-definitions">
+  <table class="definitions">
+    <tr><th class="definitions">Mom terms</th></tr>
+    <tr>
+      <td>
+        <a href="#blockquote">Blockquote</a><br/>
+        <a href="#controlmacro">Control macro</a><br/>
+        <a href="#docheader">Docheader</a><br/>
+        <a href="#epigraph">Epigraph</a><br/>
+        <a href="#footer">Footer</a><br/>
+        <a href="#head">Head</a><br/>
+        <a href="#header">Header</a><br/>
+        <a href="#linebreak">Linebreak</a><br/>
+        <a href="#parahead">Paragraph head</a><br/>
+        <a href="#quote">Quote</a><br/>
+        <a href="#running">Running text</a><br/>
+        <a href="#subhead">Subhead</a><br/>
+        <a href="#toggle">Toggle</a><br/>
+      </td>
+    </tr>
+  </table>
+</div>
 
+<h3 id="typesetting-terms" class="docs">Typesetting terms</h3>
 <dl>
-    <dt><a name="TERMS_ASCENDER"><em>Ascender</em></a></dt>
-    <dd>
-    The portion of a letter that extends above the bowl.  For
-    example, the letters a, c, and e have no ascenders.  The letters
-    b, d, and h do.
-    </dd>
-
-    <dt><a name="TERMS_BASELINE"><em>Baseline</em></a></dt>
-    <dd>
-    The imaginary line on which the bottoms of capital letters and
-    the bowls of lower case letters rest.
-    </dd>
-    
-    <dt><a name="TERMS_BALLOTBOX"><em>Ballot box</em></a></dt>
-    <dd>
-    An unfilled square, usually
-    <a href="#TERMS_CAPHEIGHT">cap-height</a>
-    in size, typically placed beside items in a checklist.
-    </dd>
-    
-    <dt><a name="TERMS_BULLET"><em>Bullet</em></a></dt>
-    <dd>
-    A small, filled circle typically found beside items or points in
-    a list.
-    </dd>
-    
-    <dt><a name="TERMS_CAPHEIGHT"><em>Cap-height</em></a></dt>
-    <dd>
-    The height of the tallest capital letter in a given
-    <a href="#TERMS_FONT">font</a>
-    at the current
-    <a href="#TERMS_PS">point size</a>.
-    </dd>
-    
-    <dt><a name="TERMS_DESCENDER"><em>Descender</em></a></dt>
-    <dd>
-    The portion of a letter that extends beneath the
-    <a href="#TERMS_BASELINE">baseline</a>
-    (j, q, y are letters with descenders).
-    </dd>
-    
-    <dt><a name="TERMS_DISCRETIONARYHYPHEN"><em>Discretionary hyphen</em></a></dt>
-    <dd>
-    A symbol inserted between two syllables of a word that indicates
-    to a typesetting program the valid hyphenation points in the
-    word.  Normally, if hyphenation is turned on, groff knows where
-    to hyphenate words.  However, hyphenation being what it is
-    (in English, at any rate), groff doesn't always get it right.
-    Discretionary hyphens make sure it does.  In the event that the
-    word doesn't need to be hyphenated at all, groff leaves them
-    alone.  In groff, the discretionary hyphen is entered with
-    
-    <pre>
-    \%  (backslash followed by a percent)
-    </pre>
-    
-    </dd>
-    
-    <dt><a name="TERMS_DROPCAP"><em>Drop cap</em></a></dt>
-    <dd>
-    A large, usually upper-case letter that introduces the first
-    paragraph of a document or section thereof.  The top of the
-    drop cap usually lines up with the top of the first line of the
-    paragraph, and typically &quot;drops&quot; several lines lower.
-    Text adjacent to the drop cap is indented to the right of the
-    letter until the bottom of the drop cap is reached, at which
-    point text reverts to the left margin.
-    </dd>
-    
-    <dt><a name="TERMS_EM"><em>Em/en</em></a></dt>
-    <dd>
-    An em is a relative measurement equal to the width of the
-    letter M at a given
-    <a href="#TERMS_PS">point size</a>
-    in a given
-    <a href="#TERMS_FONT">font</a>.
-    Since most Ms are designed square, an em is usually (but
-    sometimes erroneously) considered to be the same size as the
-    current point size (i.e. if the point size of the type is 12,
-    one em equals 12 points).  An en is equal to the width of a
-    letter N (historically 2/3 of an em, although groff treats an en
-    as 1/2 of an em).  Typically, ems and ens are used to measure
-    indents, or to define the length of dashes (long hyphens).
-    </dd>
-    
-    <dt><a name="TERMS_FAMILY"><em>Family</em></a></dt>
-    <dd>
-    The collective name by which a collection of
-    <a href="#TERMS_FONT">fonts</a>
-    are known, e.g.  Helvetica, Times Roman, Garamond.
-    </dd>
-    
-    <dt><a name="TERMS_FIGURESPACE"><em>Figure space/Digit space</em></a></dt>
-    <dd>
-    A
-    <a href="#TERMS_FIXEDWIDTHSPACE">fixed width space</a>
-    that has the width of one digit.  Used for aligning numerals in,
-    say, columns or numbered lists.  In groff, the figure space is
-    entered with
-    
-    <pre>
-    \0  (backslash followed by a zero)
-    </pre>
-   
-    </dd>
-    
-    <dt><a name="TERMS_FIXEDWIDTHFONT"><em>Fixed width font</em></a></dt>
-    <dd>
-    A family or font in which every character occupies exactly the
-    same amount of vertical space on the line.  Courier is the
-    best-known, if not the most elegant, fixed-width font.
-    </dd>
-
-    <dt><a name="TERMS_FIXEDWIDTHSPACE"><em>Fixed width space</em></a></dt>
-    <dd>
-    Equal to
-    <a href="#TERMS_WORDSPACE">word space</a>,
-    but does not expand or contract when text is
-    <a href="#TERMS_JUST">justified</a>.
-    In groff, fixed width space is entered with
-    
-    <pre>
-    \&lt;space&gt; (backslash followed by hitting the the spacebar on your keyboard)
-    </pre>
-   
-    </dd>
-    
-    <dt><a name="TERMS_FONT"><em>Font</em></a></dt>
-    <dd>
-    The specific
-    <a href="#TERMS_WEIGHT">weight</a>
-    and
-    <a href="#TERMS_SHAPE">shape</a>
-    of type within a
-    <a href="#TERMS_FAMILY">family</a>,
-    e.g. light, medium, bold (which are weights), and roman, italic,
-    condensed (which are shapes).  By default, groff knows of four
-    fonts within its default set of families: R (medium roman), I
-    (medium italic), B (bold roman) and BI (bold italic).
-    <strong>Mom</strong> considerably extends this very basic list.
-    </dd>
-    
-    <dt><a name="TERMS_FORCE"><em>Force justify</em></a></dt>
-    <dd>
-    Sometimes, in
-    <a href="#TERMS_JUST">justified</a>
-    text, a line needs to be broken short of the right margin.
-    Force justifying means telling a typesetting program (like
-    groff) that you want the line broken early AND that you want the
-    line's word spacing stretched to force the line flush with the
-    right margin.
-    </dd>
-    
-    <dt><a name="TERMS_GUTTER"><em>Gutter</em></a></dt>
-    <dd>
-    The vertical whitespace separating columns of type.
-    </dd>
-    
-    <dt><a name="TERMS_JUST"><em>Justify/justification</em></a></dt>
-    <dd>
-    Lines of type are justified when they're flush at both the left
-    and right margins.  Justification is the act of making both
-    margins flush.  Some people use the terms "left justified" and
-    "right justified" to mean type where only the left (or right)
-    margins align.  I don't.  See
-    <a href="#TERMS_QUAD">quad</a>.
-    </dd>
-    
-    <dt><a name="TERMS_KERN"><em>Kerning</em></a></dt>
-    <dd>
-    Moving pairs of letters closer together to remove excess
-    whitespace between them.  In the days before phototypesetting,
-    type was set from small, rectangular blocks of wood or metal,
-    each block having exactly one letter.  Because the edge of
-    each block determined the edge of each letter, certain letter
-    combinations (TA, for example) didn't fit together well and had
-    to be mortised by hand to bring them visually closer.  Modern
-    typesetting systems usually take care of kerning automatically,
-    but they're far from perfect.  Professional typesetters still
-    devote a lot of time to fitting letters and punctuation together
-    properly.
-    </dd>
-    
-    <dt><a name="TERMS_KERNUNIT"><em>Kern Units</em></a></dt>
-    <dd>
-    A relative distance equal to 1/36 of the current
-    <a href="#TERMS_PS">point size</a>.
-    Used between individual letters
-    for
-    <a href="#TERMS_KERN">kerning</a>.
-    Different typesetting systems use different values (1/54 is
-    popular), and sometimes call kern units by a different name.
-
-    <p>
-    <em><strong>Experts: </strong>A kern unit has nothing to do with
-    groff machine units.</em>
-    </p>
-    </dd>
-    
-    <dt><a name="TERMS_LEADING"><em>Lead/leading</em></a></dt>
-    <dd>
-    The distance from the
-    <a href="#TERMS_BASELINE">baseline</a>
-    of one line of type to the line of type immediately beneath
-    it.  Pronounced "ledding."  Also called line spacing.  Usually
-    measured in
-    <a href="#TERMS_PICASPOINTS">points</a>.
-    
-    <p>
-    <em>In case you're interested...</em> In previous centuries,
-    lines of type were separated by thin strips of &mdash; you guessed
-    it &mdash; lead.  Lines of type that had no lead between them were said
-    to be &quot;set solid.&quot; Once you began separating them with
-    strips of lead, they were said to be &quot;leaded&quot;, and the
-    spacing was expressed in terms of the number of
-    <a href="#TERMS_PICASPOINTS">points</a>
-    of lead.  For this reason, &quot;leading&quot; and &quot;line
-    spacing&quot; aren't, historically speaking, synonymous.
-    If type was set 10 on 12, for example, the leading was 2
-    points, not 12.  Nowadays, however, the two terms are used
-    interchangeably to mean the distance from baseline to baseline.
-    </p>
-
-    </dd>
-    
-    <dt><a name="TERMS_LEADER"><em>Leaders</em></a></dt>
-    <dd>
-    Single characters used to fill lines, usually to their end.  So
-    called because they &quot;lead&quot; the eye from one element
-    of the page to another.  For example, in the following (brief)
-    Table of Contents, the periods (dots) are leaders.
-    
-    <pre>
-    Foreword............... 2
-    Chapter 1.............. 5
-    Chapter 2.............. 38
-    Chapter 3.............. 60
-    </pre>
-
-    </dd>
-    
-    <dt><a name="TERMS_LIGATURES"><em>Ligature</em></a></dt>
-    <dd>
-    Ligatures are letters joined together to form a single
-    character.  The commonest are fi, fl, ff, ffi and ffl.  Others
-    are ae and oe.  Occasionally, one sees an st ligature, but this
-    is archaic and quite rare.
-    </dd>
-    
-    <dt><a name="TERMS_PICASPOINTS"><em>Picas/Points</em></a></dt>
-    <dd>
-    There are twelve points in a pica, and six picas in an inch
-    (hence 72 points to the inch).  In the same way that gem-dealers
-    have always used their own system of measurement for weight
-    (carats), typographers have always used their own system of
-    measurement for type.
-    </dd>
-    
-    <dt><a name="TERMS_PS"><em>Point Size</em></a></dt>
-    <dd>
-    The nominal size of type, measured in
-    <a href="#TERMS_PICASPOINTS">points</a>
-    from the bottom of the longest
-    <a href="#TERMS_DESCENDER">descender</a>
-    to the top of the highest
-    <a href="#TERMS_ASCENDER">ascender</a>.
-    In reality, type is always fractionally smaller than its point
-    size.
-    </dd>
-    
-    <dt><a name="TERMS_QUAD"><em>Quad</em></a></dt>
-    <dd>
-    When only one margin of type is flush, lines of type are quadded
-    in the direction of the flush margin.  Therefore, quad left
-    means the left margin is flush, the right isn't.  Quad right
-    means the right margin is flush, the left isn't.  Quad centre
-    means neither the left nor the right margin is flush; rather,
-    lines of type are quadded on both sides so that type appears
-    centred on the page.
-    </dd>
-    
-    <dt><a name="TERMS_RAG"><em>Rag</em></a></dt>
-    <dd>
-    Describes a margin that isn't flush.  Rag right means the right
-    margin isn't flush.  Rag left means the left margin isn't flush.
-    The expression "flush left/rag right" is sometimes used to
-    describe type that is
-    <a href="#TERMS_QUAD">quadded</a>
-    left.
-    </dd>
-    
-    <dt><a name="TERMS_SHAPE"><em>Shape</em></a></dt>
-    <dd>
-    The degree of slant and/or the width of characters.
-    (Technically speaking, this is not a proper typesetting term;
-    however, it may help clarify some concepts presented in these
-    documents.)
-    
-    <p>
-    Some typical shapes are:
-
-    <ul>
-        <li>&quot;Roman&quot;, which has no slant, and has letterforms of
-            average width</li>
-        <li>&quot;Italic&quot;, which is slanted, and has letterforms
-            of average width</li>
-        <li>&quot;Condensed&quot;, which has no slant, but has
-            letterforms narrower than the average represented by Roman</li>
-        <li>&quot;Condensed Italic&quot;, which is slanted, with letterforms narrower
-            than average</li>
-    </ul>
-    </p>
-
-    <p>
-    The term
-    <a href="#TERMS_FONT">font</a>,
-    as it is used in these documents, refers to a combination of
-    <a href="#TERMS_WEIGHT">weight</a>
-    and shape.
-    </p>
-
-    </dd>
-    
-    <dt><a name="TERMS_SOLID"><em>Solid/set solid</em></a></dt>
-    <dd>
-    When no
-    <a href="#TERMS_LEADING">lead</a>
-    is added between lines of type (i.e. the
-    <a href="#TERMS_PS">point size</a>
-    and linespacing are the same), the lines are said to be &quot;set
-    solid.&quot;
-    </dd>
-    
-    <dt><a name="TERMS_TRACKKERNING"><em>Track kerning/Line kerning</em></a></dt>
-    <dd>
-    Sometimes, it's advantageous to increase or decrease the amount
-    of space between every letter in a line by an equal (usually
-    small) amount, in order to fit more (or fewer) characters on the
-    line.  The correct term is letter spacing, but track kerning and
-    line kerning (and sometimes, just "kerning") have come to mean
-    the same thing.
-    </dd>
-    
-    <dt><a name="TERMS_UNBREAKABLESPACE"><em>Unbreakable space</em></a></dt>
-    <dd>
-    Equal to
-    <a href="#TERMS_WORDSPACE">word space</a>,
-    however words separated by an unbreakable space will always be
-    kept together on the same line.  Expands and contracts like word
-    space.  Useful for proper names, which one should, whenever
-    possible, avoid splitting onto two lines.  In groff, unbreakable
-    space is entered with
-    
-    <pre>
-     \~  (backslash followed by a tilde)
-    </pre>
-    
-    </dd>
-    
-    <dt><a name="TERMS_WEIGHT"><em>Weight</em></a></dt>
-    <dd>
-    The thickness of the strokes of letterforms.  Medium and Book
-    have average thicknesses and are the weights used for most
-    of the text in books, magazines, newspapers, etc.  Light has
-    strokes slightly thinner than Medium or Book, but is still
-    acceptable for most text.  Semibold, Bold, Heavy and Black all
-    have strokes of increasing thickness, making them suitable for
-    heads, subheads, headlines and the like.
-    </dd>
-    
-    <dt><a name="TERMS_WORDSPACE"><em>Word space</em></a></dt>
-    <dd>
-    The amount of whitespace between words.  When text is
-    <a href="#TERMS_JUST">justified</a>,
-    word space expands or contracts to make the margins flush.
-    </dd>
-    
-    <dt><a name="TERMS_XHEIGHT"><em>x-height</em></a></dt>
-    <dd>
-    The height of a lower case letter x in a given font at a given
-    point size.  Generally used to mean the average height of the
-    bowl of lower case letters.
-    </dd>
+  <dt id="ascender">Ascender</dt>
+  <dd>
+  The portion of a letter that extends above the bowl.  For
+  example, the letters a, c, and e have no ascenders.  The letters
+  b, d, and h do.
+  </dd>
+
+  <dt id="baseline">Baseline</dt>
+  <dd>
+  The imaginary line on which the bottoms of capital letters and
+  the bowls of lower case letters rest.
+  </dd>
+  
+  <dt id="ballotbox">Ballot box</dt>
+  <dd>
+  An unfilled square, usually
+  <a href="#capheight">cap-height</a>
+  in size, typically placed beside items in a checklist.
+  </dd>
+  
+  <dt id="bullet">Bullet</dt>
+  <dd>
+  A small, filled circle typically found beside items or points in
+  a list.
+  </dd>
+  
+  <dt id="capheight">Cap-height</dt>
+  <dd>
+  The height of the tallest capital letter in a given
+  <a href="#font">font</a>
+  at the current
+  <a href="#ps">point size</a>.
+  </dd>
+  
+  <dt id="descender">Descender</dt>
+  <dd>
+  The portion of a letter that extends beneath the
+  <a href="#baseline">baseline</a>
+  (j, q, y are letters with descenders).
+  </dd>
+  
+  <dt id="discretionaryhyphen">Discretionary hyphen</dt>
+  <dd>
+  A symbol inserted between two syllables of a word that indicates
+  to a typesetting program the valid hyphenation points in the
+  word.  Normally, if hyphenation is turned on, groff knows where
+  to hyphenate words.  However, hyphenation being what it is
+  (in English, at any rate), groff doesn&#8217;t always get it right.
+  Discretionary hyphens make sure it does.  In the event that the
+  word doesn&#8217;t need to be hyphenated at all, groff leaves them
+  alone.  In groff, the discretionary hyphen is entered with
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \%  (backslash followed by a percent)
+  </span>
+  </dd>
+  
+  <dt id="dropcap">Drop cap</dt>
+  <dd>
+  A large, usually upper-case letter that introduces the first
+  paragraph of a document or section thereof.  The top of the
+  drop cap usually lines up with the top of the first line of the
+  paragraph, and typically &#8220;drops&#8221; several lines lower.
+  Text adjacent to the drop cap is indented to the right of the
+  letter until the bottom of the drop cap is reached, at which
+  point text reverts to the left margin.
+  </dd>
+  
+  <dt id="em">Em/en</dt>
+  <dd>
+  An em is a relative measurement equal to the width of the
+  letter M at a given
+  <a href="#ps">point size</a>
+  in a given
+  <a href="#font">font</a>.
+  Since most Ms are designed square, an em is usually (but
+  sometimes erroneously) considered to be the same size as the
+  current point size (i.e. if the point size of the type is 12,
+  one em equals 12 points).  An en is equal to the width of a
+  letter N (historically 2/3 of an em, although groff treats an en
+  as 1/2 of an em).  Typically, ems and ens are used to measure
+  indents, or to define the length of dashes (long hyphens).
+  </dd>
+  
+  <dt id="family">Family</dt>
+  <dd>
+  The collective name by which a collection of
+  <a href="#font">fonts</a>
+  are known, e.g.  Helvetica, Times Roman, Garamond.
+  </dd>
+  
+  <dt id="figurespace">Figure space/Digit space</dt>
+  <dd>
+  A
+  <a href="#fixedwidthspace">fixed width space</a>
+  that has the width of one digit.  Used for aligning numerals in,
+  say, columns or numbered lists.  In groff, the figure space is
+  entered with
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \0  (backslash followed by a zero)
+  </span>
+  </dd>
+  
+  <dt id="fixedwidthfont">Fixed width font</dt>
+  <dd>
+  A family or font in which every character occupies exactly the
+  same amount of vertical space on the line.  Courier is the
+  best-known, if not the most elegant, fixed-width font.
+  </dd>
+
+  <dt id="fixedwidthspace">Fixed width space</dt>
+  <dd>
+  Equal to
+  <a href="#wordspace">word space</a>,
+  but does not expand or contract when text is
+  <a href="#just">justified</a>.
+  In groff, fixed width space is entered with
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \&lt;space&gt; (backslash followed by hitting the spacebar)
+  </span>
+  </dd>
+  
+  <dt id="font">Font</dt>
+  <dd>
+  The specific
+  <a href="#weight">weight</a>
+  and
+  <a href="#shape">shape</a>
+  of type within a
+  <a href="#family">family</a>,
+  e.g. light, medium, bold (which are weights), and roman, italic,
+  condensed (which are shapes).  By default, groff knows of four
+  fonts within its default set of families: R (medium roman), I
+  (medium italic), B (bold roman) and BI (bold italic).
+  Mom considerably extends this very basic list.
+  </dd>
+  
+  <dt id="force">Force justify</dt>
+  <dd>
+  Sometimes, in
+  <a href="#just">justified</a>
+  text, a line needs to be broken short of the right margin.
+  Force justifying means telling a typesetting program (like
+  groff) that you want the line broken early AND that you want the
+  line&#8217;s word spacing stretched to force the line flush with the
+  right margin.
+  </dd>
+  
+  <dt id="gutter">Gutter</dt>
+  <dd>
+  The vertical whitespace separating columns of type.
+  </dd>
+  
+  <dt id="just">Justify/justification</dt>
+  <dd>
+  Lines of type are justified when they&#8217;re flush at both the left
+  and right margins.  Justification is the act of making both
+  margins flush.  Some people use the terms "left justified" and
+  "right justified" to mean type where only the left (or right)
+  margins align.  I don&#8217;t.  See
+  <a href="#quad">quad</a>.
+  </dd>
+  
+  <dt id="kern">Kerning</dt>
+  <dd>
+  Moving pairs of letters closer together to remove excess
+  whitespace between them.  In the days before phototypesetting,
+  type was set from small, rectangular blocks of wood or metal,
+  each block having exactly one letter.  Because the edge of
+  each block determined the edge of each letter, certain letter
+  combinations (TA, for example) didn&#8217;t fit together well and had
+  to be mortised by hand to bring them visually closer.  Modern
+  typesetting systems usually take care of kerning automatically,
+  but they&#8217;re far from perfect.  Professional typesetters still
+  devote a lot of time to fitting letters and punctuation together
+  properly.
+  </dd>
+  
+  <dt id="kernunit">Kern Units</dt>
+  <dd>
+  A relative distance equal to 1/36 of the current
+  <a href="#ps">point size</a>.
+  Used between individual letters
+  for
+  <a href="#kern">kerning</a>.
+  Different typesetting systems use different values (1/54 is
+  popular), and sometimes call kern units by a different name.
+  </dd>
+  
+  <dt id="leading">Lead/leading</dt>
+  <dd>
+  The distance from the
+  <a href="#baseline">baseline</a>
+  of one line of type to the line of type immediately beneath
+  it.  Pronounced "ledding."  Also called line spacing.  Usually
+  measured in
+  <a href="#picaspoints">points</a>.
+  
+  <p>
+  <em>In case you&#8217;re interested...</em> In previous centuries,
+  lines of type were separated by thin strips of&mdash;you guessed
+  it&mdash;lead.  Lines of type that had no lead between them were said
+  to be &#8220;set solid.&#8221; Once you began separating them with
+  strips of lead, they were said to be &#8220;leaded&#8221;, and the
+  spacing was expressed in terms of the number of
+  <a href="#picaspoints">points</a>
+  of lead.  For this reason, &#8220;leading&#8221; and &#8220;line
+  spacing&#8221; aren&#8217;t, historically speaking, synonymous.
+  If type was set 10 on 12, for example, the leading was 2
+  points, not 12.  Nowadays, however, the two terms are used
+  interchangeably to mean the distance from baseline to baseline.
+  </p>
+
+  </dd>
+  
+  <dt id="leader">Leaders</dt>
+  <dd>
+  Single characters used to fill lines, usually to their end.  So
+  called because they &#8220;lead&#8221; the eye from one element
+  of the page to another.  For example, in the following (brief)
+  Table of Contents, the periods (dots) are leaders.
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  Foreword............... 2
+  Chapter 1.............. 5
+  Chapter 2.............. 38
+  Chapter 3.............. 60
+  </span>
+  </dd>
+  
+  <dt id="ligatures">Ligature</dt>
+  <dd>
+  Ligatures are letters joined together to form a single
+  character.  The commonest are fi, fl, ff, ffi and ffl.  Others
+  are ae and oe.  Occasionally, one sees an st ligature, but this
+  is archaic and quite rare.
+  </dd>
+  
+  <dt id="picaspoints">Picas/Points</dt>
+  <dd>
+  There are twelve points in a pica, and six picas in an inch
+  (hence 72 points to the inch).  In the same way that gem-dealers
+  have always used their own system of measurement for weight
+  (carats), typographers have always used their own system of
+  measurement for type.
+  </dd>
+  
+  <dt id="ps">Point Size</dt>
+  <dd>
+  The nominal size of type, measured in
+  <a href="#picaspoints">points</a>
+  from the bottom of the longest
+  <a href="#descender">descender</a>
+  to the top of the highest
+  <a href="#ascender">ascender</a>.
+  In reality, type is always fractionally smaller than its point
+  size.
+  </dd>
+  
+  <dt id="quad">Quad</dt>
+  <dd>
+  When only one margin of type is flush, lines of type are quadded
+  in the direction of the flush margin.  Therefore, quad left
+  means the left margin is flush, the right isn&#8217;t.  Quad right
+  means the right margin is flush, the left isn&#8217;t.  Quad centre
+  means neither the left nor the right margin is flush; rather,
+  lines of type are quadded on both sides so that type appears
+  centred on the page.
+  </dd>
+  
+  <dt id="rag">Rag</dt>
+  <dd>
+  Describes a margin that isn&#8217;t flush.  Rag right means the right
+  margin isn&#8217;t flush.  Rag left means the left margin isn&#8217;t flush.
+  The expression "flush left/rag right" is sometimes used to
+  describe type that is
+  <a href="#quad">quadded</a>
+  left.
+  </dd>
+  
+  <dt id="shape">Shape</dt>
+  <dd>
+  The degree of slant and/or the width of characters.
+  (Technically speaking, this is not a proper typesetting term;
+  however, it may help clarify some concepts presented in these
+  documents.)
+  
+  <p>
+  Some typical shapes are:
+  </p>
+
+  <ul style="margin-top: -.5em; margin-bottom: -.5em">
+      <li>&#8220;Roman&#8221;, which has no slant, and has letterforms of
+          average width</li>
+      <li>&#8220;Italic&#8221;, which is slanted, and has letterforms
+          of average width</li>
+      <li>&#8220;Condensed&#8221;, which has no slant, but has
+          letterforms narrower than the average represented by Roman</li>
+      <li>&#8220;Condensed Italic&#8221;, which is slanted, with letterforms narrower
+          than average</li>
+  </ul>
+
+  <p>
+  The term
+  <a href="#font">font</a>,
+  as it is used in these documents, refers to a combination of
+  <a href="#weight">weight</a>
+  and shape.
+  </p>
+
+  </dd>
+  
+  <dt id="solid">Solid/set solid</dt>
+  <dd>
+  When no
+  <a href="#leading">lead</a>
+  is added between lines of type (i.e. the
+  <a href="#ps">point size</a>
+  and linespacing are the same), the lines are said to be &#8220;set
+  solid.&#8221;
+  </dd>
+  
+  <dt id="trackkerning">Track kerning/Line kerning</dt>
+  <dd>
+  Sometimes, it&#8217;s advantageous to increase or decrease the amount
+  of space between every letter in a line by an equal (usually
+  small) amount, in order to fit more (or fewer) characters on the
+  line.  The correct term is letter spacing, but track kerning and
+  line kerning (and sometimes, just "kerning") have come to mean
+  the same thing.
+  </dd>
+  
+  <dt id="unbreakablespace">Unbreakable space</dt>
+  <dd>
+  Equal to
+  <a href="#wordspace">word space</a>,
+  however words separated by an unbreakable space will always be
+  kept together on the same line.  Expands and contracts like word
+  space.  Useful for proper names, which one should, whenever
+  possible, avoid splitting onto two lines.  In groff, unbreakable
+  space is entered with
+  
+  <span class="pre" style="margin-bottom: -2em;">
+   \~  (backslash followed by a tilde)
+  </span>
+  </dd>
+  
+  <dt id="weight">Weight</dt>
+  <dd>
+  The thickness of the strokes of letterforms.  Medium and Book
+  have average thicknesses and are the weights used for most
+  of the text in books, magazines, newspapers, etc.  Light has
+  strokes slightly thinner than Medium or Book, but is still
+  acceptable for most text.  Semibold, Bold, Heavy and Black all
+  have strokes of increasing thickness, making them suitable for
+  heads, subheads, headlines and the like.
+  </dd>
+  
+  <dt id="wordspace">Word space</dt>
+  <dd>
+  The amount of whitespace between words.  When text is
+  <a href="#just">justified</a>,
+  word space expands or contracts to make the margins flush.
+  </dd>
+  
+  <dt id="xheight">x-height</dt>
+  <dd>
+  The height of a lower case letter x in a given font at a given
+  point size.  Generally used to mean the average height of the
+  bowl of lower case letters.
+  </dd>
 </dl>
 
-<hr/>
-
-<a name="TERMS_GROFF"><h2><u>Groff terms</u></h2></a>
-
-<ul>
-    <li><a href="#TERMS_ALIAS">Alias</a></li>
-    <li><a href="#TERMS_ARGUMENTS">Arguments</a></li>
-    <li><a href="#TERMS_COMMENTLINES">Comment lines</a></li>
-    <li><a href="#TERMS_CONTROLLINES">Control Lines</a></li>
-    <li><a href="#TERMS_FILLED">Filled lines</a></li>
-    <li><a href="#TERMS_INLINES">Inline escapes</a></li>
-    <li><a href="#TERMS_INPUTLINE">Input line</a></li>
-    <li><a href="#TERMS_MACROS">Macros</a></li>
-    <li><a href="#TERMS_UNITS">Machine units</a></li>
-    <li><a href="#TERMS_NUMERICARGUMENT">Numeric argument</a></li>
-    <li><a href="#TERMS_OUTPUTLINE">Output line</a></li>
-    <li><a href="#TERMS_PRIMITIVES">Primitives</a></li>
-    <li><a href="#TERMS_STRINGARGUMENT">String Argument</a></li>
-    <li><a href="#TERMS_UNITOFMEASURE">Unit of measure</a></li>
-    <li><a href="#TERMS_ZEROWIDTHCHARACTER">Zero-width character</a></li>
-</ul>
+<h3 id="groff-terms" class="docs">Groff terms</h3>
 
 <dl>
-    <dt><a name="TERMS_ALIAS"><em>Alias</em></a></dt>
-    <dd>
-    A
-    <a href="#TERMS_MACROS">macro</a>
-    invoked by a name different from its &quot;official&quot;
-    name.  For example, the official name of the macro to change
-    <a href="#TERMS_FAMILY">family</a>
-    is <strong>FAMILY</strong>.  Its alias is <strong>FAM</strong>.
-    Aliases may be created for any macro (via the
-    <a href="goodies.html#ALIAS">ALIAS</a>
-    macro) provided the alias uses a name not already taken by the
-    <strong>mom</strong> macros or one of the groff
-    <a href="#TERMS_PRIMITIVES">primitives</a>.
-    For a complete list of words or names you must not use, see the
-    <a href="reserved.html#RESERVED">list of reserved words</a>.
-    </dd>
-    
-    <dt><a name="TERMS_ARGUMENTS"><em>Arguments</em></a></dt>
-    <dd>
-    Parameters or information needed by a
-    <a href="#TERMS_MACROS">macro</a>
-    to do its job.  For example, in the macro
-    
-    <pre>
-    .PT_SIZE 12
-    </pre>
-    
-    <kbd>12</kbd> is the argument.  In the macro
-    
-    <pre>
-    .QUAD LEFT
-    </pre>
-    
-    <kbd>LEFT</kbd> is the argument.  Arguments are separated from
-    macros by spaces.  Some macros require several arguments; each
-    is separated by a space.
-    </dd>
-    
-    <dt><a name="TERMS_COMMENTLINES"><em>Comment Lines</em></a></dt>
-    <dd>
-    <a href="#TERMS_INPUTLINE">Input lines</a>
-    introduced with the comment character
-    
-    <pre>
-    \#  (backslash followed by the pound sign)
-    </pre>
-    
-    When processing output, groff silently ignores everything on a
-    line that begins with the comment character.
-    </dd>
-    
-    <dt><a name="TERMS_CONTROLLINES"><em>Control Lines</em></a></dt>
-    <dd>
-    Instructions to groff that appear on a line by themselves, which
-    means that &quot;control lines&quot; are either
-    <a href="#TERMS_MACROS">macros</a>
-    or groff
-    <a href="#TERMS_PRIMITIVES">primitives</a>.
-    Control lines begin with a period or, occasionally, an apostrophe.
-    </dd>
-    
-    <dt><a name="TERMS_FILLED"><em>Filled lines/fill mode</em></a></dt>
-    <dd>
-    Automatic
-    <a href="#TERMS_JUST">justification</a>
-    or
-    <a href="#TERMS_QUAD">quadding</a>.
-    In fill mode, the ends of lines as they appear in your text
-    editor are ignored.  Instead, words from adjoining
-    <a href="#TERMS_INPUTLINE">input lines</a>
-    are added one at a time to the output line until no more words
-    fit.  Then, depending whether text is to be
-    <a href="#TERMS_JUST">justified</a>
-    or
-    <a href="#TERMS_QUAD">quadded</a>
-    (left, right, or centre), and depending on whether automatic
-    hyphenation is turned on, groff attempts to hyphenate the last
-    word, or, barring that, spreads and breaks the line (when
-    justification is turned on) or breaks and quads the line (when
-    quadding is turned on).
-    
-    <p>
-    <a name="TERMS_NOFILL"></a>
-    Nofill mode (non-filled text) means that groff respects the ends
-    of lines as they appear in your text editor.
-    </p>
-
-    </dd>
-    
-    <dt><a name="TERMS_INLINES"><em>Inline escapes</em></a></dt>
-    <dd>
-    Instructions issued to groff that appear as part of an
-    <a href="#TERMS_INPUTLINE">input line</a>
-    (as opposed to
-    <a href="#TERMS_MACROS">macros</a>,
-    which must appear on a line by themselves).  Inline escapes are
-    always introduced by the backslash character.  For example,
-    
-    <pre>
-    A line of text with the word T\*[BU 2]oronto in it
-    </pre>
-    
-    contains the inline escape <kbd>\*[BU 2]</kbd> (which means
-    &quot;move the letter 'o' 2
-    <a href="#TERMS_KERNUNIT">kern units</a>
-    closer to the letter 'T'&quot;).
-    
-    <p>
-    <strong>Mom</strong>'s inline escapes always take the form
-    <kbd>\*[&lt;ESCAPE&gt;]</kbd>, where <kbd>ESCAPE</kbd> is
-    composed of capital letters, sometimes followed immediately by a
-    digit, sometimes followed by a space and a
-    <a href="#TERMS_NUMERICARGUMENT">numeric argument</a>.
-    <strong>Groff</strong>'s escapes begin with the backslash
-    character but typically have no star and are in lower case.  For
-    example, the <strong>mom</strong> escapes to move forward 6
-    points on a line are either
-    
-    <pre>
-    \*[FP6]&nbsp;&nbsp;or&nbsp;&nbsp;\*[FWD 6p]
-    </pre>
-    
-    while the <strong>groff</strong> escape for the same thing is
-    
-    <pre>
-        \h'6p'
-    </pre>
-    </p>
-
-    </dd>
-    
-    <dt><a name="TERMS_INPUTLINE"><em>Input line</em></a></dt>
-    <dd>
-    A line of text as it appears in your text editor.
-    </dd>
-    
-    <dt><a name="TERMS_MACROS"><em>Macros</em></a></dt>
-    <dd>
-    Instructions embedded in a document that determine how groff
-    processes the text for output. <strong>mom</strong>'s macros
-    always begin with a period, on a line by themselves, and must
-    be typed in capital letters.  Typically, macros contain complex
-    commands issued to groff &mdash; behind the scenes &mdash; via
-    groff
-    <a href="#TERMS_PRIMITIVES">primitives</a>.
-    </dd>
-    
-    <dt><a name="TERMS_UNITS"><em>Machine units</em></a></dt>
-    <dd>
-    A machine unit is 1/1000 of a
-    <a href="#TERMS_PICASPOINTS">point</a>
-    when the groff device is ps. (&quot;ps&quot; means
-    &quot;PostScript&quot; &mdash; the default device for
-    which groff prepares output, and the device for which
-    <strong>mom</strong> was specifically designed.)
-    </dd>
-    
-    <dt><a name="TERMS_NUMERICARGUMENT"><em>Numeric argument</em></a></dt>
-    <dd>
-    An
-    <a href="#TERMS_ARGUMENTS">argument</a>
-    that has the form of a digit.  Numeric arguments can be built
-    out of arithmetic expressions using +, -, *, and / for plus,
-    minus, times, and divided-by respectively.  If a numeric
-    argument requires a
-    <a href="#TERMS_UNITOFMEASURE">unit of measure</a>,
-    a unit of measure must be appended to <em>every</em> digit in
-    the argument.  For example:
-    
-    <pre>
-    .ALD 1i-1v
-    </pre>
-    
-    <strong>NOTE:</strong> groff does not respect the order of
-    operations, but rather evaluates arithmetic expressions
-    from left to right.  Parentheses must be used to circumvent
-    this peculiarity.  Not to worry, though.  The likelihood of
-    more than just the occasional plus or minus sign when using
-    <strong>mom</strong>'s macros is slim.
-    </dd>
-    
-    <dt><a name="TERMS_OUTPUTLINE"><em>Output line</em></a></dt>
-    <dd>
-    A line of text as it appears in output copy.
-    </dd>
-    
-    <dt><a name="TERMS_PRIMITIVES"><em>Primitives</em></a></dt>
-    <dd>
-    The lowercase instructions, introduced with a period, that groff
-    uses as its native command language, and out of which macros
-    are built.  The majority of groff's primitive requests are two
-    letters long.
-    </dd>
-    
-    <dt><a name="TERMS_STRINGARGUMENT"><em>String Argument</em></a></dt>
-    <dd>
-    Technically, any
-    <a href="#TERMS_ARGUMENTS">argument</a>
-    that is not numeric.  In this documentation, string argument
-    means an argument that requires the user to input text.  For
-    example, in the
-    <a href="#TERMS_MACROS">macro</a>
-    
-    <pre>
-    .TITLE "My Pulitzer Novel"
-    </pre>
-    
-    <kbd>My Pulitzer Novel</kbd> is a string argument.
-    
-    <p>
-    Because string arguments must be enclosed by double-quotes, you
-    can't use double-quotes as part of the string argument.  If you
-    need double-quotes to be part of a string argument, use the
-    <a href="#TERMS_INLINES">inline escapes</a>
-    <strong>\(lq</strong> and <strong>\(rq</strong> (leftquote and
-    rightquote respectively) in place of the double-quote character
-    (<strong>&quot;</strong>).
-    </p>
-
-    </dd>
-    
-    <dt><a name="TERMS_UNITOFMEASURE"><em>Unit of measure</em></a></dt>
-    <dd>
-    The single letter after a
-    <a href="#TERMS_NUMERICARGUMENT">numeric argument</a>
-    that tells <strong>mom</strong> what measurement scale the
-    argument should use.  Common valid units are:
-    
-    <pre>
-    i (inches)
-    p (points)
-    P (Picas)
-    c (centimetres)
-    m (ems)
-    n (ens)
-    v (the current leading (line space))
-    </pre>
-
-    <p>
-    Units of measure must come immediately after the numeric
-    argument (i.e. with no space between the argument and the unit
-    of measure), like this:
-    
-    <pre>
-    .ALD 2v
-    .LL  39P
-    .IL  1i
-    </pre>
-    
-    The above example advances 2 line spaces and sets the line
-    length to 39 picas with a left indent of 1 inch.
-    </p>
-    
-    <p>
-    <strong>IMPORTANT:</strong> Most <strong>mom</strong> macros
-    that set the size or measure of something MUST be given a
-    unit of measure. <strong>mom</strong>'s macros do not have
+  <dt id="alias">Alias</dt>
+  <dd>
+  A
+  <a href="#macros">macro</a>
+  invoked by a name different from its &#8220;official&#8221;
+  name.  For example, the official name of the macro to change
+  <a href="#family">family</a>
+  is <kbd>FAMILY</kbd>.  Its alias is <kbd>FAM</kbd>.
+  Aliases may be created for any macro (via the
+  <a href="goodies.html#alias"><kbd>ALIAS</kbd></a>
+  macro) provided the alias uses a name not already taken by the
+  mom macros or one of the groff
+  <a href="#primitives">primitives</a>.
+  For a complete list of words or names you must not use, see the
+  <a href="reserved.html#reserved">list of reserved words</a>.
+  </dd>
+  
+  <dt id="arguments">Arguments</dt>
+  <dd>
+  Parameters or information needed by a
+  <a href="#macros">macro</a>
+  to do its job.  For example, in the macro
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  .PT_SIZE 12
+  </span>
+  
+  <kbd>12</kbd> is the argument.  In the macro
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  .QUAD LEFT
+  </span>
+  
+  <kbd>LEFT</kbd> is the argument.  Arguments are separated from
+  macros by spaces.  Some macros require several arguments; each
+  is separated by a space.
+  </dd>
+  
+  <dt id="commentlines">Comment Lines</dt>
+  <dd>
+  <a href="#inputline">Input lines</a>
+  introduced with the comment character
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \#  (backslash followed by the pound sign)
+  </span>
+  
+  When processing output, groff silently ignores everything on a
+  line that begins with the comment character.
+  </dd>
+  
+  <dt id="controllines">Control Lines</dt>
+  <dd>
+  Instructions to groff that appear on a line by themselves, which
+  means that &#8220;control lines&#8221; are either
+  <a href="#macros">macros</a>
+  or groff
+  <a href="#primitives">primitives</a>.
+  Control lines begin with a period or, occasionally, an apostrophe.
+  </dd>
+  
+  <dt id="filled">Filled lines/fill mode</dt>
+  <dd>
+  Automatic
+  <a href="#just">justification</a>
+  or
+  <a href="#quad">quadding</a>.
+  In fill mode, the ends of lines as they appear in your text
+  editor are ignored.  Instead, words from adjoining
+  <a href="#inputline">input lines</a>
+  are added one at a time to the output line until no more words
+  fit.  Then, depending whether text is to be
+  <a href="#just">justified</a>
+  or
+  <a href="#quad">quadded</a>
+  (left, right, or centre), and depending on whether automatic
+  hyphenation is turned on, groff attempts to hyphenate the last
+  word, or, barring that, spreads and breaks the line (when
+  justification is turned on) or breaks and quads the line (when
+  quadding is turned on).
+  
+  <p>
+  Nofill mode (non-filled text) means that groff respects the ends
+  of lines exactly as they appear in your text editor.
+  </p>
+
+  </dd>
+  
+  <dt id="inlines">Inline escapes</dt>
+  <dd>
+  Instructions issued to groff that appear as part of an
+  <a href="#inputline">input line</a>
+  (as opposed to
+  <a href="#macros">macros</a>,
+  which must appear on a line by themselves).  Inline escapes are
+  always introduced by the backslash character.  For example,
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  A line of text with the word T\*[BU 2]oronto in it
+  </span>
+  
+  contains the inline escape <kbd>\*[BU 2]</kbd> (which means
+  &#8220;move the letter &#8216;o&#8217; 2
+  <a href="#kernunit">kern units</a>
+  closer to the letter &#8216;T&#8217;&#8221;).
+  
+  <p style="margin-bottom: -2em;">
+  Mom&#8217;s inline escapes always take the form
+  <kbd>\*[&lt;ESCAPE&gt;]</kbd>, where <kbd>ESCAPE</kbd> is
+  composed of capital letters, sometimes followed immediately by a
+  digit, sometimes followed by a space and a
+  <a href="#numericargument">numeric argument</a>.
+  Groff&#8217;s escapes begin with the backslash
+  character but typically have no star and are in lower case.  For
+  example, the mom escapes to move forward 6
+  points on a line are either
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \*[FP6]&nbsp;&nbsp;or&nbsp;&nbsp;\*[FWD 6p]
+  </span>
+  
+  while the groff escape for the same thing is
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \h&#8217;6p&#8217;
+  </span>
+  </p>
+
+  </dd>
+  
+  <dt id="inputline" style="margin-top: -1em;">Input line</dt>
+  <dd>
+  A line of text as it appears in your text editor.
+  </dd>
+  
+  <dt id="macros">Macros</dt>
+  <dd>
+  Instructions embedded in a document that determine how groff
+  processes the text for output. mom&#8217;s macros
+  always begin with a period, on a line by themselves, and must
+  be typed in capital letters.  Typically, macros contain complex
+  commands issued to groff&mdash;behind the scenes&mdash;via
+  groff
+  <a href="#primitives">primitives</a>.
+  </dd>
+  
+  <dt id="units">Machine units</dt>
+  <dd>
+  A machine unit is 1/1000 of a
+  <a href="#picaspoints">point</a>
+  when the groff device is ps. (&#8220;ps&#8221; means
+  &#8220;PostScript&#8221;&mdash;the default device for
+  which groff prepares output, and the device for which
+  mom was specifically designed.)
+  </dd>
+  
+  <dt id="numericargument">Numeric argument</dt>
+  <dd>
+  An
+  <a href="#arguments">argument</a>
+  that has the form of a digit.  Numeric arguments can be built
+  out of arithmetic expressions using +, -, *, and / for plus,
+  minus, times, and divided-by respectively.  If a numeric
+  argument requires a
+  <a href="#unitofmeasure">unit of measure</a>,
+  a unit of measure must be appended to <em>every</em> digit in
+  the argument.  For example:
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  .ALD 1i-1v
+  </span>
+  
+  <div class="box-important" style="margin-right: 2.5em;">
+    <p class="tip">
+    <span class="important">IMPORTANT:</span> groff does not
+    respect the order of operations, but rather evaluates
+    arithmetic expressions from left to right.  Parentheses must
+    be used to circumvent this peculiarity.  Not to worry, though.
+    The likelihood of more than just the occasional plus or minus
+    sign when using mom&#8217;s macros is slim.
+    </p>
+  </div>
+  </dd>
+  
+  <dt id="outputline">Output line</dt>
+  <dd>
+  A line of text as it appears in output copy.
+  </dd>
+  
+  <dt id="primitives">Primitives</dt>
+  <dd>
+  The lowercase instructions, introduced with a period, that groff
+  uses as its native command language, and out of which macros
+  are built.  The majority of groff&#8217;s primitive requests are two
+  letters long.
+  </dd>
+  
+  <dt id="stringargument">String Argument</dt>
+  <dd>
+  Technically, any
+  <a href="#arguments">argument</a>
+  that is not numeric.  In this documentation, string argument
+  means an argument that requires the user to input text.  For
+  example, in the
+  <a href="#macros">macro</a>
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  .TITLE "My Pulitzer Novel"
+  </span>
+  
+  <kbd>"My Pulitzer Novel"</kbd> is a string argument.
+  
+  <p>
+  Because string arguments must be enclosed by double-quotes, you
+  can&#8217;t use double-quotes as part of the string argument.  If you
+  need double-quotes to be part of a string argument, use the
+  <a href="#inlines">inline escapes</a>
+  <kbd>\(lq</kbd> and <kbd>\(rq</kbd> (leftquote and
+  rightquote respectively) in place of the double-quote character
+  (<kbd>"</kbd>).
+  </p>
+
+  </dd>
+  
+  <dt id="unitofmeasure">Unit of measure</dt>
+  <dd>
+  The single letter after a
+  <a href="#numericargument">numeric argument</a>
+  that tells mom what measurement scale the
+  argument should use.  Common valid units are:
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  i (inches)
+  p (points)
+  P (Picas)
+  c (centimetres)
+  m (ems)
+  n (ens)
+  u (machine units)
+  v (the current leading [line space])
+  </span>
+
+  <p style="margin-top: -1em;">
+  Units of measure must come immediately after the numeric
+  argument (i.e. with no space between the argument and the unit
+  of measure), like this:
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  .ALD 2v
+  .LL  39P
+  .IL  1i
+  </span>
+  
+  The above example advances 2 line spaces and sets the line
+  length to 39 picas with a left indent of 1 inch.
+  </p>
+  
+  <div class="box-important" style="margin-right: 2.5em;">
+    <p class="tip">
+    <span class="important">IMPORTANT:</span>
+    Most mom macros that set the size or measure of something must
+    be given a unit of measure since most of the macros do not have
     default units of measure.  There are a couple of exceptions,
-    the most notable of which are <strong>PT_SIZE</strong> and
-    <strong>LS</strong>.  Both use
-    <a href="#TERMS_PICASPOINTS">points</a>
-    as the default unit of measure, which means you don't have to
-    append &quot;p&quot; to their argument.
-    </p>
-    
-    <p>
-    You can enter decimal values for any unit of measure.  Different
-    units may be combined by adding them together (e.g. 1.5i+2m,
-    which gives a measure of 1-1/2 inches plus 2 ems).
-    </p>
-    
-    <p>
-    <strong>NOTE:</strong> a pica is composed of 12 points,
-    therefore 12.5 picas is 12 picas and 6 points, not 12 picas and
-    5 points.  If you want 12 picas and 5 points, you have to enter
-    the measure as 12P+5p.
-    </p>
-
-    </dd>
-    
-    <dt><a name="TERMS_ZEROWIDTHCHARACTER"><em>Zero-width character</em></a></dt>
-    <dd>
-    The
-    <a href="#TERMS_INLINES">inline escape</a>
-    that allows you to print a literal period, apostrophe and, if
-    <a href="#TERMS_OUTPUTLINE">output lines</a>
-    are
-    <a href="#TERMS_FILLED">filled</a>,
-    a space that falls at the beginning of an
-    <a href="#TERMS_INPUTLINE">input line</a>.
-    It looks like this:
-    
-    <pre>
-    \&amp; (backslash followed by an ampersand)
-    </pre>
-    
-    Normally, groff interprets a period (or an apostrophe) at the
-    beginning of an input line as meaning that what follows is a
-    <a href="#TERMS_CONTROLLINES">control line</a>.
-    In fill modes, groff treats a space at the beginning of an input
-    line as meaning &quot;start a new line and put a space at the
-    beginning of it.&quot; If you want groff to interpret periods
-    and apostrophes at the beginning of input lines literally (i.e.
-    print them), or spaces at the beginning of input lines as just
-    garden variety word spaces, you must start the line with the
-    zero-width character.
-    </dd>
+    the most notable of which are <kbd>PT_SIZE</kbd> and
+    <kbd class="bold">LS</kbd>.  Both use
+    <a href="#picaspoints">points</a>
+    as the default unit of measure, which means you don&#8217;t have to
+    append &#8220;p&#8221; to their argument.
+    </p>
+  </div>
+  
+  <p>
+  You can enter decimal values for any unit of measure.  Different
+  units may be combined by adding them together (e.g. 1.5i+2m,
+  which gives a measure of 1-1/2 inches plus 2 ems).
+  </p>
+  
+  <div class="box-tip" style="margin-right: 2.5em;">
+    <p class="tip">
+    <span class="note">Note:</span>
+    a pica is composed of 12 points, therefore 12.5 picas is 12
+    picas and 6 points, not 12 picas and 5 points.  If you want 12
+    picas and 5 points, you have to enter the measure as 12P+5p.
+    </p>
+  </div>
+
+  </dd>
+  
+  <dt id="zerowidthcharacter">Zero-width character</dt>
+  <dd>
+  The
+  <a href="#inlines">inline escape</a>
+  that allows you to print a literal period, apostrophe and, if
+  <a href="#outputline">output lines</a>
+  are
+  <a href="#filled">filled</a>,
+  a space that falls at the beginning of an
+  <a href="#inputline">input line</a>.
+  It looks like this:
+  
+  <span class="pre" style="margin-bottom: -2em;">
+  \&amp; (backslash followed by an ampersand)
+  </span>
+  
+  Normally, groff interprets a period (or an apostrophe) at the
+  beginning of an input line as meaning that what follows is a
+  <a href="#controllines">control line</a>.
+  In fill modes, groff treats a space at the beginning of an input
+  line as meaning &#8220;start a new line and put a space at the
+  beginning of it.&#8221; If you want groff to interpret periods
+  and apostrophes at the beginning of input lines literally (i.e.
+  print them), or spaces at the beginning of input lines as just
+  garden variety word spaces, you must start the line with the
+  zero-width character.
+  </dd>
 </dl>
 
-<hr/>
-
-<a name="TERMS_MOM"><h2><u>Mom's Document Processing Terms</u></h2></a>
-
-<ul>
-    <li><a href="#TERMS_BLOCKQUOTE">Blockquote</a></li>
-    <li><a href="#TERMS_CONTROLMACRO">Control macro</a></li>
-    <li><a href="#TERMS_DOCHEADER">Docheader</a></li>
-    <li><a href="#TERMS_EPIGRAPH">Epigraph</a></li>
-    <li><a href="#TERMS_FOOTER">Footer</a></li>
-    <li><a href="#TERMS_HEAD">Head</a></li>
-    <li><a href="#TERMS_HEADER">Header</a></li>
-    <li><a href="#TERMS_LINEBREAK">Linebreak</a></li>
-    <li><a href="#TERMS_PARAHEAD">Paragraph head</a></li>
-    <li><a href="#TERMS_QUOTE">Quote</a></li>
-    <li><a href="#TERMS_RUNNING">Running text</a></li>
-    <li><a href="#TERMS_SUBHEAD">Subhead</a></li>
-    <li><a href="#TERMS_TOGGLE">Toggle</a></li>
-</ul>
+<h3 id="mom-terms" class="docs">Mom terms</h3>
 <dl>
-    <dt><a name="TERMS_BLOCKQUOTE"><em>Blockquote</em></a></dt>
-    <dd>
-    Cited material other than
-    <a href="#TERMS_QUOTE">quotes</a>.
-    Typically set at a smaller point size than paragraph text,
-    indented from the left and right margins.  Blockquotes are
-    <a href="#TERMS_FILLED">filled</a>.
-    </dd>
-    
-    <dt><a name="TERMS_CONTROLMACRO"><em>Control macro</em></a></dt>
-    <dd>
-    Macros used in
-    <a href="docprocessing.html#DOCPROCESSING">document processing</a>
-    to control/alter the appearance of document elements (e.g.
-    heads, quotes, footnotes,
-    <a href="#TERMS_HEADER">headers</a>,
-    etc.).
-    </dd>
-    
-    <dt><a name="TERMS_DOCHEADER"><em>Document header/docheader</em></a></dt>
-    <dd>
-    Document information (title, subtitle, author, etc) output at
-    the top of page one.
-    </dd>
-    
-    <dt><a name="TERMS_EPIGRAPH"><em>Epigraph</em></a></dt>
-    <dd>
-    A short, usually cited passage that appears at the beginning of
-    a chapter, story, or other document.
-    </dd>
-    
-    <dt><a name="TERMS_FOOTER"><em>Footer/page footer</em></a></dt>
-    <dd>
-    Document information (frequently author and title) output in
-    the bottom margin of pages <em>after</em> page one.  Not to be
-    confused with footnotes, which are considered part of
-    <a href="#TERMS_RUNNING">running text</a>.
-    </dd>
-    
-    <dt><a name="TERMS_HEAD"><em>Head</em></a></dt>
-    <dd>
-    A title that introduces a major section of a document.
-    </dd>
-    
-    <dt><a name="TERMS_HEADER"><em>Header/page header</em></a></dt>
-    <dd>
-    Document information (frequently author and title) output in the
-    top margin of pages <em>after</em> page one.
-    
-    <p>
-    <strong>NOTE:</strong> In terms of content and style, headers
-    and
-    <a href="#TERMS_FOOTER">footers</a>
+  <dt id="blockquote">Blockquote</dt>
+  <dd>
+  Cited material other than
+  <a href="#quote">quotes</a>.
+  Typically set at a smaller point size than paragraph text,
+  indented from the left and right margins.  Blockquotes are
+  <a href="#filled">filled</a>.
+  </dd>
+  
+  <dt id="controlmacro">Control macro</dt>
+  <dd>
+  Macros used in
+  <a href="docprocessing.html#docprocessing">document processing</a>
+  to control/alter the appearance of document elements (e.g.
+  heads, quotes, footnotes,
+  <a href="#header">headers</a>,
+  etc.).
+  </dd>
+  
+  <dt id="docheader">Document header/docheader</dt>
+  <dd>
+  Document information (title, subtitle, author, etc) output at
+  the top of page one.
+  </dd>
+  
+  <dt id="epigraph">Epigraph</dt>
+  <dd>
+  A short, usually cited passage that appears at the beginning of
+  a chapter, story, or other document.
+  </dd>
+  
+  <dt id="footer">Footer/page footer</dt>
+  <dd>
+  Document information (frequently author and title) output in
+  the bottom margin of pages <em>after</em> page one.  Not to be
+  confused with footnotes, which are considered part of
+  <a href="#running">running text</a>.
+  </dd>
+  
+  <dt id="head">Head</dt>
+  <dd>
+  A title that introduces a major section of a document.
+  </dd>
+  
+  <dt id="header">Header/page header</dt>
+  <dd>
+  Document information (frequently author and title) output in the
+  top margin of pages <em>after</em> page one.
+  
+  <div class="box-tip" style="margin-right: 2.5em;">
+    <p class="tip">
+    <span class="note">Note:</span> In terms of content and style,
+    headers and
+    <a href="#footer">footers</a>
     are the same; they differ only in their placement on the page.
     In most places in this documentation, references to the content
     or style of headers applies equally to footers.
     </p>
+  </div>
 
-    </dd>
-    
-    <dt><a name="TERMS_LINEBREAK"><em>Linebreak/author linebreak</em></a></dt>
-    <dd>
-    A horizontal gap in
-    <a href="#TERMS_RUNNING">running text</a>,
-    frequently set off by typographic symbols such as asterisks or
-    daggers.  Used to indicate a shift in the content of a document
-    (e.g. a scene change in a short story).  Also commonly called a
-    scene break or a section break.
-    </dd>
-    
-    <dt><a name="TERMS_PARAHEAD"><em>Paragraph head</em></a></dt>
-    <dd>
-    A title joined to the body of a paragraph; hierarchically one
-    level beneath
-    <a href="#TERMS_SUBHEAD">subheads</a>.
-    </dd>
-    
-    <dt><a name="TERMS_QUOTE"><em>Quote</em></a></dt>
-    <dd>
-    A quote, to <strong>mom</strong>, is a line-for-line setting
-    of quoted material (e.g. poetry, song lyrics, or a snippet of
-    programming code).  You don't have to use
-    <a href="typesetting.html#BR">BR</a>
-    with quotes.
-    </dd>
-    
-    <dt><a name="TERMS_RUNNING"><em>Running text</em></a></dt>
-    <dd>
-    In a document formatted with <strong>mom</strong>, running
-    text means text that forms the body of the document, including
-    elements such as heads and subheads.
-    <a href="#TERMS_DOCHEADER">Docheaders</a>,
-    <a href="#TERMS_HEADER">headers</a>,
-    <a href="#TERMS_FOOTER">footers</a>
-    and page numbers are NOT part of running text.
-    </dd>
-    
-    <dt><a name="TERMS_SUBHEAD"><em>Subhead</em></a></dt>
-    <dd>
-    A title used to introduce secondary sections of a document;
-    hierarchically one level beneath sections introduced by
-    <a href="#TERMS_HEAD">heads</a>.
-    </dd>
-    
-    <dt><a name="TERMS_TOGGLE"><em>Toggle</em></a></dt>
-    <dd>
-    A macro or tag that, when invoked without an argument, begins
-    something or turns a feature on, and, when invoked with ANY
-    argument, ends something or turns a feature off.  See
-    <a href="intro.html#TOGGLE_EXAMPLE">Example 3</a>
-    of the section
-    <a href="intro.html#MACRO_ARGS">How to read macro arguments</a>.
-    </dd>
+  </dd>
+  
+  <dt id="linebreak">Linebreak/author linebreak</dt>
+  <dd>
+  A gap in the vertical flow of
+  <a href="#running">running text</a>,
+  frequently set off by typographic symbols such as asterisks or
+  daggers.  Used to indicate a shift in the content of a document
+  (e.g. a scene change in a short story).  Also commonly called a
+  scene break or a section break.
+  </dd>
+  
+  <dt id="parahead">Paragraph head</dt>
+  <dd>
+  A title joined to the body of a paragraph; hierarchically one
+  level beneath
+  <a href="#subhead">subheads</a>.
+  </dd>
+  
+  <dt id="quote">Quote</dt>
+  <dd>
+  A quote, to mom, is a line-for-line setting
+  of quoted material (e.g. poetry, song lyrics, or a snippet of
+  programming code).  You don&#8217;t have to use
+  <a href="typesetting.html#br"><kbd>BR</kbd></a>
+  with quotes.
+  </dd>
+  
+  <dt id="running">Running text</dt>
+  <dd>
+  In a document formatted with mom, running
+  text means text that forms the body of the document, including
+  elements such as heads and subheads.
+  <a href="#docheader">Docheaders</a>,
+  <a href="#header">headers</a>,
+  <a href="#footer">footers</a>
+  and page numbers are not part of running text.
+  </dd>
+  
+  <dt id="subhead">Subhead</dt>
+  <dd>
+  A title used to introduce secondary sections of a document;
+  hierarchically one level beneath sections introduced by
+  <a href="#head">heads</a>.
+  </dd>
+  
+  <dt id="toggle">Toggle</dt>
+  <dd>
+  A macro or tag that, when invoked without an argument, begins
+  something or turns a feature on, and, when invoked with ANY
+  argument, ends something or turns a feature off.  See
+  <a href="intro.html#toggle-example">Example 3</a>
+  of the section
+  <a href="intro.html#macro-args">How to read macro arguments</a>.
+  </dd>
 </dl>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="using.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="intro.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+  <tr>
+    <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+    <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+    <td style="width: 33%; text-align: right;"><a href="using.html#top">Next: Using mom</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified:-->
diff -ruN groff-1.20.1/contrib/mom/momdoc/docelement.html groff-1.21/contrib/mom/momdoc/docelement.html
--- groff-1.20.1/contrib/mom/momdoc/docelement.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/docelement.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,730 +16,754 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Document Processing, element tags</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Document processing, element tags</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="headfootpage.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="docprocessing.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="images.html#top">Next: Inserting images</a></td>
+</tr>
+</table>
+
+<h1 class="docs">The document element tags</h1>
+
+<div style="width: 386px; margin: auto;">
+<ul class="no-enumerator">
+  <li><a href="#docelement-intro">Introduction to the document element tags</a></li>
+  <li><a href="#docelement-control">Control macros &ndash; changing the tag defaults</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#control-macro-args">Arguments to the control macros</a>
+    <ul style="margin-left: -.5em; list-style-type: circle;">
+      <li><a href="#family-and-font">family and font</a></li>
+      <li><a href="#point-size">point size</a></li>
+      <li><a href="#color">colour</a></li>
+      <li><a href="#quad">quad/justification</a></li>
+      <li><a href="#underline">underline style, rule weight</a></li>
+    </ul></li>
+  </ul></li>
+</ul>
+</div>
 
-<a name="DOCELEMENT"><h1 align="center"><u>The document element tags</u></h1></a>
+<div class="rule-medium"><hr/></div>
 
-<ul>
-    <li><a href="#DOCELEMENT_INTRO">Introduction to the document element tags</a></li>
-    <ul>
-        <li><a href="#DOCELEMENT_CONTROL">Control macros &mdash; changing defaults for document element tags</a></li>
-        <li><a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a></li>
-        <ul>
-            <li><a href="#FAMILY_AND_FONT">Family and font</a></li>
-            <li><a href="#POINT_SIZE">Point size</a></li>
-            <li><a href="#COLOR">Colour</a></li>
-            <li><a href="#QUAD">Quad/justification style</a></li>
-            <li><a href="#UNDERLINE">Underline style, rule weight</a></li>
-        </ul>
-    </ul>
-    <li><a href="#INDEX_DOCELEMENT">Index of document element tags</a></li>
+<h2 id="toc-doc-element" class="docs" style="text-align: center;">Document element tags table of contents</h2>
+
+<div id="docelement-mini-toc" style="font-size: 100%; line-height: 150%; margin-top: .5em;">
+<div class="mini-toc-col-1" style="margin-left: 0;">
+<h3 class="toc toc-docproc-header" style="margin-top: 1em;"><a class="header-link" href="#epigraph-intro">Epigraphs</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#epigraph">EPIGRAPH</a></li>
+  <li><a href="#epigraph-control">Epigraph control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#pp-intro">Paragraphs</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#pp">PP</a></li>
+  <li><a href="#pp-control">Paragraph control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#head-intro">Main heads</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#head">HEAD</a></li>
+  <li><a href="#head-control">Head control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#subhead-intro">Subheads</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#subhead">SUBHEAD</a></li>
+  <li><a href="#subhead-control">Subhead control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#parahead-intro">Paragraph heads</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#parahead">PARAHEAD</a></li>
+  <li><a href="#parahead-control">Parahead control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#linebreak-intro">Linebreaks (section breaks)</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#linebreak">LINEBREAK</a></li>
+  <li><a href="#linebreak-control">Linebreak control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#quote-intro">Quotes (line for line; poetry or code)</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#quote">QUOTE</a></li>
+  <li><a href="#quote-control">Quote control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#blockquote-intro">Blockquotes (cited material)</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#blockquote">BLOCKQUOTE</a></li>
+  <li><a href="#blockquote-control">Blockquote control</a></li>
+</ul>
+</div>
+<div class="mini-toc-col-2" style="margin-top: 1.5em;">
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#code-intro">Inserting code snippets</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#code">CODE</a></li>
+  <li><a href="#code-control">Code control</a></li>
 </ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#list-intro">Nested lists</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#list">LIST</a></li>
+  <li><a href="#item">ITEM</a></li>
+  <li><a href="#list-control">List control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#number-lines-intro">Line numbering</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#number-lines">NUMBER_LINES</a></li>
+  <li><a href="#number-lines-control">Line numbering control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#footnote-intro">Footnotes</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#footnote">FOOTNOTE</a></li>
+  <li><a href="#footnote-control">Footnote control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#endnote-intro">Endnotes</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#endnote">ENDNOTE</a></li>
+  <li><a href="#endnote-control">Endnote control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#margin-notes-intro">Margin notes</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#mn-init">MN_INIT</a></li>
+  <li><a href="#mn">MN</a></li>
+  <li><a href="#margin-notes-control">Margin notes control</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#finis-intro">Document termination string</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#finis">FINIS</a></li>
+  <li><a href="#finis-control">Finis control</a></li>
+</ul>
+</div>
+</div>
 
-<a name="DOCELEMENT_INTRO"><h2><u>Introduction to the document element tags</u></h2></a>
+<div class="rule-medium" style="clear: both;"><hr/></div>
+
+<h2 id="docelement-intro" class="docs">Introduction to the document element tags</h2>
 
 <p>
-Once you've completed the setup for a document (see
-<a href="docprocessing.html#DOCPROCESSING_TUT">Setting up a mom document</a>),
+Once you&#8217;ve completed the setup for a document (see
+<a href="docprocessing.html#docprocessing-tut">Setting up a mom document</a>),
 formatting it is a snap.  Simply invoke the appropriate tag for
 each document element as you need it.  The tags are macros that
-tell <strong>mom</strong>, &quot;This is a paragraph, this
-is a subhead, this is a footnote,&quot; and so on.
+tell mom: &#8220;This is a paragraph; this is a subhead; this is a
+footnote,&#8221; and so on.
 </p>
 
 <p>
-The list of tags is actually quite small &mdash; ideal for the users
-<strong>mom</strong> brought herself into being for (see
-<a href="intro.html#INTRO_INTRO">Who mom is meant for</a>).
-However, the list of macros that control the appearance of the
-tags upon output is extensive.  Generally, for each tag,
-there are
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>
-for the tag's family, font and point size.  Where appropriate, there
-are macros to control leading, indents, quad and special features as
-well.
+The list of tags is actually quite small&mdash;ideal for the users
+mom brought herself into being for (see
+<a href="intro.html#intro-intro">Who mom is meant for</a>).
+However, the list of macros that control the appearance of the tags
+upon output is extensive.  Generally, for each tag, there are
+<a href="definitions.html#controlmacro">control macros</a>
+for the tag&#8217;s family, font and point size.  Where appropriate,
+there are macros to control leading, indents, quad and special
+features as well.
 </p>
 
 <p>
-<strong>Mom</strong> has tasteful defaults for all the tags, hence
-you only use the control macros when you want to change the way she
-does things.  This is usually done prior to
-<a href="docprocessing.html#START">START</a>,
+Mom has tasteful defaults for all the tags, hence you only use the
+control macros when you want to change the way she does things.
+This is usually done prior to
+<a href="docprocessing.html#start">START</a>,
 but can, in fact, be done at any time in the course of a document.
-Any change to a tag's style affects all subsequent invocations of
-the tag.
+Any change to a tag&#8217;s style affects all subsequent invocations
+of the tag.
 </p>
 
-<p>
-
-<a name="DOCELEMENT_CONTROL"><h3><u>Control macros &mdash; changing defaults</u></h3></a>
-
-</p>
+<h2 id="docelement-control" class="docs">Control macros &ndash; changing the tag defaults</h2>
 
 <p>
-The control macros for document processing tags let you
-&quot;design&quot; the look of all the parts of your documents
-&mdash; should you wish.  At a bare minimum, all tags have macros to
-change <strong>mom</strong>'s defaults for family, font, point size
-and colour.  Where appropriate, there are macros to control leading,
-indents and quad as well.
+The control macros for document processing tags let you design the
+look of all the parts of your documents&mdash;should you wish.  At
+a bare minimum, all tags have macros to change mom&#8217;s defaults
+for family, font, point size and colour.  Where appropriate, there
+are macros to control leading, indents and quad as well.
 </p>
 
 <p>
 In addition, many tags have special macros to control features that
 are pertinent to those tags alone.  Have a look at the section
 dealing with any particular tag to find out what macros control the
-tag, and what <strong>mom</strong>'s defaults for the tag are.
+tag, and what mom&#8217;s defaults for the tag are.
 </p>
 
 <p>
-The control macros may be used at any time during the course of
-a document (i.e. before or after
-<a href="docprocessing.html#START">START</a>).  The changes you
-make alter all subsequent invocations of the affected tag until you
-make another change, either by passing new arguments to the tag's
-control macro, or toggling a particular feature of the tag on or
-off.
+The control macros may be used at any time during the course of a
+document (i.e. before or after
+<a href="docprocessing.html#start">START</a>).
+The changes you make alter all subsequent invocations of the
+affected tag until you make another change, either by passing new
+arguments to the tag&#8217;s control macro, or toggling a particular
+feature of the tag on or off.
 </p>
 
 <p>
-And don't forget: the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
+And don&#8217;t forget: the
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>
 can be used at any time, including inside
-<a href="definitions.html#TERMS_TOGGLE">toggle</a>
+<a href="definitions.html#toggle">toggle</a>
 tags (affecting only that particular invocation of the tag).
 Equally,
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
+<a href="definitions.html#inlines">inline escapes</a>
 can be used in tags that take
-<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments.</a>
+<a href="definitions.html#stringargument">string arguments.</a>
 </p>
 
-<p>
-<strong>IMPORTANT NOTE:</strong> The family, font, point size,
-colour and leading control macros have no effect in
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-which sets EVERYTHING in Courier roman, 12/24 (i.e. 12-point type on
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+Get familiar with mom at her default settings before exploring the
+control macros.  Put her through her paces.  See how she behaves.
+Get to know what she feels like and how she looks, both in your
+text editor and on the printed page.  Then, if you don&#8217;t like
+something, use this documentation to find the precise macro you need
+to change it.  There are tons of control macros.  Reading up on them
+and trying to remember them all might lead you to think that mom is
+complex and unwieldy, which is not only untrue, but would offend her
+mightily.
+</p>
+</div>
+
+<div class="box-important">
+<p class="tip-top">
+<span class="important">Important:</span>
+The family, font, point size, colour and leading control macros have
+no effect in
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
+which sets everything in Courier roman, 12/24 (i.e. 12-point type on
 a linespace of 24 points).
 </p>
 
-<p>
+<p class="tip-bottom">
 Please also note that the defaults listed with the control macros
 apply only to
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-unless a default for <strong>TYPEWRITE</strong> is also given.
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>
+unless a default for <kbd>TYPEWRITE</kbd> is also given.
 </p>
+</div>
 
-<p>
-<strong>A WORD OF ADVICE:</strong> Get familiar with
-<strong>mom</strong> at her default settings before exploring the
-control macros.  Put her through her paces.  See how she behaves.
-Get to know what she feels like and how she looks, both in your
-text editor and on the printed page.  Then, if you don't like
-something, use this documentation to find the precise macro you need
-to change it.  There are tons of control macros.  Reading up on
-them and trying to remember them all might lead you to think that
-<strong>mom</strong> is complex and unwieldy, which is not only
-untrue, but would offend her mightily.
-</p>
-
-<a name="CONTROL_MACRO_ARGS"><h4><u>Arguments to the control macros</u></h4></a>
+<h3 id="control-macro-args" class="docs">Arguments to the control macros</h3>
 
-<a name="FAMILY_AND_FONT"><h5><u>Family and font</u></h5></a>
+<h4 id="family-and-font" class="docs" style="margin-top: 1em; margin-bottom: -.75em;">Family and font</h4>
 
 <p>
-The arguments to the control macros that end in
-<strong>_FAMILY</strong> or <strong>_FONT</strong> are the same
-as for
-<a href="typesetting.html#FAMILY">FAMILY</a>
+The arguments to the control macros that end in _FAMILY or _FONT are
+the same as for
+<a href="typesetting.html#family">FAMILY</a>
 and
-<a href="typesetting.html#FONT">FT</a>.
+<a href="typesetting.html#font">FT</a>.
 </p>
 
-<a name="POINT_SIZE"><h5><u>Point size</u></h5></a>
+<h4 id="point-size" class="docs" style="margin-top: -.5em; margin-bottom: -.75em;">Point size</h4>
 
 <p>
-Control macros that end in <strong>_SIZE</strong> always take
-the form <kbd>+digit</kbd> or <kbd>-digit</kbd> where digit is
-the number of
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+Control macros that end in _SIZE always take
+the form <kbd>+&lt;n&gt;</kbd> or <kbd>-&lt;n&gt;</kbd> where
+&lt;n&gt; is the number of
+<a href="definitions.html#picaspoints">points</a>
 larger (+) or smaller (-) than the point size of paragraphs
 you want the document element to be.  For example, to change
 subheads to 1-1/2 points larger than the type in paragraphs, do
-
-<pre>
-    .SUBHEAD_SIZE +1.5
-</pre>
-</p>
-
-<p>
-There's no need for a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-with the <strong>_SIZE</strong> control macros; points is assumed.
+<br/>
+<span class="pre-in-pp">
+  .SUBHEAD_SIZE +1.5
+</span>
+There&#8217;s no need for a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+with the _SIZE control macros; points is assumed.
 </p>
 
-<a name="COLOR"><h5><u>Colour</u></h5></a>
+<h4 id="color" class="docs" style="margin-top: -.5em; margin-bottom: -.75em;">Colour</h4>
 
 <p>
-Control macros that end in <strong>_COLOR</strong> take as their
-argument a colour name pre-defined (or &quot;initialized&quot;)
-with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
+Control macros that end in _COLOR take as their argument a colour
+name pre-defined (or &#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
 or
-<a href="color.html#XCOLOR">XCOLOR</a>.
-For example, if you want your heads to be red, once you've defined
+<a href="color.html#xcolor">XCOLOR</a>.
+For example, if you want your heads to be red, once you&#8217;ve defined
 or initialized the color, red,
-
-<pre>
-    .HEAD_COLOR red
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .HEAD_COLOR red
+</span>
 will turn your heads red.
 </p>
 
-<a name="LEAD"><h5><u>Lead/linespacing</u></h5></a>
+<h4 id="lead" class="docs" style="margin-top: -.5em; margin-bottom: -.75em;">Lead/linespacing</h4>
 
 <p>
-Control macros that end in <strong>_AUTOLEAD</strong> take the
-same argument as
-<a href="typesetting.html#AUTOLEAD">AUTOLEAD</a>,
-viz. a digit that represents the number of points to add to the
-tag's point size to arrive at its
-<a href="definitions.html#TERMS_LEADING">lead</a>.
+Control macros that end in _AUTOLEAD take the same argument as
+<a href="typesetting.html#autolead">AUTOLEAD</a>,
+<i>viz.</i> a digit that represents the number of points to add to
+the tag&#8217;s point size to arrive at its
+<a href="definitions.html#leading">leading</a>.
 For example, to set footnotes
-<a href="definitions.html#TERMS_SOLID">solid</a>, do
-
-<pre>
-    .FOOTNOTE_AUTOLEAD 0
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#solid">solid</a>, do
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_AUTOLEAD 0
+</span>
 To set footnotes with a 1-point lead (i.e. with the line spacing
-one point greater than the footnote's point size), do
+one point greater than the footnote&#8217;s point size), do
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_AUTOLEAD 1
+</span>
+</p>
 
-<pre>
-    .FOOTNOTE_AUTOLEAD 1
-</pre>
+<div class="box-tip" style="margin-top: -1.25em;">
+<p class="tip">
+<span class="note">Note:</span>
+_AUTOLEAD control macros do not have a <kbd>FACTOR</kbd> argument.
 </p>
+</div>
 
-<a name="CONTROL_INDENTS"><h5><u>Indents</u></h5></a>
+
+<h4 id="control-indents" class="docs" style="margin-top: -.75em; margin-bottom: -.75em;">Indents</h4>
 
 <p>
 Except for
-<a href="docelement.html#PARA_INDENT">PARA_INDENT</a>,
-the argument to the control
-macros that end in <strong>_INDENT</strong> can take either a single
-digit (whole numbers only; no decimal fractions) with <em>no</em>
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-appended to it, or a digit <em>with</em> a unit of measure appended.
+<a href="#para-indent">PARA_INDENT</a>,
+the argument to control macros that end in _INDENT can take
+either a single numeral (whole numbers only, no decimal fractions)
+<i>without</i> a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+appended to it, or a digit (including decimal fractions) <i>with</i>
+a unit of measure appended.
 </p>
 
 <p>
-A digit with <em>no</em> unit of measure appended represents by
+A digit <i>without</i> a unit of measure appended represents by
 how much you want your paragraph first-line indents (set with
-<strong>PARA_INDENT</strong>) multiplied to achieve the correct
-indent for a particular tag.
+PARA_INDENT) multiplied to achieve the correct indent for a
+particular tag.  For example,
+<br/>
+<span class="pre-in-pp">
+  .PARA_INDENT       2m
+  .BLOCKQUOTE_INDENT 2
+</span>
+means that blockquotes will be indented from the left margin by
+twice the size of the paragraph indent, or 4
+<a href="definitions.html#em">ems</a>.
 </p>
 
 <p>
-A digit <em>with</em> a unit of measure appended defines an
-absolute indent, relative to nothing.
+A digit <i>with</i> a unit of measure appended defines an absolute
+indent, relative to nothing.  In the following, blockquotes will be
+indented by 3
+<a href="definitions.html#picaspoints">picas</a>
+and 6
+<a href="definitions.html#picaspoints">points</a>,
+regardless of the paragraph indent.
+<br/>
+<span class="pre-in-pp">
+  .PARA_INDENT        2m
+  .BLOCKQUOTE_INDENT 3P+6p
+</span>
 </p>
 
-<a name="QUAD"><h5><u>Quad/justification style</u></h5></a>
+<h4 id="quad" class="docs" style="margin-top: -1em; margin-bottom: -.75em;">Quad/justification style</h4>
 
 <p>
-Control macros that end in <strong>_QUAD</strong> take the same
-arguments as
-<a href="typesetting.html#QUAD">QUAD</a>.
+Control macros that end in _QUAD take the same arguments as
+<a href="typesetting.html#quad">QUAD</a>.
 </p>
 
-<a name="UNDERLINE"><h5><u>Underline style, rule weight</u></h5></a>
+<h4 id="underline" class="docs" style="margin-bottom: -.75em;">Underline style, rule weight</h4>
 
 <p>
-If <strong>mom</strong> gives the option to underline a document
-element, the weight of the underline and its distance from the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-are controlled by macros
-that end in <strong>_UNDERLINE</strong>.
+If mom gives the option to underline a document element, the weight
+of the underline and its distance from the
+<a href="definitions.html#baseline">baseline</a>
+are controlled by macros that end in _UNDERLINE.
 </p>
 
 <p>
 Page elements that are separated from
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<a href="definitions.html#running">running text</a>
 by a rule (i.e. page headers, page footers and footnotes) are
-controlled by macros that end in <strong>_RULE_WEIGHT</strong>.
+controlled by macros that end in _RULE_WEIGHT.
 </p>
 
 <p>
-The weight argument to <strong>_UNDERLINE</strong> macros is
-the same as the argument to
-<a href="inlines.html#RULE_WEIGHT">RULE_WEIGHT</a>,
-as is the argument to <strong>_RULE_WEIGHT</strong> macros.
+The weight argument to _UNDERLINE macros is the same as the argument
+to
+<a href="inlines.html#rule-weight">RULE_WEIGHT</a>,
+as is the argument to _RULE_WEIGHT macros.
 </p>
 
-<a name="INDEX_DOCELEMENT"><h2><u>Document element tags list</u></h2></a>
-
-<ul>
-    <li><a href="#EPIGRAPH_INTRO">Epigraphs</a></li>
-    <ul>
-        <li><a href="#EPIGRAPH">EPIGRAPH</a></li>
-        <li><a href="#EPIGRAPH_CONTROL">Epigrah control</a></li>
-    </ul>
-    <li><a href="#PP_INTRO">Paragraphs</a></li>
-    <ul>
-        <li><a href="#PP">PP</a></li>
-        <li><a href="#PP_CONTROL">Paragraph control</a></li>
-    </ul>
-    <li><a href="#HEAD_INTRO">Main heads</a></li>
-    <ul>
-        <li><a href="#HEAD">HEAD</a></li>
-        <li><a href="#HEAD_CONTROL">Head control</a></li>
-    </ul>
-    <li><a href="#SUBHEAD_INTRO">Subheads</a></li>
-    <ul>
-        <li><a href="#SUBHEAD">SUBHEAD</a></li>
-        <li><a href="#SUBHEAD_CONTROL">Subhead control</a></li>
-    </ul>
-    <li><a href="#PARAHEAD_INTRO">Paragraph heads</a></li>
-    <ul>
-        <li><a href="#PARAHEAD">PARAHEAD</a></li>
-        <li><a href="#PARAHEAD_CONTROL">Parahead control</a></li>
-    </ul>
-    <li><a href="#LINEBREAK_INTRO">Linebreaks (author linebreaks, section breaks)</a></li>
-    <ul>
-        <li><a href="#LINEBREAK">LINEBREAK</a></li>
-        <li><a href="#LINEBREAK_CHAR">Linebreak character</a></li>
-        <li><a href="#LINEBREAK_COLOR">Linebreak colour</a></li>
-    </ul>
-    <li><a href="#QUOTE_INTRO">Quotes (line for line)</a></li>
-    <ul>
-        <li><a href="#QUOTE">QUOTE</a></li>
-        <li><a href="#QUOTE_CONTROL">Quote control</a></li>
-    </ul>
-    <li><a href="#BLOCKQUOTE_INTRO">Blockquotes (cited material)</a></li>
-    <ul>
-        <li><a href="#BLOCKQUOTE">BLOCKQUOTE</a></li>
-        <li><a href="#BLOCKQUOTE_CONTROL">Blockquote control</a></li>
-    </ul>
-    <li><a href="#CODE">CODE</a> (inserting code snippets into documents)</li>
-    <li><a href="#LIST_INTRO">Nested lists</a></li>
-    <ul>
-        <li><a href="#LIST">LIST</a></li>
-        <ul>
-            <li><a href="#ITEM">ITEM</a></li>
-        </ul>
-        <li><a href="#LIST_CONTROL">List control</a></li>
-    </ul>
-    <li><a href="#NUMBER_LINES_INTRO">Line numbering</a></li>
-    <ul>
-        <li><a href="#NUMBER_LINES">NUMBER_LINES</a></li>
-        <li><a href="#NUMBER_LINES_CONTROL">Control macros</a></li>
-        <ul>
-            <li><a href="#NUMBER_LINES_CONTROL_QUOTE">Line numbering control for QUOTE and BLOCKQUOTE</a></li>
-        </ul>
-    </ul>
-    <li><a href="#FOOTNOTE_INTRO">Footnotes</a></li>
-    <ul>
-        <li><a href="#FOOTNOTE">FOOTNOTE</a></li>
-        <li><a href="#FOOTNOTE_CONTROL">Footnote control</a></li>
-    </ul>
-    <li><a href="#ENDNOTE_INTRO">Endnotes</a></li>
-    <ul>
-        <li><a href="#ENDNOTE">ENDNOTE</a></li>
-        <li><a href="#ENDNOTE_CONTROL">Endnote control</a></li>
-    </ul>
-    <li><a href="#MARGIN_NOTES_INTRO">Margin notes</a></li>
-    <ul>
-        <li><a href="#MN_INIT">MN_INIT</a> &mdash; initialize margin notes</li>
-        <li><a href="#MN">MN</a> &mdash; start and end a margin note</li>
-    </ul>
-    <li><a href="refer.html#TOP">Bibliographies and references</a></li>
-    <ul>
-        <li><a href="refer.html#REF">REF</a></li>
-        <li><a href="refer.html#ENDNOTE_REFS">ENDNOTE_REFS</a></li>
-        <li><a href="refer.html#FOOTNOTE_REFS">FOOTNOTE_REFS</a></li>
-        <li><a href="refer.html#BRACKET_REFS">Embedded references</a></li>
-        <li><a href="refer.html#BIBLIOGRAPHY">BIBLIOGRAPHY</a></li>
-        <li><a href="refer.html#BIBLIOGRAPHY_TYPE">BIBLIOGRAPHY_TYPE</a></li>
-        <li><a href="refer.html#BIBLIO_CONTROL">Bibliography pages style control</a></li>
-    </ul>
-    <li><a href="#BLANK_PAGE_TITLE">Blank pages</a></li>
-    <li><a href="#TOC_INTRO">Tables of contents</a></li>
-    <ul>
-        <li><a href="#TOC">TOC</a></li>
-        <li><a href="#TOC_CONTROL">Table of contents control</a></li>
-    </ul>
-    <li><a href="#FINIS_INTRO">Document termination</a></li>
-    <ul>
-        <li><a href="#FINIS">FINIS (Document termination)</a></li>
-        <li><a href="#FINIS_STRING">Changing the FINIS string</a></li>
-        <li><a href="#FINIS_COLOR">Changing the FINIS colour</a></li>
-    </ul>
-    <li><a href="#PSPIC">Inserting images into a document &mdash; the PSPIC macro</a></li>
-</ul>
-
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="EPIGRAPH_INTRO"><h2><u>Epigraphs</u></h2></a>
+<h2 id="epigraph-intro" class="macro-group">Epigraphs</h2>
 
-<ul>
-    <li><a href="#EPIGRAPH">Tag: EPIGRAPH</a></li>
-    <li><a href="#EPIGRAPH_CONTROL">Epigraph control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#epigraph">Tag: EPIGRAPH</a></li>
+  <li><a href="#epigraph-control">Epigraph control macros and defaults</a></li>
 </ul>
 
 <p>
-<a href="definitions.html#TERMS_EPIGRAPH">Epigraphs</a>
+<a href="definitions.html#epigraph">Epigraphs</a>
 colour, flavour, or comment on the document they precede.
-Typically, they are centred at the top of a document's first page
+Typically, they are centred at the top of a document&#8217;s first page
 (underneath the title) and set in a smaller point size than that of
 paragraph text.
 </p>
 
 <p>
-By default, <strong>mom</strong> sets epigraphs centred and
-<a href="definitions.html#TERMS_NOFILL">unfilled</a>;
+By default, mom sets epigraphs centred and
+<a href="definitions.html#filled">unfilled</a>;
 this lets you input them on a line for line basis.  This behaviour
 can be changed to accomodate
-<a href="definitions.html#TERMS_FILLED">filled</a>
-epigraph &quot;blocks.&quot;
+<a href="definitions.html#filled">filled</a>
+epigraph &#8220;blocks.&#8221;
 </p>
 
 <!-- -EPIGRAPH- -->
 
-<hr width="66%" align="left"/>
-
-<a name="EPIGRAPH"></a>
-
-<p>
-<nobr>Macro: <strong>EPIGRAPH</strong> <kbd>&lt;toggle&gt; | [ BLOCK ]</kbd></nobr>
-</p>
-
-<p>
-<strong>EPIGRAPH</strong> is a toggle, used like this:
+<div class="macro-id-overline">
+<h3 id="epigraph" class="macro-id">EPIGRAPH</h3>
+</div>
 
-<pre>
-    .EPIGRAPH
-    &lt;text of epigraph&gt;
-    .EPIGRAPH OFF
-</pre>
-</p>
+<div class="box-macro-args">
+Macro: <b>EPIGRAPH</b> <kbd class="macro-args">&lt;toggle&gt; | [ BLOCK ]</kbd>
+</div>
 
 <p>
-<kbd>OFF</kbd>, above, could be anything &mdash; say, <kbd>Q</kbd>
-or <kbd>X</kbd> &mdash; since any argument other than
-<kbd>BLOCK</kbd> turns it off.
+EPIGRAPH is a toggle, used like this:
+<br/>
+<span class="pre-in-pp">
+  .EPIGRAPH
+  &lt;text of epigraph&gt;
+  .EPIGRAPH OFF
+</span>
+<kbd>OFF</kbd>, above, could be anything&mdash;say, <kbd>Q</kbd> or
+<kbd>X</kbd>&mdash;since any argument other than <kbd>BLOCK</kbd>
+turns it off.
 </p>
 
 <p>
-If given the argument, <kbd>BLOCK</kbd>, <strong>EPIGRAPH</strong>
-sets epigraphs
-<a href="definitions.html#TERMS_FILLED">filled</a>,
+If given the argument, <kbd>BLOCK</kbd>, EPIGRAPH sets epigraphs
+<a href="definitions.html#filled">filled</a>,
 justified or quadded in the same direction as paragraphs, indented
 equally from both the left and right margins.
 </p>
 
 <p>
 If a block-style epigraph runs to more than one paragraph (unlikely,
-but conceivable), you <strong>must</strong> introduce every paragraph
-&mdash; <u>INCLUDING THE FIRST!!!</u> &mdash; with the
-<a href="#PP">PP</a>
+but conceivable), you <i>must</i> introduce every
+paragraph&mdash;including the first&mdash;with the
+<a href="#pp">PP</a>
 tag.
 </p>
 
-<p>
-<strong>NOTE:</strong> <strong>EPIGRAPH</strong> should only be used
-at the top of a document (i.e. just after
-<a href="docprocessing.html#START">START</a>)
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+EPIGRAPH should only be used at the top of a document (i.e. just
+after
+<a href="docprocessing.html#start">START</a>)
 or after
-<a href="#HEAD_INTRO">heads</a>.
+<a href="#head-intro">heads</a>.
 The latter is not especially recommended, but it does work.  In all
 other places where you want quotes or cited text, use
-<a href="#QUOTE">QUOTE</a>
+<a href="#quote">QUOTE</a>
 or
-<a href="#BLOCKQUOTE">BLOCKQUOTE</a>.
+<a href="#blockquote">BLOCKQUOTE</a>.
 </p>
+</div>
 
-<hr width="33%" align="left"/>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<h3 id="epigraph-control" class="docs defaults" style="margin-top: -.25em;">EPIGRAPH control macros and defaults</h3>
 
-<a name="EPIGRAPH_CONTROL"><h3><u>Epigraph control macros</u></h3></a>
-
-<p>
+<p class="defaults">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
 
-<pre>
+<span class="pre defaults">
 .EPIGRAPH_FAMILY    default = prevailing document family; default is Times Roman
 .EPIGRAPH_FONT      default = roman
 .EPIGRAPH_SIZE      default = -1.5 (points)
 .EPIGRAPH_COLOR     default = black
 .EPIGRAPH_AUTOLEAD  default = 2 points
 
-(The next two apply to &quot;block&quot; style epigraphs only)
+(The next two apply to &#8220;block&#8221; style epigraphs only)
 
 .EPIGRAPH_QUAD      default = same as paragraphs
-.EPIGRAPH_INDENT*   (see below)
+.EPIGRAPH_INDENT*  (see Note on EPIGRAPH_INDENT, below)
 
 *Indent here refers to the indent from both the left and right margins
- that centres the block style epigraph on the page.
-</pre>
-
-<a name="EPIGRAPH_INDENT"><h4><u>Epigraph indent</u></h4></a>
-
-<p>
-Prior to version 1.4-b, <strong>mom</strong> allowed
-only the passing of an integer to the macro,
-<strong>EPIGRAPH_INDENT</strong>.  The integer represented the
-amount by which to multiply the argument passed to
-<a href="#PARA_INDENT">PARA_INDENT</a>
+ that centres block style epigraphs on the page.
+</span>
+</div>
+
+<div class="box-notes">
+<h3 id="epigraph-indent" class="docs notes" style="margin-bottom: -.75em;">Note on EPIGRAPH_INDENT</h3>
+
+<p style="margin-top: .5em;">
+Prior to version 1.4-b, mom allowed only the passing of an integer
+to the macro, EPIGRAPH_INDENT.  The integer represented the amount
+by which to multiply the argument passed to
+<a href="#para-indent">PARA_INDENT</a>
 to arrive at an indent for block style epigraphs.
 </p>
 
 <p>
 As of version 1.4-b, you can now append a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-to the argument passed to <strong>EPIGRAPH_INDENT</strong>,
-thus setting an absolute indent, relative to nothing.  The old
-behaviour is still respected, though; in other words, if you pass
-<strong>EPIGRAPH_INDENT</strong> an integer with no unit of measure
-appended, the integer represents the amount by which to multiply
-<strong>PARA_INDENT</strong> to arrive at an indent for block style
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+to the argument passed to EPIGRAPH_INDENT, thus setting an absolute
+indent, relative to nothing.  The old behaviour is still respected,
+though; in other words, if you pass EPIGRAPH_INDENT an integer with
+no unit of measure appended, the integer represents the amount by
+which to multiply PARA_INDENT to arrive at an indent for block style
 epigraphs.
 </p>
 
 <p>
-Please note that if your <strong>PARA_INDENT</strong>
-is <kbd>0</kbd> (i.e. no indenting of the first line of
-paragraphs), you <em><strong>must</strong></em> set an
-<strong>EPIGRAPH_INDENT</strong> yourself, with a unit of measure
-appended to the argument. <strong>Mom</strong> has no default for
-<strong>EPIGRAPH_INDENT</strong> if paragraph first lines are not being
-indented.
-</p>
-
-<p>
-The default value for <strong>EPIGRAPH_INDENT</strong> is 3 (for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>)
-and 2 (for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>).
+Please also note that if your PARA_INDENT is <kbd>0</kbd> (i.e. no
+indenting of the first line of paragraphs), you <i>must</i> set an
+EPIGRAPH_INDENT yourself, with a unit of measure appended to the
+argument. Mom has no default for EPIGRAPH_INDENT if paragraph first
+lines are not being indented.
+</p>
+
+<p class="tip-bottom">
+The default value for EPIGRAPH_INDENT is <kbd>3</kbd> (for
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPESET</a>)
+and <kbd>2</kbd> (for
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>).
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="PP_INTRO"><h2><u>Paragraphs</u></h2></a>
+<h2 id="pp-intro" class="macro-group">Paragraphs</h2>
 
-<ul>
-    <li><a href="#PP">Tag: PP</a></li>
-    <li><a href="#PP_CONTROL">Paragraph control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#pp">Tag: PP</a></li>
+  <li><a href="#pp-control">Paragraph control macros and defaults</a></li>
 </ul>
 
 <p>
 The paragraph macro is the one you use most often.  Consequently,
-it's one of most powerful, yet simplest to use &mdash; just
-the letters <strong>PP</strong>.  No arguments, nothing.  Just
-<kbd>.PP</kbd> on a line by itself any time, in any document
-element, tells <strong>mom</strong> you want to start a new
-paragraph.  The spacing and indent appropriate to where you are in
-your document are taken care of automatically.
+it&#8217;s one of most powerful, yet simplest to use&mdash;just the
+letters PP.  No arguments, nothing.  Just <kbd>.PP</kbd> on a line
+by itself any time, in any document element, tells mom you want to
+start a new paragraph.  The spacing and indent appropriate to where
+you are in your document are taken care of automatically.
 </p>
 
 <p>
-By default, <strong>mom</strong> does not indent the first paragraph
-of a document, nor paragraphs that fall immediately after
-<a href="#HEAD_INTRO">heads</a>
+By default, mom does not indent the first paragraph of a document,
+nor paragraphs that fall immediately after
+<a href="#head-intro">heads</a>
 or
-<a href="#SUBHEAD_INTRO">subheads</a>.
+<a href="#subhead-intro">subheads</a>.
 The first paragraphs of blockquotes and block-style epigraphs are
 also not indented.  This behaviour can be changed with the control
 macro
-<a href="#PARA_INDENT_FIRST">INDENT_FIRST_PARAS</a>.
+<kbd><a href="#para-indent-first">INDENT_FIRST_PARAS</a></kbd>.
 </p>
 
 <p>
-In contrast to some other macro sets, <strong>mom</strong> does
-not deposit a blank line between paragraphs.  If you want her to do
-so, use the control macro <strong>PARA_SPACE</strong>.  (I don't
-recommend using this macro with
-<a href="typesetting.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>.)
+In contrast to some other macro sets, mom does not deposit a blank
+line between paragraphs.  If you want her to do so, use the control
+macro PARA_SPACE.  (I don&#8217;t recommend using this macro with
+<a href="typesetting.html#printstyle">PRINTSTYLE TYPEWRITE</a>.)
 </p>
 
 <p>
-Note that <strong>mom</strong> does not provide &quot;orphan
-control&quot; for paragraphs (i.e. even if only one line of a
-paragraph fits at the bottom of a page, she will set it on that
-page).  The reason for this is that writers of fiction often have
-single-line paragraphs (e.g. in dialogue).  Groff's simplistic
-orphan control will break these one-liners &mdash; if they fall at
-the bottom of the page &mdash; to a new page, which is not what you
-want.
+Note that mom does not provide &#8220;orphan control&#8221; for
+paragraphs (i.e. even if only one line of a paragraph fits at the
+bottom of a page, she will set it on that page).  The reason for
+this is that writers of fiction often have single-line paragraphs
+(e.g. in dialogue).  Groff&#8217;s simplistic orphan control will
+break these one-liners&mdash;if they fall at the bottom of the
+page&mdash;to a new page, which is not what you want.
 </p>
 
-<p>
-<strong>TIP:</strong> The last thing you want while you're writing
-and editing drafts of a document (particularly stories and chapters)
-is a text file cluttered up with <strong>PP</strong>'s. The visual
+<div class="box-tip">
+<p class="tip-top">
+<span class="tip">Tip:</span>
+The last thing you want while you&#8217;re writing and editing
+drafts of a document (particularly stories and chapters) is a
+text file cluttered up with <kbd>.PP</kbd>&#8217;s. The visual
 interruption in the flow of text is a serious obstacle to creativity
 and critiquing.
 </p>
 
 <p>
-I use the tab key on my keyboard to indent paragraphs when I'm
-writing, producing a text file that looks pretty much like what
-you see on a printed page.  When it comes time to format and
+I use the tab key on my keyboard to indent paragraphs by four spaces
+when I'm writing, producing a text file that looks pretty much like
+what you see on a printed page.  When it comes time to format and
 print the file, I run it through a sed script that (amongst other
-things) converts the character generated by the tab key
-<nobr>( <kbd>^I</kbd> )</nobr> into <kbd>.PP</kbd> (plus a new
-line), and pipes the output to groff for processing and printing.
+things) converts the intial four spaces into <kbd>.PP</kbd> (plus a
+new line) and pipes the output to groff for processing and printing.
 </p>
 
-<p>
-Another solution is to insert a blank line between paragraphs.
-The blank lines can then be sedded out at print time as above, or,
-more conveniently, you can use the <kbd>.blm</kbd>
-<a href="definitions.html#TERMS_PRIMITIVES">primitive</a>
-(blank line macro) to instruct groff (and <strong>mom</strong>)
-that blank lines should be interpreted as <strong>PP</strong>'s.
-
-<pre>
-    .blm PP
-</pre>
-
-tells groff that all blank lines are really the macro <strong>PP</strong>.
+<p class="tip-bottom">
+Another solution would be to insert a blank line between paragraphs
+of your text files.  The blank lines can then be sedded out at
+print time, as above (<kbd>.PP</kbd> plus a newline), or, more
+conveniently, you could use the <kbd>.blm</kbd>
+<a href="definitions.html#primitives">primitive</a>
+(blank line macro) to tell groff (and mom) that blank lines should
+be interpreted as PP&#8217;s.
+<br/>
+<span class="pre-in-pp">
+  .blm PP
+</span>
+tells groff that blank lines are really the macro PP.
 </p>
+</div>
 
 <!-- -PP- -->
 
-<hr width="66%" align="left"/>
-
-<a name="PP"></a>
-
-<p>
-<nobr>Macro: <strong>PP</strong></nobr>
-</p>
-
-<p>
-<kbd>.PP</kbd> (on a line by itself, of course) tells mom to
-start a new paragraph.  See
-<a href="#PP_INTRO">above</a>
+<div class="macro-id-overline">
+<h3 id="pp" class="macro-id">PP</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>PP</b>
+</div>
+<p>
+<kbd>.PP</kbd> (on a line by itself, of course) tells mom to start a
+new paragraph.  See
+<a href="#pp-intro">above</a>
 for more details.  In addition to regular text paragraphs, you can
-use <strong>PP</strong> in
-<a href="#EPIGRAPH_INTRO">epigraphs</a>,
-<a href="#BLOCKQUOTE_INTRO">blockquotes</a>
+use PP in
+<a href="#epigraph-intro">epigraphs</a>,
+<a href="#blockquote-intro">blockquotes</a>
 and
-<a href="#FOOTNOTE_INTRO">footnotes</a>.
+<a href="#footnote-intro">footnotes</a>.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="PP_CONTROL"><h3><u>Paragraph control macros</u></h3></a>
-
-<p>
-The <strong>PP</strong> macro being so important, and representing,
-as it were, the basis of everything that goes on in a document,
-its control is managed in a manner somewhat different from other
-document element tags.
-</p>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="pp-control" class="docs defaults">PP control macros and defaults</h3>
 
-<ol>
-    <li><a href="#PP_FAMILY">Family control</a></li>
-    <li><a href="#PP_FONT">Font control</a></li>
-    <li><a href="#PP_COLOR">Paragraph colour</a></li>
-    <li><a href="#PP_LEADING">Leading/linespacing control</a></li>
-    <li><a href="#PP_JUST_QUAD">Justification/quad control</a></li>
-    <li><a href="#PARA_INDENT">First-line indent control</a></li>
-    <li><a href="#PARA_INDENT_FIRST">Initial paragraphs indent control</a></li>
-    <li><a href="#PP_SPACE">Paragraph spacing control</a></li>
+<p class="defaults">
+The PP macro being so important, and representing, as it were, the
+basis of everything that goes on in a document, its control is
+managed in a manner somewhat different from other document element
+tags.
+</p>
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#pp-family">Family control</a></li>
+  <li><a href="#pp-font">Font control</a></li>
+  <li><a href="#pp-color">Paragraph colour</a></li>
+  <li><a href="#pp-leading">Leading/linespacing control</a></li>
+  <li><a href="#pp-just-quad">Justification/quad control</a></li>
+  <li><a href="#para-indent">First-line indent control</a></li>
+  <li><a href="#para-indent-first">Initial paragraphs indent control</a></li>
+  <li><a href="#pp-space">Paragraph spacing control</a></li>
 </ol>
+</div>
 
-<a name="PP_FAMILY"><h4><u>1. Family</u></h4></a>
+<h4 id="pp-family" class="docs" style="margin-top: -1.5em;">1. Family control</h4>
 
 <p>
 The paragraph
-<a href="definitions.html#TERMS_FAMILY">family</a>
+<a href="definitions.html#family">family</a>
 is set with
-<a href="typesetting.html#FAMILY">FAMILY</a>
+<a href="typesetting.html#family">FAMILY</a>
 prior to
-<a href="docprocessing.html#START">START</a>,
+<a href="docprocessing.html#start">START</a>,
 or
-<a href="docprocessing.html#DOC_FAMILY">DOC_FAMILY</a>
+<a href="docprocessing.html#doc-family">DOC_FAMILY</a>
 afterwards.  Please note that both globally affect the family of
 every element in the document.
 </p>
 
 <p>
 If you wish to change the family for regular text paragraphs only,
-invoke <kbd>.FAMILY</kbd> immediately after <kbd>.PP</kbd>
-in EVERY paragraph whose family you wish to differ from the
-prevailing document family.
+invoke <kbd>.FAMILY</kbd> immediately after <kbd>.PP</kbd> in every
+paragraph whose family you wish to differ from the prevailing
+document family.
 </p>
 
 <p>
-<strong>Mom</strong>'s default paragraph (and document) family
-is Times Roman.
+Mom&#8217;s default paragraph (and document) family is Times Roman.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Neither FAMILY nor DOC_FAMILY has any effect when the PRINTSTYLE is
+<kbd>TYPEWRITE</kbd>.
 </p>
+</div>
 
-<a name="PP_FONT"><h4><u>2. Font &mdash; PP_FONT</u></h4></a>
+<h4 id="pp-font" class="docs" style="margin-top: -.25em;">2. Font control</h4>
 
 <p>
 To change the
-<a href="definitions.html#TERMS_FONT">font</a>
-used in regular text paragraphs, use <kbd>.PP_FONT</kbd>,
-which takes the same argument as
-<a href="typesetting.html#FONT">FT</a>.
-<strong>PP_FONT</strong> may be used before or after
-<a href="docprocessing.html#START">START</a>.
+<a href="definitions.html#font">font</a>
+used in regular text paragraphs, use PP_FONT, which takes the same
+argument as
+<a href="typesetting.html#font">FT</a>.
+PP_FONT may be used before or after
+<a href="docprocessing.html#start">START</a>.
 Only regular text paragraphs are affected; paragraphs in
-<a href="#EPIGRAPH_INTRO">epigraphs</a>,
-<a href="#BLOCKQUOTE_INTRO">blockquotes</a>
+<a href="#epigraph-intro">epigraphs</a>,
+<a href="#blockquote-intro">blockquotes</a>
 and
-<a href="#FOOTNOTE_INTRO">footnotes</a>
-remain at their default setting (medium roman) unless you change them
-with the appropriate control macros.
+<a href="#footnote-intro">footnotes</a>
+remain at their default setting (medium roman) unless you change
+them with the appropriate control macros.
 </p>
 
 <p>
-<strong>Mom</strong>'s default paragraph font is medium roman.
+Mom&#8217;s default paragraph font is medium roman.
 </p>
 
-<a name="PP_COLOR"><h4><u>3. Paragraph colour</u></h4></a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+PP_FONT has no effect when the PRINTSTYLE is <kbd>TYPEWRITE</kbd>.
+If you wish to set whole typewritten paragraphs in italic, invoke
+invoke <kbd>.FT I</kbd> immediately after <kbd>.PP</kbd>.  Depending
+on which of
+<a href="docprocessing.html#printstyle-italics">UNDERLINE_ITALIC</a>
+or
+<a href="docprocessing.html#printstyle-italics">ITALIC_MEANS_ITALIC</a>
+is currently enabled, the paragraph will be set underlined or in
+italic.  Neither persists past the end of the paragraph.
+</p>
+</div>
+
+<h4 id="pp-color" class="docs" style="margin-top: -.25em;">3. Paragraph colour</h4>
 
 <p>
-<strong>Mom</strong> has no special control macro for colourizing
-paragraphs.  If you wish a colourized paragraph, you must use the
-macro,
-<a href="color.html#COLOR">COLOR</a>,
+Mom has no special control macro for colourizing paragraphs.  If you
+wish a colourized paragraph, you must use the macro,
+<a href="color.html#color">COLOR</a>,
 or the
-<a href="definitions.html#TERMS_INLINE">inline escape</a>,
-<a href="color.html#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a>,
-<em>after</em> <kbd>.PP</kbd>.  The colour must be one pre-defined
-(or &quot;initialized&quot;) with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
+<a href="definitions.html#inline">inline escape</a>,
+<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>,
+<i>after</i> <kbd>.PP</kbd>.  The colour must be one pre-defined (or
+&#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
 or
-<a href="color.html#XCOLOR">XCOLOR</a>.
+<a href="color.html#xcolor">XCOLOR</a>.
 </p>
 
 <p>
-Please note that unless you change the colour back to it's default
-(usually black) at the end of the paragraph, all subsequent
+Please note that unless you change the colour back to it&#8217;s
+default (usually black) at the end of the paragraph, all subsequent
 paragraphs will be set in the new colour, although most other
 elements of your document will continue to be set in the default
 colour (usually black).
@@ -747,1079 +771,1144 @@
 
 <p>
 For example, assuming you have defined the colour, blue,
-
-<pre>
-    .PP
-    .COLOR blue
-    &lt;first paragraph&gt;
-    .HEAD "Monty Python"
-    .SUBHEAD "The Origins of Spam"
-    .PP
-    &lt;second paragraph&gt;
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .PP
+  .COLOR blue
+  &lt;first paragraph&gt;
+  .HEAD "Monty Python"
+  .SUBHEAD "The Origins of Spam"
+  .PP
+  &lt;second paragraph&gt;
+</span>
 the first paragraph will be blue, the head and subhead will be in
-the document's default colour (usually black), and the second
+the document&#8217;s default colour (usually black), and the second
 paragraph will be in blue.
 </p>
 
 <p>
 The one document element that is affected by changing the colour of
-paragraphs is 
-<a href="#PARAHEAD">paraheads</a>,
-since paraheads are attached directly to the body of paragraphs.  In
-other words, if you change the colour of a paragraph and do not
+paragraphs is
+<a href="#parahead">paraheads</a>,
+since paraheads are attached directly to the body of paragraphs.
+In other words, if you change the colour of a paragraph and do not
 reset the paragraph colour back to its default, subsequent paraheads
 will appear in the same colour as your paragraphs unless you have
-explicitly told <strong>mom</strong> you want a pre-defined (or
-&quot;initialized&quot;) color (usually black) for your paraheads.
+explicitly told mom you want a pre-defined (or
+&#8220;initialized&#8221;) color (usually black) for your paraheads.
 </p>
 
 <p>
 See the footnote to
-<a href="#PARAHEAD_COLOR">PARAHEAD_COLOR</a>.
+<a href="#parahead-color">PARAHEAD_COLOR</a>.
 </p>
 
-<a name="PP_LEADING"><h4><u>4. Leading</u></h4></a>
+<h4 id="pp-leading" class="docs" style="margin-top: -.25em;">4. Leading</h4>
 
 <p>
 The paragraph
-<a href="definitions.html#TERMS_LEADING">leading</a>
+<a href="definitions.html#leading">leading</a>
 is set with
-<a href="typesetting.html#LEADING">LS</a>
+<a href="typesetting.html#leading">LS</a>
 prior to
-<a href="docprocessing.html#START">START</a>,
+<a href="docprocessing.html#start">START</a>,
 or
-<a href="docprocessing.html#DOC_LEAD">DOC_LEAD</a>
+<a href="docprocessing.html#doc-lead">DOC_LEAD</a>
 afterwards.  Please note that either method globally affects the
 leading and spacing of every document element (except
-<a href="definitions.html#TERMS_HEADER">headers</a>
+<a href="definitions.html#header">headers</a>
 and
-<a href="definitions.html#TERMS_FOOTER">footers</a>).
+<a href="definitions.html#footer">footers</a>).
 </p>
 
 <p>
 If you wish to change the leading of regular text paragraphs only,
-invoke <kbd>.LS</kbd> immediately after <kbd>.PP</kbd> in EVERY
+invoke <kbd>.LS</kbd> immediately after <kbd>.PP</kbd> in every
 paragraph whose leading you wish to change.
 </p>
 
-<p>
-<strong>HYPER-IMPORTANT NOTE:</strong> It is extremely unwise to
-change paragraph leading with <strong>LS</strong>, as it will,
-in all cases, screw up <strong>mom</strong>'s ability to balance
+<div class="box-tip">
+<p class="tip">
+<span class="note">Warning:</span>
+It is extremely unwise to change a paragraph&#8217;s leading with LS as
+it will, in all cases, screw up mom&#8217;s ability to balance
 the bottom margin of pages.  Should you absolutely need to change
-paragraph leading with <strong>LS</strong>, and subsequently want
-<strong>mom</strong> to get back on the right leading track, use the
-<a href="docprocessing.html#SHIM">SHIM</a>
+paragraph leading with LS, and subsequently want mom to get back on
+the right leading track, use the
+<a href="docprocessing.html#shim">SHIM</a>
 macro.
 </p>
+</div>
 
 <p>
-<strong>Mom</strong>'s default paragraph leading (document leading)
+Mom&#8217;s default paragraph leading (document leading)
 is 16 points, adjusted to fill the page.
 </p>
 
-<a name="PP_JUST_QUAD"><h4><u>5. Justification/quad</u></h4></a>
+<h4 id="pp-just-quad" class="docs" style="margin-top: -.25em;">5. Justification/quad</h4>
 
 <p>
 The justification/quad-direction of regular text paragraphs (i.e.
-<a href="definitions.html#TERMS_JUST">justified</a>,
+<a href="definitions.html#just">justified</a>,
 or
-<a href="definitions.html#TERMS_FILLED">filled</a>
+<a href="definitions.html#filled">filled</a>
 and
-<a href="definitions.html#TERMS_QUAD">quadded</a>
+<a href="definitions.html#quad">quadded</a>
 left/right/centre) is set with
-<a href="typesetting.html#JUSTIFY">JUSTIFY</a>
+<a href="typesetting.html#justify">JUSTIFY</a>
 or
-<a href="typesetting.html#QUAD">QUAD</a>
+<a href="typesetting.html#quad">QUAD</a>
 prior to
-<a href="docprocessing.html#START">START</a>,
+<a href="docprocessing.html#start">START</a>,
 and with
-<a href="docprocessing.html#DOC_QUAD">DOC_QUAD</a>
+<a href="docprocessing.html#doc-quad">DOC_QUAD</a>
 afterwards.
 </p>
 
 <p>
 Please note that either method of setting the paragraph
 justification/quad-direction also affects
-<a href="#EPIGRAPH_INTRO">epigraphs</a>
+<a href="#epigraph-intro">epigraphs</a>
 and
-<a href="#FOOTNOTE_INTRO">footnotes</a>,
+<a href="#footnote-intro">footnotes</a>,
 but not
-<a href="#BLOCKQUOTE_INTRO">blockquotes</a>
-(whose default is QUAD LEFT unless you change it with
-<a href="#BLOCKQUOTE">BLOCKQUOTE_QUAD</a>).
-The justification/quad-direction of epigraphs and footnotes may
-be changed with their own control macros.
+<a href="#blockquote-intro">blockquotes</a>
+(whose default is quad left unless you change it with
+<a href="#blockquote">BLOCKQUOTE_QUAD</a>).
+The justification/quad-direction of epigraphs and footnotes may be
+changed with their own control macros.
 </p>
 
 <p>
-If you wish to change the justification/quad-direction of
-individual paragraphs, invoke
-<a href="typesetting.html#JUSTIFY"><kbd>.JUSTIFY</kbd></a>
+If you wish to change the justification/quad-direction of individual
+paragraphs, invoke
+<a href="typesetting.html#justify"><kbd>.JUSTIFY</kbd></a>
 or
-<a href="typesetting.html#QUAD"><kbd>.QUAD</kbd></a>
+<a href="typesetting.html#quad"><kbd>.QUAD</kbd></a>
 on the line immediately after <kbd>.PP</kbd>.  Only the paragraph
 in question gets justified or quadded differently; subsequent
 paragraphs remain unaffected.
 </p>
 
 <p>
-<strong>Mom</strong>'s default justification/quad-direction for
-paragraphs is
-
-<ul>
-    <li>justified, for
-        <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE_TYPESET</a>
-    </li>
-    <li>quad left, for
-        <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE_TYPEWRITE</a>
-    </li>
-</ul>
+Mom&#8217;s default justification/quad-direction for paragraphs
+when the
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+is <kbd>TYPESET</kbd> is justified; for PRINTSTYLE
+<kbd>TYPEWRITE</kbd>, the default is quad left.
 </p>
 
-<a name="PARA_INDENT"><h4><u>6. First-line indent &mdash; PARA_INDENT</u></h4></a>
+<h4 id="para-indent" class="docs" style="margin-top: -.25em;">6. First-line indent</h4>
 
 <p>
-The first-line indent of paragraphs is controlled by
-<kbd>.PARA_INDENT</kbd>, which takes one argument: the size of
-the indent. <strong>PARA_INDENT</strong> may be used before or after
-<a href="docprocessing.html#START">START</a>.
+The first-line indent of paragraphs is controlled by PARA_INDENT,
+which takes one argument: the size of the indent. PARA_INDENT may be
+used before or after
+<a href="docprocessing.html#start">START</a>.
 A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-is required; fractional sizes are allowed.  Thus, to set the paragraph
-indent to 4-1/2
-<a href="definitions.html#TERMS_EM">ems</a>, do
-
-<pre>
-    .PARA_INDENT 4.5m
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+is required; fractional sizes are allowed.  Thus, to set the
+paragraph indent to 4-1/2
+<a href="definitions.html#em">ems</a>, do
+<br/>
+<span class="pre-in-pp">
+  .PARA_INDENT 4.5m
+</span>
 In addition to establishing the basic first line-indent of
-paragraphs, <strong>PARA_INDENT</strong> also affects
-<a href="#EPIGRAPH_INTRO">epigraphs</a>,
-<a href="#QUOTE_INTRO">quotes</a>
+paragraphs, PARA_INDENT also affects
+<a href="#epigraph-intro">epigraphs</a>,
+<a href="#quote-intro">quotes</a>
 and
-<a href="#BLOCKQUOTE_INTRO">blockquotes</a>,
+<a href="#blockquote-intro">blockquotes</a>,
 whose overall indenting from the left and (where applicable)
-right margins is relative to <strong>PARA_INDENT</strong> if
-the <strong>_INDENT</strong> control macro for these tags has
-no <a href="definitions.html#TERMS_UNITOFMEASURE">unit of
-measure</a> appended to it.  Furthermore, the first-line indent of
-paragraphs within these document elements (as well as footnotes)
-is also relative to <strong>PARA_INDENT</strong> (always 1/2 of
-<strong>PARA_INDENT)</strong>), hence they are also affected.
+right margins is relative to PARA_INDENT if
+the _INDENT control macro for these tags has
+no
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+appended to it.  Furthermore, the first-line indent of paragraphs
+within these document elements (as well as footnotes) is also
+relative to PARA_INDENT (always 1/2 of PARA_INDENT), hence they are
+also affected.
 </p>
 
 <p>
-<strong>Mom</strong>'s default <strong>PARA_INDENT</strong> is 2 ems
-for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE_TYPESET</a>
-and 3 picas (1/2 inch) for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE_TYPEWRITE</a>.
+Mom&#8217;s default PARA_INDENT is 2 ems for
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+<kbd>TYPESET</kbd> and 3 picas (1/2 inch) for
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+<kbd>TYPEWRITE</kbd>.
 </p>
 
-<a name="PARA_INDENT_FIRST"><h4><u>7. Indenting initial paragraphs &mdash; INDENT_FIRST_PARAS</u></h4></a>
+<h4 id="para-indent-first" class="docs" style="margin-top: -.25em;">7. Indenting initial paragraphs</h4>
 
 <p>
-By default, <strong>mom</strong> does not indent the first paragraph
-of a document, nor the first paragraph after a head or subhead, nor
-the first paragraphs of
-<a href="#EPIGRAPH_INTRO">epigraphs</a>,
-<a href="#BLOCKQUOTE_INTRO">blockquotes</a>
+By default, mom does not indent the first paragraph of a document,
+nor the first paragraph after a head or subhead, nor the first
+paragraphs of
+<a href="#epigraph-intro">epigraphs</a>,
+<a href="#blockquote-intro">blockquotes</a>
 or
-<a href="#FOOTNOTE_INTRO">footnotes</a>
+<a href="#footnote-intro">footnotes</a>
 that run to more than one paragraph.
-<a name="INDENT_FIRST_PARAS"></a>
 </p>
 
 <p>
 If you wish to have first paragraphs indented, invoke the macro
 <kbd>.INDENT_FIRST_PARAS</kbd> without an argument, either before or
 after
-<a href="docprocessing.html#START">START</a>.
-<strong>INDENT_FIRST_PARAS</strong> is a toggle macro, therefore
-passing it any argument (<strong>OFF, QUIT, Q, X</strong>...)
-cancels its effect, meaning that first paragraphs will once again
-NOT be indented.
-</p>
-
-<a name="PP_SPACE"><h4><u>8. Spacing paragraphs &mdash; PARA_SPACE</u></h4></a>
-
-<p>
-By default, <strong>mom</strong> does not insert a blank line
-between paragraphs.  If you would like her to do so, invoke the
-macro, <kbd>.PARA_SPACE</kbd>, without an argument, either before or
-after
-<a href="docprocessing.html#START">START</a>.
-<strong>PARA_SPACE</strong> is a toggle macro, therefore passing
-it any argument (<strong>OFF, QUIT, Q, X</strong>...) cancels its
-effect, meaning that paragraphs will once again NOT be separated by
-a blank line.
-</p>
-
-<p>
-<strong>NOTE:</strong> If <strong>PARA_SPACE</strong> is on,
-<strong>mom</strong> spaces only those paragraphs that come after
-an &quot;initial&quot; paragraph.  Initial paragraphs are those
-that come immediately after the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>,
-<a href="#EPIGRAPH_INTRO">epigraphs</a>,
-<a href="#HEAD_INTRO">heads</a>,
-<a href="#SUBHEAD_INTRO">subheads</a>
+<a href="docprocessing.html#start">START</a>.
+INDENT_FIRST_PARAS is a toggle macro, therefore passing it any
+argument (<b>OFF, QUIT, Q, X</b>...) cancels its effect, meaning
+that first paragraphs will once again not be indented.
+</p>
+
+<h4 id="pp-space" class="docs">8. Spacing paragraphs</h4>
+
+<p>
+By default, mom does not insert a blank line between
+paragraphs.  If you would like her to do so, invoke the macro,
+<kbd>.PARA_SPACE</kbd>, without an argument, either before or after
+<a href="docprocessing.html#start">START</a>.
+PARA_SPACE is a toggle macro, therefore passing it any argument
+(<b>OFF, QUIT, Q, X</b>...) cancels its effect, meaning that
+paragraphs will once again not be separated by a blank line.
+</p>
+
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+If PARA_SPACE is on, mom spaces only those paragraphs that come
+after an initial paragraph.  Initial paragraphs are those that come
+immediately after the
+<a href="definitions.html#docheader">docheader</a>,
+<a href="#epigraph-intro">epigraphs</a>,
+<a href="#head-intro">heads</a>,
+<a href="#subhead-intro">subheads</a>
 and
-<a href="#LINEBREAK_INTRO">linebreaks</a>.
+<a href="#linebreak-intro">linebreaks</a>.
 (The first paragraph after these document elements requires no
 blank line to separate it from other paragraphs.)
 </p>
 
-<p>
-Sometimes, you can be fairly deep into a document before using
-<strong>PP</strong> for the first time, and when you do, because
-<strong>mom</strong> is still waiting for that &quot;initial&quot;
-paragraph, she doesn't space it with a blank line, even though
-you expect her to.  The simple workaround for this is to invoke
-<kbd>.PP</kbd> <em>twice</em> (in succession) at the point you
+<p class="tip-bottom">
+Sometimes, you can be fairly deep into a document before using PP
+for the first time, and when you do, because mom is still waiting
+for that initial paragraph, she doesn&#8217;t space it with a blank
+line, even though you expect her to.  The simple workaround for this
+is to invoke <kbd>.PP</kbd> twice (in succession) at the point you
 expect the blank line to appear.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="HEAD_INTRO"><h2><u>Main heads</u></h2></a>
+<h2 id="head-intro" class="macro-group">Main heads</h2>
 
-<ul>
-    <li><a href="#HEAD">Tag: HEAD</a></li>
-    <li><a href="#HEAD_CONTROL">Head control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#head">Tag: HEAD</a></li>
+  <li><a href="#head-control">Head control macros and defaults</a></li>
 </ul>
 
 <p>
-Main heads &mdash; or, in this documentation, just &quot;heads&quot;
-&mdash; should be used any place you want titles to introduce
-major sections of a document.  If you wish, <strong>mom</strong>
-can number your heads for you.  Head numbers can also be included
+Main heads&mdash;or, in this documentation, just
+&#8220;heads&#8221;&mdash;should be used any place you want titles
+to introduce major sections of a document.  If you wish, mom can
+number your heads for you.  Head numbers can also be included
 hierarchically in numbered
-<a href="#SUBHEAD_INTRO">subheads</a>
+<a href="#subhead-intro">subheads</a>
 and
-<a href="#PARAHEAD_INTRO">paraheads</a>.
+<a href="#parahead-intro">paraheads</a>.
 </p>
 
 <p>
-By default, heads are centred on the page, underlined,
-all in caps.  A double linespace precedes each head.  In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
+By default, heads are centred on the page, underlined, all in caps.
+A double linespace precedes each head.  In
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>,
 heads are bold, slightly larger than paragraph text.
 </p>
 
 <p>
-If these defaults don't suit you, you can change them with the
+If these defaults don&#8217;t suit you, you can change them with the
 head control macros.
 </p>
 
 <!-- -HEAD- -->
 
-<hr width="66%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="head" class="macro-id">HEAD</h3>
+</div>
 
-<a name="HEAD"></a>
+<div class="box-macro-args">
+Macro: <b>HEAD</b> <kbd class="macro-args">&quot;&lt;text of head&gt;&quot; [ &quot;&lt;2nd line&gt;&quot; [ &quot;&lt;3rd line&gt;&quot; ... ] ]</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>HEAD</strong> <kbd>&quot;&lt;text of head&gt;&quot; [ &quot;&lt;2nd line&gt;&quot; [ &quot;&lt;3rd line&gt;&quot; ... ] ]</kbd></nobr>
+The argument to HEAD is the text of the head, surrounded by
+double-quotes.  If you need additional lines for a head, simply
+surround each line with double-quotes.
 </p>
 
-<p>
-The argument to <strong>HEAD</strong> is the text of the head,
-surrounded by double-quotes.  If you need additional lines for a
-head, simply surround each line with double-quotes.
-</p>
-
-<p>
-<strong>NOTE:</strong> If a head falls near the bottom of an output
-page and <strong>mom</strong> is unable to fit the head <em>plus at
-least one line of text underneath it</em>, she will set the head at
-the top of the next page.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If a head falls near the bottom of an output page and mom is unable
+to fit the head <i>plus at least one line of text underneath it</i>,
+she will set the head at the top of the next page.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> If an
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+If an
+<a href="definitions.html#inputline">input line</a>
 in a head (i.e. one of the lines surrounded by double-quotes) has
-to be broken by <strong>mom</strong> in order to fit the current
-line-length (say, a narrow column measure), the head underline
-(underscore) will not behave.  You'll recognize the problem as soon
-as you preview your document.  If you encounter a head that
-misbehaves with respect to underlining, the solution is to
-supply each line <em>as you want it</em> as a separate argument
-(surrounded by double-quotes) to the <strong>HEAD</strong> macro.
+to be broken by mom in order to fit the current line-length (say,
+a narrow column measure), the head underline (underscore) will not
+behave.  You&#8217;ll recognize the problem as soon as you preview
+your document.  If you encounter a head that misbehaves with respect
+to underlining, the solution is to supply each line <i>as you want
+it</i> as a separate argument (surrounded by double-quotes) to the
+HEAD macro.
 </p>
 
 <p>
-For example, if <strong>mom</strong> breaks
-
-<pre>
-    .HEAD "This is a very, very, very long head"
-</pre>
-
-into
-<pre>
-    This is a very, very, very
-            long head        
-</pre>
-
-you'll see the misbehaving underscore and should change the
-argument to <strong>HEAD</strong> to
-
-<pre>
+For example, if mom breaks
+<br/>
+<span class="pre-in-pp">
+  .HEAD "This is a very, very, very long head"
+</span>
+into<br/>
+<span class="pre-in-pp">
+  This is a very, very, very
+          long head        
+</span>
+you&#8217;ll see the misbehaving underscore and should change the
+argument to HEAD to
+<br/>
+<span class="pre-in-pp">
     .HEAD "This is a very, very very" "long head"
-</pre>
+</span>
 </p>
+</div>
 
-<hr width="33%" align="left"/>
-
-<a name="HEAD_CONTROL"><h3><u>Head control macros</u></h3></a>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="head-control" class="docs defaults">HEAD control macros and defaults</h3>
 
-<p>
+<p class="defaults">
 There are, in addition to the usual family/font/size/quad control
 macros, a number of macros to manage head numbering, spacing,
-underlining, and so on.  Check them out if you're unhappy with
-<strong>mom</strong>'s defaults.
+underlining, and so on.  Check them out if you&#8217;re unhappy with
+mom&#8217;s defaults.
 </p>
-
-<ol>
-    <li><a href="#HEAD_GENERAL">Family/font/size/colour/quad</a></li>
-    <li><a href="#HEAD_CAPS">Caps</a></li>
-    <li><a href="#HEAD_SPACE">Pre-head space</a></li>
-    <li><a href="#HEAD_UNDERLINE">Underlining</a></li>
-    <li><a href="#NUMBER_HEADS">Numbering</a></li>
-    <li><a href="#RESET_HEAD_NUMBER">Reset head numbering</a></li>
-    <li><a href="#HEAD_INLINES">Vertical inline escapes inside heads</a></li>
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#head-general">Family/font/size/colour/quad</a></li>
+  <li><a href="#head-caps">Capitalizing heads</a></li>
+  <li><a href="#head-space">Pre-head space</a></li>
+  <li><a href="#head-underline">Underscoring</a></li>
+  <li><a href="#number-heads">Numbering</a></li>
+  <li><a href="#reset-head-number">Reset head numbering</a></li>
+  <li><a href="#head-inlines">Vertical inline escapes inside heads</a></li>
 </ol>
+</div>
 
-<a name="HEAD_GENERAL"><h4><u>1. Family/font/size/colour/quad</u></h4></a>
+<h4 id="head-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/colour/quad</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .HEAD_FAMILY default = prevailing document family; default is Times Roman
 .HEAD_FONT   default = bold
 .HEAD_SIZE   default = +1 (point)
 .HEAD_COLOR  default = black
 .HEAD_QUAD   default = CENTER
-</pre>
+</span>
+</div>
 
-<a name="HEAD_CAPS"><h4><u>2. Capitalizing heads &mdash; HEAD_CAPS</u></h4></a>
+<h4 id="head-caps" class="docs" style="margin-top: -1.25em;">2. Capitalizing heads</h4>
 
 <p>
-By default, <strong>mom</strong> sets heads in caps, regardless
-of the
-<a href="definitions.html#TERMS_STRINGARGUMENT">string(s)</a>
+By default, mom sets heads in caps, regardless of the
+<a href="definitions.html#stringargument">string(s)</a>
 you give to
-<a href="#HEAD">HEAD</a>.
+<a href="#head">HEAD</a>.
 To change this behaviour, do
-
-<pre>
-    .HEAD_CAPS OFF
-</pre>
-</p>
-
-<p>
-<strong>HEAD_CAPS</strong> is a toggle macro, therefore you can use
-any argument you like instead of <strong>OFF</strong> (<strong>END,
-QUIT, Q, X</strong>...).  To turn <strong>HEAD_CAPS</strong> back
-on, simply invoke it without an argument.
+<br/>
+<span class="pre-in-pp">
+  .HEAD_CAPS OFF
+</span>
+HEAD_CAPS is a toggle macro, therefore you can use any argument you
+like instead of <kbd>OFF</kbd> (<b>END, QUIT, Q, X</b>...).  To turn
+HEAD_CAPS back on, simply invoke it without an argument.
 </p>
 
-<a name="HEAD_SPACE"><h4><u>3. Space before heads &mdash; HEAD_SPACE</u></h4></a>
+<h4 id="head-space" class="docs" style="margin-top: -.25em;">3. Pre-head space</h4>
 
 <p>
-By default, <strong>mom</strong> deposits 2 blank lines prior to
-every head.  If you'd prefer just a single blank line, do
-
-<pre>
-    .HEAD_SPACE OFF
-</pre>
+By default, mom deposits 2 blank lines prior to every head when your
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+is <kbd>TYPESET</kbd>.  If you&#8217;d prefer just a single blank
+line, do
+<br/>
+<span class="pre-in-pp">
+  .HEAD_SPACE OFF
+</span>
+HEAD_SPACE is a toggle macro, therefore you can use any argument
+you like instead of <kbd>OFF</kbd> (<kbd>END, QUIT, Q, X</kbd>...).
+To restore the space before heads to 2 blank lines, invoke
+<kbd>.HEAD_SPACE</kbd> without an argument.
 </p>
 
-<p>
-<strong>HEAD_SPACE</strong> is a toggle macro, therefore you can use
-any argument you like instead of <strong>OFF</strong> (<strong>END,
-QUIT, Q, X</strong>...).  To restore the space before heads to 2
-blank lines, invoke <kbd>.HEAD_SPACE</kbd> without an argument.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+HEAD_SPACE has no effect on PRINTSTYLE <kbd>TYPEWRITE</kbd>.
 </p>
+</div>
 
-<a name="HEAD_UNDERLINE"><h4><u>4. Underlining heads &mdash; HEAD_UNDERLINE</u></h4></a>
+<h4 id="head-underline" class="docs" style="margin-top: -.25em;">4. Underscoring</h4>
 
 <p>
-By default, <strong>mom</strong> underlines heads.  To change this
-behaviour, do
-
-<pre>
-    .HEAD_UNDERLINE OFF
-</pre>
-</p>
-
-<p>
-<strong>HEAD_UNDERLINE</strong> can be used as a toggle macro, therefore you can
-use any argument you like instead of <strong>OFF</strong> (<strong>END,
-QUIT, Q, X</strong>...) to turn it off, or invoke it by itself to
+By default, mom underlines heads.  To change this behaviour, do
+<br/>
+<span class="pre-in-pp">
+  .HEAD_UNDERLINE OFF
+</span>
+HEAD_UNDERLINE can be used as a toggle macro, therefore you can
+use any argument you like instead of <kbd>OFF</kbd> (<kbd>END,
+QUIT, Q, X</kbd>...) to turn it off, or invoke it by itself to
 turn head underlining on.
 </p>
 
 <p>
-As of version 1.5 of <strong>mom</strong>, you can now use
-<strong>HEAD_UNDERLINE</strong> to set the weight of the underline
-and its distance from the head, in addition to simply toggling head
-underlining on or off.  The order of arguments is <kbd>weight</kbd>,
-optionally followed by <kbd>gap</kbd>, where &quot;gap&quot; is the
-distance from the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-of the head to the underline.
-</p>
-
-<p>
-The <kbd>weight</kbd> argument is given in points, or fractions
-thereof, and must NOT have the
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
+In addition to toggling head underlining on or off, as of
+version 1.5 of mom, you can use HEAD_UNDERLINE to set the weight
+of the underline and its distance from the head, like this:
+<br/>
+<span class="pre-in-pp">
+  .HEAD_UNDERLINE &lt;weight&gt; [&lt;gap&gt;]
+</span>
+The <kbd>weight</kbd> argument is in points, or fractions thereof,
+and must not have the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
 <kbd>p</kbd>, appended.  Like
-<a href="inlines.html#RULE_WEIGHT">RULE_WEIGHT</a>,
-weights MUST be greater than 0 and less than 100.
-<strong>Mom</strong>'s default for head underlines is 1/2 point.
+<a href="inlines.html#rule-weight">RULE_WEIGHT</a>,
+weights must be greater than 0 and less than 100.  Mom&#8217;s
+default for head underlines is 1/2 point.
 </p>
 
 <p>
-The <kbd>gap</kbd> argument can be given using any unit of measure,
-and MUST have the unit of measure appended to the argument.  The
-distance of the gap is measured from the baseline of the head to
-the upper edge of the underline.  <strong>Mom</strong>'s default
-gap for head underlines is 2 points.
+The <kbd>gap</kbd> argument determines the distance from the
+baseline of the head to the upper edge of the underline.  It can
+be given using any unit of measure, and must have the unit of
+measure appended to the argument.  Mom&#8217;s default gap for head
+underlines is 2 points.
 </p>
 
 <p>
-As an example, supposed you want your heads underlined with a
+As an example, suppose you want your heads underlined with a
 4-point rule separated from the head by 3 points.  The way to
-accomplish that is:
-
-<pre>
-    .HEAD_UNDERLINE 4 3p
-</pre>
-
-If you wanted the same thing, but were content with
-<strong>mom</strong>'s default gap of 2 points,
-
-<pre>
-    .HEAD_UNDERLINE 4
-</pre>
-
+accomplish it is:
+<br/>
+<span class="pre-in-pp">
+  .HEAD_UNDERLINE 4 3p
+</span>
+If you wanted the same thing, but were content with mom&#8217;s
+default gap of 2 points,
+<br/>
+<span class="pre-in-pp">
+  .HEAD_UNDERLINE 4
+</span>
 would do the trick.
 </p>
 
-<p>
-Please note that if you supply a weight to
-<strong>HEAD_UNDERLINE</strong>, and optionally a gap, you also turn
-the underlining of heads on; if this is not what you want, you must
-turn head underlining off manually afterwards.
-</p>
-
-<a name="NUMBER_HEADS"><h3><u>5. Number heads &mdash; NUMBER_HEADS</u></h3></a>
-
-<p>
-If you'd like your heads numbered, simply invoke
-<kbd>.NUMBER_HEADS</kbd> with no argument. <strong>Mom</strong>
-will number all subsequent heads automatically (in ascending order,
-naturally).
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you supply a weight to HEAD_UNDERLINE, and optionally a gap, you
+also turn the underlining of heads on; if this is not what you want,
+you must turn head underlining off manually afterwards.
+</p>
+</div>
+
+<h4 id="number-heads" class="docs" style="margin-top: -.25em;">5. Numbering</h4>
+
+<p>
+If you&#8217;d like your heads numbered, simply invoke
+<span class="pre-in-pp">
+  .NUMBER_HEADS
+</span>
+with no argument. Mom will number all subsequent heads automatically
+(in ascending order, naturally).
 </p>
 
 <p>
 If, in addition to numbering heads, you also request that
-<a href="#SUBHEAD_INTRO">subheads</a>
+<a href="#subhead-intro">subheads</a>
 and/or
-<a href="#PARAHEAD_INTRO">paraheads</a>
-be numbered, the head number will be included in their numbers
-(each number separated by a period [dot]).
+<a href="#parahead-intro">paraheads</a>
+be numbered, the head number will be included in their numbers (each
+number separated by a period [dot]).
 </p>
 
 <p>
 Should you wish to stop head numbering, invoke
-<kbd>.NUMBER_HEADS</kbd> with any argument (<strong>OFF, QUIT,
-END, X</strong>...).  Head numbering will cease, and the head number
-will not be included in the numbering of subheads and/or paraheads.
+<kbd>.NUMBER_HEADS</kbd> with any argument (<kbd>OFF, QUIT, END,
+X</kbd>...).  Head numbering will cease, and the head number will
+not be included in the numbering of subheads and/or paraheads.
 </p>
 
 <p>
 See also
-<a href="#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a>
-if you'd like chapter numbers prepended to the head numbers.
+<a href="#prefix-chapter-number">Prefixing chapter numbers</a>
+if you&#8217;d like chapter numbers prepended to the head numbers.
 </p>
 
-<a name="RESET_HEAD_NUMBER"><h4><u>6. Reset head numbering &mdash; RESET_HEAD_NUMBER</u></h4></a>
+<h4 id="reset-head-number" class="docs" style="margin-top: -.25em;">6. Reset head numbering</h4>
 
 <p>
-Should you wish to reset the head number to &quot;1&quot;, invoke
-<kbd>.RESET_HEAD_NUMBER</kbd> with no argument.  If, for some
-reason, you want <strong>mom</strong> to use a head number that is not
-the next in ascending order (i.e. the last head number + 1), invoke
-<kbd>.RESET_HEAD_NUMBER</kbd> with the number you want, e.g.
-
-<pre>
-    .RESET_HEAD_NUMBER 6
-</pre>
-
-Your next head will be numbered &quot;6&quot; and subsequent heads will
-be numbered in ascending order from &quot;6&quot;.
+Should you wish to reset the head number to &#8220;1&#8221;,
+invoke
+<span class="pre-in-pp">
+  .RESET_HEAD_NUMBER
+</span>
+with no argument.  If, for some reason, you want mom to use a head
+number that is not the next in ascending order (i.e. the last head
+number + 1), invoke <kbd>.RESET_HEAD_NUMBER</kbd> with the number
+you want, e.g.
+<br/>
+<span class="pre-in-pp">
+  .RESET_HEAD_NUMBER 6
+</span>
+Your next head will be numbered &#8220;6&#8221; and subsequent heads will
+be numbered in ascending order from &#8220;6&#8221;.
 </p>
 
-<a name="HEAD_INLINES"><h4><u>7. Vertical inline escapes inside heads</u></h4></a>
+<h4 id="head-inlines" class="docs" style="margin-top: -.25em;">7. Vertical inline escapes inside heads</h4>
 
 <p>
 If you need to adjust the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+<a href="definitions.html#baseline">baseline</a>
 position of a head (e.g. the head falls at the top of a column and
 you want its
-<a href="definitions.html#TERMS_ASCENDER">ascenders</a>
+<a href="definitions.html#ascender">ascenders</a>
 to line up with the ascenders of
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<a href="definitions.html#running">running text</a>
 in other columns), you can embed a vertical motion
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+<a href="definitions.html#inlines">inline escape</a>
 (either
-<a href="inlines.html#INLINE_VERTICAL_MOM">mom</a>'s
+<a href="inlines.html#inline-vertical-mom">mom</a>&#8217;s
 or
-<a href="inlines.html#INLINE_VERTICAL_GROFF">groff</a>'s
-in the string(s) you pass to <strong>HEAD</strong>.
+<a href="inlines.html#inline-vertical-groff">groff</a>&#8217;s
+in the string(s) you pass to HEAD.
 </p>
 
 <p>
 For example,
-
-<pre>
-    .HEAD "\[ALD3]Text of head"
-        or
-    .HEAD "\[DOWN 3p]Text of head"
-</pre>
-
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .HEAD "\*[DOWN 3p]Text of head"
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .HEAD "\v'3p'Text of head"
+</span>
 will lower the baseline of the head by three points.  Note that
-there's no need to reverse the sense of the inline escape.
+there&#8217;s no need to reverse the sense of the inline escape.
 </p>
 
 <p>
 In the case of heads that run to more than one line, you must embed
 the escape in the string for each line, like this:
-
-<pre>
-    .HEAD "\[ALD3]First line" "\[ALD3]Next line" 
-        or
-    .HEAD "\[DOWN 3p]First line" "\[DOWN 3p]Next line" 
-</pre>
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .HEAD "\*[DOWN 3p]First line" "\[DOWN 3p]Next line" 
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .HEAD "\v'3p'First line" "\v'3p'Next line" 
+</span>
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="SUBHEAD_INTRO"><h2><u>Subheads</u></h2></a>
+<h2 id="subhead-intro" class="macro-group">Subheads</h2>
 
-<ul>
-    <li><a href="#SUBHEAD">Tag: SUBHEAD</a></li>
-    <li><a href="#SUBHEAD_CONTROL">Subhead control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#subhead">Tag: SUBHEAD</a></li>
+  <li><a href="#subhead-control">Subhead control macros</a></li>
 </ul>
 
 <p>
 Subheads should be used any place you want titles to introduce
-sections of a document below heads.  If you wish, <strong>mom</strong>
-can number subheads for you.  Subhead numbers can also be included
+sections of a document below heads.  If you wish, mom can
+number subheads for you.  Subhead numbers can also be included
 hierarchically in numbered
-<a href="#PARAHEAD_INTRO">paraheads</a>.
+<a href="#parahead-intro">paraheads</a>.
 </p>
 
 <p>
 By default, subheads are flush left.  In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>,
 they are set bold, slightly larger than paragraph text.  In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
 they are underlined.  A single linespace precedes them in both
 printstyles, and a tiny space adjustment raises them slightly
-above text that comes afterwards for greater clarity in
-document structuring.
+above text that comes afterwards for greater clarity in document
+structuring.
 </p>
 
 <p>
-If these defaults don't suit you, you can change them with the
+If these defaults don&#8217;t suit you, you can change them with the
 subhead control macros.
 </p>
 
 <!-- -SUBHEAD- -->
 
-<hr width="66%" align="left"/>
-
-<a name="SUBHEAD"></a>
+<div class="macro-id-overline">
+<h3 id="subhead" class="macro-id">SUBHEAD</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>SUBHEAD</strong> <kbd>&quot;&lt;text of subhead&gt;&quot; [ &quot;&lt;2nd line&gt;&quot; [ &quot;&lt;3rd line&gt;&quot; ... ] ]</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>SUBHEAD</b> <kbd class="macro-args">&quot;&lt;text of subhead&gt;&quot; [ &quot;&lt;2nd line&gt;&quot; [ &quot;&lt;3rd line&gt;&quot; ... ] ]</kbd>
+</div>
 
 <p>
-The argument to <strong>SUBHEAD</strong> is the text of the subhead,
-surrounded by double-quotes.  If you need additional lines for a
-subhead, simply surround each line with double-quotes.
+The argument to SUBHEAD is the text of the subhead, surrounded by
+double-quotes.  If you need additional lines for a subhead, simply
+surround each line with double-quotes.
 </p>
 
-<p>
-<strong>NOTE:</strong> If a subhead falls near the bottom of an output
-page and <strong>mom</strong> is unable to fit the head <em>plus at
-least one line of text underneath it</em>, she will set the subhead
-at the top of the next page.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If a subhead falls near the bottom of an output page and mom is
+unable to fit the head <i>plus at least one line of text underneath
+it</i>, she will set the subhead at the top of the next page.
 </p>
+</div>
 
-<hr width="33%" align="left"/>
-
-<a name="SUBHEAD_CONTROL"><h3><u>Subhead control macros</u></h3></a>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="subhead-control" class="docs defaults">SUBHEAD control macros and defaults</h3>
 
-<p>
-In addition to the usual family/font/size/quad control
-macros, there are macros to manage subhead numbering.
+<p class="defaults">
+In addition to the usual family/font/size/quad control macros, there
+are macros to manage subhead numbering.
 </p>
 
-<ol>
-    <li><a href="#SUBHEAD_GENERAL">Family/font/size/colour/quad</a></li>
-    <li><a href="#NUMBER_SUBHEADS">Numbering</a></li>
-    <li><a href="#RESET_SUBHEAD_NUMBER">Reset subhead numbering</a></li>
-    <li><a href="#SUBHEAD_INLINES">Vertical inline escapes inside subheads</a></li>
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#subhead-general">Family/font/size/colour/quad</a></li>
+  <li><a href="#number-subheads">Numbering</a></li>
+  <li><a href="#reset-subhead-number">Reset subhead numbering</a></li>
+  <li><a href="#subhead-inlines">Vertical inline escapes inside subheads</a></li>
 </ol>
+</div>
 
-<a name="SUBHEAD_GENERAL"><h4><u>1. Family/font/size/quad</u></h4></a>
+<h4 id="subhead-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/quad</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults" style="padding-bottom: -1em;">
 .SUBHEAD_FAMILY default = prevailing document family; default is Times Roman
 .SUBHEAD_FONT   default = bold
 .SUBHEAD_SIZE   default = +.5 (point)
 .SUBHEAD_COLOR  default = black
 .SUBHEAD_QUAD   default = LEFT
-</pre>
+</span>
+</div>
 
-<a name="NUMBER_SUBHEADS"><h4><u>2. Number subheads &mdash; NUMBER_SUBHEADS</u></h4></a>
+<h4 id="number-subheads" class="docs" style="margin-top: -1.25em;">2. Number subheads</h4>
 
 <p>
-If you'd like your subheads numbered, simply invoke
-<kbd>.NUMBER_SUBHEADS</kbd> with no argument. <strong>Mom</strong>
+If you&#8217;d like your subheads numbered, simply invoke
+<kbd>.NUMBER_SUBHEADS</kbd> with no argument. Mom
 will number all subsequent subheads automatically (in ascending
 order, naturally).
 </p>
 
 <p>
 If, in addition to numbering subheads, you also request that
-<a href="#HEAD_INTRO">heads</a>
+<a href="#head-intro">heads</a>
 be numbered, the head number will be included in the subhead number
 (separated by a period [dot]).
 </p>
 
 <p>
 Should you wish to stop subhead numbering, invoke
-<kbd>.NUMBER_SUBHEADS</kbd> with any argument (<strong>OFF, QUIT,
-END, X</strong>...).  Subhead numbering will cease, and the subhead
-number will not be included in the numbering of paraheads.
+<kbd>.NUMBER_SUBHEADS</kbd> with any argument (<kbd>OFF, QUIT, END,
+X</kbd>...).  Subhead numbering will cease, and the subhead number
+will not be included in the numbering of paraheads.
 </p>
 
 <p>
 See also
-<a href="#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a>
-if you'd like chapter numbers prepended to the subhead numbers.
+<a href="#prefix-chapter-number">Prefixing chapter numbers</a>
+if you&#8217;d like chapter numbers prepended to the subhead numbers.
 </p>
 
-<a name="RESET_SUBHEAD_NUMBER"><h4><u>3. Reset subhead numbering &mdash; RESET_SUBHEAD_NUMBER</u></h4></a>
+<h4 id="reset-subhead-number" class="docs" style="margin-top: -.25em;">3. Reset subhead numbering</h4>
 
 <p>
-Should you wish to reset the subhead number to &quot;1&quot;, invoke
-<kbd>.RESET_SUBHEAD_NUMBER</kbd> with no argument.  If, for some
-reason, you want <strong>mom</strong> to use a subhead number that
-is not the next in ascending order (i.e. the last subhead number +
-1), invoke <kbd>.RESET_SUBHEAD_NUMBER</kbd> with the number you
-want, e.g.
-
-<pre>
-    .RESET_SUBHEAD_NUMBER 4
-</pre>
+Should you wish to reset the subhead number to &#8220;1&#8221;,
+invoke
+<span class="pre-in-pp">
+  .RESET_SUBHEAD_NUMBER
+</span>
+with no argument.  If, for some reason, you want mom to use a
+subhead number that is not the next in ascending order (i.e. the
+last subhead number + 1), invoke <kbd>.RESET_SUBHEAD_NUMBER</kbd>
+with the number you want, e.g.
+<br/>
+<span class="pre-in-pp">
+  .RESET_SUBHEAD_NUMBER 4
+</span>
 
-Your next subhead will be numbered &quot;4&quot; and subsequent
-subheads will be numbered in ascending order from &quot;4&quot;.
+Your next subhead will be numbered &#8220;4&#8221; and subsequent
+subheads will be numbered in ascending order from &#8220;4&#8221;.
 </p>
 
-<a name="SUBHEAD_INLINES"><h4><u>Vertical inline escapes inside subheads</u></h4></a>
+<h4 id="subhead-inlines" class="docs" style="margin-top: -.25em;">4. Vertical inline escapes inside subheads</h4>
 
 <p>
 See
-<a href="#HEAD_INLINES">Vertical inline escapes inside heads</a>.
+<a href="#head-inlines">Vertical inline escapes inside heads</a>.
 The information there applies equally to subheads.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="PARAHEAD_INTRO"><h2><u>Paragraph heads</u></h2></a>
+<h2 id="parahead-intro" class="macro-group">Paragraph heads</h2>
 
-<ul>
-    <li><a href="#PARAHEAD">Tag: PARAHEAD</a></li>
-    <li><a href="#PARAHEAD_CONTROL">Parahead control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#parahead">Tag: PARAHEAD</a></li>
+  <li><a href="#parahead-control">Parahead control macros</a></li>
 </ul>
 
 <p>
 Paragraph heads (paraheads) should be used any place you want titles
-to introduce paragraphs below heads or subheads.  If you wish,
-<strong>mom</strong> can number paraheads for you.
+to introduce paragraphs below heads or subheads.  If you wish, mom
+can number paraheads for you.
 </p>
 
 <p>
 By default, paraheads are joined to the body of a paragraph,
 slightly indented (provided the paragraph is not a
-&quot;first&quot; paragraph as defined in
-<a href="#PARA_INDENT_FIRST">Indenting initial paragraphs</a>).
-In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
+&#8220;first&#8221; paragraph as defined in
+<a href="#para-indent-first">Indenting initial paragraphs</a>)
+and separated from the body of the paragraph by a small amount of
+horizontal space.  In
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>,
 they are set bold italic, slightly larger than paragraph text.  In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
 they are underlined.
 </p>
 
 <p>
-If these defaults don't suit you, you can change them with the
+If these defaults don&#8217;t suit you, you can change them with the
 parahead control macros.
 </p>
 
-<!-- -PARAHEAD- -->
-
-<hr width="66%" align="left"/>
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+If you really need a heading level below subhead (a sub-subhead)
+that isn&#8217;t joined to the body of a paragraph, you can trick
+PARAHEAD into giving you one by creating a paragraph that contains
+only a parahead, like this:
+<br/>
+<span class="pre-in-pp">
+  .PP
+  .PARAHEAD "My Sub-Subhead"
+  .PP
+  &lt;text&gt;
+</span>
+</p>
+</div>
 
-<a name="PARAHEAD"></a>
+<!-- -PARAHEAD- -->
 
-<p>
-<nobr>Macro: <strong>PARAHEAD</strong> <kbd>&quot;&lt;text of parahead&gt;&quot;</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="parahead" class="macro-id">PARAHEAD</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>PARAHEAD</b> <kbd class="macro-args">&quot;&lt;text of parahead&gt;&quot;</kbd>
+</div>
 
 <p>
-<strong>PARAHEAD</strong> must come AFTER
-<a href="#PP">PP</a>
-or it will not work!
+PARAHEAD must come after
+<a href="#pp">PP</a>
+or it will not work.
 </p>
 
 <p>
 The argument is the text of the parahead, surrounded by
 double-quotes.  Because paraheads are joined to the body of a
 paragraph, they accept only one argument (see
-<a href="#HEAD">HEAD</a>
+<a href="#head">HEAD</a>
 and
-<a href="#SUBHEAD">SUBHEAD</a>).
+<a href="#subhead">SUBHEAD</a>).
 </p>
 
-<hr width="33%" align="left"/>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="parahead-control" class="docs defaults">PARAHEAD control macros and defaults</h3>
 
-<a name="PARAHEAD_CONTROL"><h3><u>Parahead control macros</u></h3></a>
-
-<p>
+<p class="defaults">
 In addition to the family/font/size/colour/indent control macros,
 there are macros to manage parahead numbering.
 </p>
 
-<ol>
-    <li><a href="#PARAHEAD_GENERAL">Family/font/size/color</a></li>
-    <li><a href="#PARAHEAD_INDENT">Indent</a></li>
-    <li><a href="#NUMBER_PARAHEADS">Numbering</a></li>
-    <li><a href="#RESET_PARAHEAD_NUMBER">Reset parahead numbering</a></li>
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#parahead-general">Family/font/size/color</a></li>
+  <li><a href="#parahead-indent">Indent</a></li>
+  <li><a href="#parahead-space">Horizontal space</a></li>
+  <li><a href="#number-paraheads">Numbering</a></li>
+  <li><a href="#reset-parahead-number">Reset parahead numbering</a></li>
 </ol>
+</div>
 
-<p>
-<a name="PARAHEAD_GENERAL"><h4><u>1. Family/font/size/colour</u></h4></a>
-</p>
+<h4 id="parahead-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/colour</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .PARAHEAD_FAMILY default = prevailing document family; default is Times Roman
 .PARAHEAD_FONT   default = bold italic
 .PARAHEAD_SIZE   default = +.5 (point)
-<a name="PARAHEAD_COLOR">.PARAHEAD_COLOR  default = black*</a>
+.PARAHEAD_COLOR  default = black*
 
 *If you colourize paragraph text, paraheads will appear in the same
-colour as the text unless you explicitly tell mom to colour them
-otherwise by invoking .PARAHEAD_COLOR.  If you do want paraheads
-that are coloured the same as paragraph text, it's generally a good
-idea to invoke .PARAHEAD_COLOR anyway (with the same colour used
-for paragraph text), just to let mom know.
-</pre>
+ colour as the text unless you explicitly tell mom to colour them
+ otherwise by invoking .PARAHEAD_COLOR.  If you do want paraheads
+ that are coloured the same as paragraph text, it&#8217;s generally a good
+ idea to invoke .PARAHEAD_COLOR anyway (with the same colour used
+ for paragraph text), just to let mom know.
+</span>
+</div>
 
-<a name="PARAHEAD_INDENT"><h4><u>2. Indent</u></h4></a>
+<h4 id="parahead-indent" class="docs" style="margin-top: -1.25em;">2. Indent</h4>
 
 <p>
 Unlike other control macros that end in
-<a href="#CONTROL_INDENTS"><strong>_INDENT</strong></a>,
-the argument to the macro that controls indenting of paragraph heads
-(<strong>PARAHEAD_INDENT</strong>) is NOT relative to the first-line
-indent of normal paragraphs.  In other words, it takes an absolute
-value, and requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<a href="#control-indents">_INDENT</a>,
+the argument to the macro that controls indenting of paragraph
+heads (PARAHEAD_INDENT) is not relative to the first-line indent of
+normal paragraphs.  In other words, it takes an absolute value, and
+requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 For example, to set the paragraph head indent to 2-1/2 picas, you
 do:
+<br/>
+<span class="pre-in-pp">
+  .PARAHEAD_INDENT 2.5P
+</span>
+</p>
 
-<pre>
-    .PARAHEAD_INDENT 2.5P
-</pre>
+<p>
+Mom&#8217;s default indent for paragraph heads is 1/2 the first-line
+indent of normal paragraphs (both printstyles).  However, as stated
+above, if you choose to change the indent, you must give an absolute
+value (unless you&#8217;re a groff expert and want to manipulate the
+number register <kbd>\n[#PP_INDENT]u</kbd> arithmetically as the
+argument to PARAHEAD_INDENT for an indent that&#8217;s relative to
+PP_INDENT.)
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Paragraph heads in &#8220;first paragraphs&#8221;, as defined in
+<a href="#para-indent-first">Indenting initial paragraphs</a>,
+are not indented unless you turn
+<kbd><a href="#indent-first-paras">INDENT_FIRST_PARAS</a></kbd>
+on.
 </p>
+</div>
+
+<h4 id="parahead-space" class="docs" style="margin-top: -.25em;">3. Horizontal space</h4>
 
 <p>
-<strong>Mom</strong>'s default indent for paragraph heads is 1/2
-the first-line indent of normal paragraphs (both printstyles).
-However, as stated above, if you choose to change the indent, you
-must give an absolute value (unless you're a groff expert and want
-to manipulate the number register <kbd>\n[#PP_INDENT]u</kbd>
-arithmetically as the argument to <strong>PARAHEAD_INDENT</strong>
-for an indent that's relative to <strong>PP_INDENT</strong>.)
+The default amount of horizontal space between a parahead and the
+text that begins the body of a paragraph is 2/3 of an
+<a href="definitions.html#em">em</a>
+for 
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>)
+and 1
+<a href="definitions.html#figurespace">figure space</a>
+for
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>).
 </p>
 
 <p>
-<strong>NOTE:</strong> Paragraph heads in &quot;first
-paragraphs&quot;, as defined in
-<a href="#PARA_INDENT_FIRST">Indenting initial paragraphs</a>,
-are not indented unless you turn
-<a href="#INDENT_FIRST_PARAS">INDENT_FIRST_PARAS</a>
-on.
+The default for <kbd>TYPEWRITE</kbd> is fixed, but if the default
+for <kbd>TYPESET</kbd> doesn&#8217;t suit you, you can change it
+with the macro, PARAHEAD_SPACE.
+</p>
+<p>
+PARAHEAD_SPACE takes just one argument: the amount of space you
+want, with a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+appended.  Thus, if you want the horizontal space between a parahead
+and the start of paragraph text to be 6
+<a href="definitions.html#picaspoints">points</a>,
+you&#8217;d do:
+<br/>
+<span class="pre-in-pp">
+  .PARAHEAD_SPACE 6p
+</span>
 </p>
 
-<a name="NUMBER_PARAHEADS"><h4><u>3. Number paraheads &mdash; NUMBER_PARAHEADS</u></h4></a>
+<h4 id="number-paraheads" class="docs" style="margin-top: -1.25em;">4. Numbering</h4>
 
 <p>
-If you'd like your paraheads numbered, simply invoke
-<kbd>.NUMBER_PARAHEADS</kbd> with no argument. <strong>Mom</strong>
+If you&#8217;d like your paraheads numbered, simply invoke
+<kbd>.NUMBER_PARAHEADS</kbd> with no argument. Mom
 will number all subsequent paraheads automatically (in ascending
 order, naturally).
 </p>
 
 <p>
 If, in addition to numbering paraheads, you also request that
-<a href="#HEAD_INTRO">heads</a>
+<a href="#head-intro">heads</a>
 and
-<a href="#SUBHEAD_INTRO">subheads</a>
+<a href="#subhead-intro">subheads</a>
 be numbered, the head and/or subhead number will be included in the
 parahead number (separated by a period [dot]).
 </p>
 
 <p>
 Should you wish to stop parahead numbering, invoke
-<kbd>.NUMBER_PARAHEADS</kbd> with any argument (<strong>OFF, QUIT,
-END, X</strong>...).  Parahead numbering will cease.
+<kbd>.NUMBER_PARAHEADS</kbd> with any argument (<kbd>OFF, QUIT, END,
+X</kbd>...).  Parahead numbering will cease.
 </p>
 
 <p>
 See also
-<a href="#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a>
-if you'd like chapter numbers prepended to the paragraph head
+<a href="#prefix-chapter-number">Prefixing chapter numbers</a>
+if you&#8217;d like chapter numbers prepended to the paragraph head
 numbers.
 </p>
 
-<a name="RESET_PARAHEAD_NUMBER"><h4><u>4. Reset paragraph head numbering &mdash; RESET_PARAHEAD_NUMBER</u></h4></a>
-
-<p>
-Should you wish to reset the parahead number to &quot;1&quot;, invoke
-<kbd>.RESET_PARAHEAD_NUMBER</kbd> with no argument.  If, for some
-reason, you want <strong>mom</strong> to use a parahead number that is not
-the next in ascending order (i.e. the last parahead number + 1), invoke
-<kbd>.RESET_PARAHEAD_NUMBER</kbd> with the number you want, e.g.
-
-<pre>
-    .RESET_PARAHEAD_NUMBER 7
-</pre>
-</p>
+<h4 id="reset-parahead-number" class="docs" style="margin-top: -.25em;">5. Reset paragraph head numbering</h4>
 
 <p>
-Your next parahead will be numbered &quot;7&quot; and subsequent
-paraheads will be numbered in ascending order from &quot;7&quot;.
+Should you wish to reset the parahead number to &#8220;1&#8221;,
+invoke
+<span class="pre-in-pp">
+  .RESET_PARAHEAD_NUMBER
+</span>
+with no argument.  If, for some reason, you want mom to use a
+parahead number that is not the next in ascending order (i.e. the
+last parahead number + 1), invoke <kbd>.RESET_PARAHEAD_NUMBER</kbd>
+with the number you want, e.g.
+<br/>
+<span class="pre-in-pp">
+  .RESET_PARAHEAD_NUMBER 7
+</span>
+Your next parahead will be numbered &#8220;7&#8221; and subsequent
+paraheads will be numbered in ascending order from &#8220;7&#8221;.
 </p>
 
-<!-- ==================================================================== -->
-
-<hr width="33%" align="left"/>
+<!-- -PREFIX_CHAPTER_NUMBER- -->
 
-<a name="PREFIX_CHAPTER_NUMBER"></a>
+<div class="examples-container" style="margin-bottom: 1.5em;">
+<div id="prefix-chapter-number" class="macro-id-overline" style="border-top: none;">
+<h3 class="macro-id" style="margin-top: 9px; text-transform: none; font-size: 105%;">Prefixing chapter numbers</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>PREFIX_CHAPTER_NUMBER</strong> <kbd>&lt;none&gt; | &lt;chapter number as digit&gt; | &lt;anything&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args" style="width: 686px;">
+Macro: <b>PREFIX_CHAPTER_NUMBER</b> <kbd class="macro-args">&lt;none&gt; | &lt;chapter number as digit&gt; | &lt;anything&gt;</kbd>
+</div>
 
 <p>
-If you've requested numbering of heads, subheads and/or paragraph
+If you&#8217;ve requested numbering of heads, subheads and/or paragraph
 heads (with
-<a href="#NUMBER_HEADS">NUMBER_HEADS</a>,
-<a href="#NUMBER_SUBHEADS">NUMBER_SUBHEADS</a>
+<a href="#number-heads">NUMBER_HEADS</a>,
+<a href="#number-subheads">NUMBER_SUBHEADS</a>
 and/or
-<a href="#NUMBER_PARAHEADS">NUMBER_PARAHEADS</a>)
-and you'd like <strong>mom</strong>, in addition, to prefix
+<a href="#number-paraheads">NUMBER_PARAHEADS</a>)
+and you&#8217;d like mom, in addition, to prefix
 a chapter number to the numbering scheme, you can do so with
-<strong>PREFIX_CHAPTER_NUMBERS</strong>.  After you invoke
-<kbd>.PREFIX_CHAPTER_NUMBERS</kbd>, <strong>mom</strong> will
-prepend the current chapter number to all subsequent head elements
-(main heads, subheads or paragraph heads) for which you have
-requested numbering.  Thus, assuming chapter number twelve (12),
-
-<pre>
-        1. FIRST MAIN HEAD
-        ------------------
+PREFIX_CHAPTER_NUMBER.
+</p>
 
-1.1. First Subhead Under Main Head
-</pre>
+<p>
+After you invoke <kbd>.PREFIX_CHAPTER_NUMBER</kbd>, mom will prepend
+the current chapter number to all subsequent head elements (main
+heads, subheads or paragraph heads) for which you have requested
+numbering.  Thus, assuming chapter number twelve (12):
+<br/>
+<span class="pre-in-pp">
+          1. FIRST MAIN HEAD
+          ------------------
 
+  1.1. First Subhead Under Main Head
+</span>
 becomes
+<br/>
+<span class="pre-in-pp">
+          12.1. FIRST MAIN HEAD
+          ---------------------
 
-<pre>
-        12.1. FIRST MAIN HEAD
-        ---------------------
-
-12.1.1. First Subhead Under Main Head
-</pre>
+  12.1.1. First Subhead Under Main Head
+</span>
 </p>
 
 <p>
-When you invoke <kbd>.PREFIX_CHAPTER_NUMBERS</kbd> without an
-argument, <strong>mom</strong> checks to see whether the argument
+When you invoke <kbd>.PREFIX_CHAPTER_NUMBER</kbd> without an
+argument, mom checks to see whether the argument
 you passed to
-<a href="docprocessing.html#CHAPTER">CHAPTER</a>
+<a href="docprocessing.html#chapter">CHAPTER</a>
 is a digit.  If it is, she immediately starts pre-pending the
-current chapter number to numbered head elements.  If it isn't
-(say you've called your chapter &quot;One&quot; instead of
-&quot;1&quot;), <strong>mom</strong> will abort with a request that
-you pass <strong>PREFIX_CHAPTER_NUMBER</strong> a digit representing
+current chapter number to numbered head elements.  If it isn&#8217;t
+(say you&#8217;ve called your chapter &#8220;One&#8221; instead of
+&#8220;1&#8221;), mom will abort with a request that
+you pass PREFIX_CHAPTER_NUMBER a digit representing
 the current chapter number.
 </p>
 
 <p>
-In collated documents, <strong>mom</strong> automatically increments
-the digit used by <strong>PREFIX_CHAPTER_NUMBER</strong> by one
+In collated documents, mom automatically increments
+the digit used by PREFIX_CHAPTER_NUMBER by one
 (current chapter digit + 1) every time you invoke
-<a href="rectoverso.html#COLLATE"><kbd>.COLLATE</kbd></a>,
-even if you've (temporarily) turned off the prefixing of chapter
-numbers.  Thus, even if you call your chapters &quot;One&quot;,
-&quot;Two&quot;, &quot;Three&quot; instead of &quot;1&quot;,
-&quot;2&quot;, &quot;3&quot;, <strong>mom</strong> will Do
+<a href="rectoverso.html#collate"><kbd>.COLLATE</kbd></a>,
+even if you&#8217;ve (temporarily) turned off the prefixing of chapter
+numbers.  Thus, even if you call your chapters &#8220;One&#8221;,
+&#8220;Two&#8221;, &#8220;Three&#8221; instead of &#8220;1&#8221;,
+&#8220;2&#8221;, &#8220;3&#8221;, mom will Do
 The Right Thing with respect to numbering head elements in
 all collated chapters following the first invocation of
-<strong>PREFIX_CHAPTER_NUMBER</strong> (assuming, of course,
+PREFIX_CHAPTER_NUMBER (assuming, of course,
 that the collated chapters are in incrementing order; if
-not, you <em>must</em> must put
-
-<pre>
-    .PREFIX_CHAPTER_NUMBER &lt;chapter number&gt;
-</pre>
-
-somewhere after the invocation of <strong>COLLATE</strong> and
+not, you <i>must</i> must put
+<br/>
+<span class="pre-in-pp">
+  .PREFIX_CHAPTER_NUMBER &lt;chapter number&gt;
+</span>
+somewhere after the invocation of COLLATE and
 before the first numbered head element of each collated document).
 </p>
 
 <p>
-<strong>PREFIX_CHAPTER_NUMBER</strong> can be disabled by passing
-it any argument other than a digit (e.g. <strong>OFF, QUIT, END,
-X</strong>, etc), although, as noted above, <strong>mom</strong>
-will keep, and &mdash; in the case of collated documents &mdash;
-increment the chapter number, allowing you to turn prefixing of
+PREFIX_CHAPTER_NUMBER can be disabled by passing
+it any argument other than a digit (e.g. <b>OFF, QUIT, END,
+X</b>, etc), although, as noted above, mom
+will keep, and&mdash;in the case of collated
+documents&mdash;increment the chapter number, allowing you to turn
+prefixing of
 chapter numbers to numbered head elements off and on according to
 your needs or whims.
 </p>
 
 <p>
-<strong>NOTE:</strong> Because
-<strong>PREFIX_CHAPTER_NUMBER</strong> takes an (optional) digit
-representing the chapter number, it's use need not be restricted to
-<a href="docprocessing.html#DOCTYPE">DOCTYPE CHAPTER</a>.
-You can use it with any document type.  Furthermore, even if your
-doctype isn't &quot;CHAPTER&quot;, you can identify the document as
-a chapter <em>for the purposes of numbering head elements</em> by
-invoking the macro,
-<a href="docprocessing.html#CHAPTER"><kbd>.CHAPTER</kbd></a>,
+<span class="note">Note:</span>
+Because PREFIX_CHAPTER_NUMBER takes an (optional) digit representing
+the chapter number, it&#8217;s use need not be restricted to
+<a href="docprocessing.html#doctype">DOCTYPE <kbd>CHAPTER</kbd></a>.
+You can use it with any document type.  Furthermore, even if
+your doctype isn&#8217;t <kbd>CHAPTER</kbd>, you can identify
+the document as a chapter <i>for the purposes of numbering head
+elements</i> by invoking the macro,
+<a href="docprocessing.html#chapter"><kbd>.CHAPTER</kbd></a>,
 with a
-<a href="definitions.html#TERMS_NUMERICARGUMENT">numeric argument</a>
+<a href="definitions.html#numericargument">numeric argument</a>
 in your document setup. 
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="LINEBREAK_INTRO"><h2><u>Author linebreaks (section breaks)</u></h2></a>
+<h2 id="linebreak-intro" class="macro-group">Linebreaks (section breaks)</h2>
 
-<ul>
-    <li><a href="#LINEBREAK">Tag: LINEBREAK</a></li>
-    <li><a href="#LINEBREAK_CHAR">Linebreak character control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#linebreak">Tag: LINEBREAK</a></li>
+  <li><a href="#linebreak-control">Linebreak control macros and defaults</a></li>
 </ul>
 
 <p>
-By default, <strong>mom</strong> marks
-<a href="definitions.html#TERMS_LINEBREAK">author linebreaks</a>
-(also called &quot;section breaks&quot;) with three centred asterisks.
-You can change this behaviour with the linebreak character
-<a href="definitions.html#TERMS_CONTROLMACRO">control macro</a>.
+Linebreaks (&#8220;author linebreaks&#8221;, &#8220;section
+breaks&#8221;) are gaps in the vertical flow of running text that
+indicate a shift in content (e.g. a scene change in story).  They
+are frequently set off by typographic symbols, sometimes whimsical
+in nature.
 </p>
 
 <!-- -LINEBREAK- -->
 
-<hr width="66%" align="left"/>
-
-<a name="LINEBREAK"></a>
-
-<p>
-Macro: <strong>LINEBREAK</strong>
-<br/>
+<div class="macro-id-overline">
+<h3 id="linebreak" class="macro-id">LINEBREAK</h3>
+</div>
 
-Alias: <strong>SECTION</strong>
+<div class="box-macro-args">
+Macro: <b>LINEBREAK</b>
+</div>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>SECTION</b>
 </p>
 
 <p>
-<strong>LINEBREAK</strong> takes no arguments.  Simply invoke it
-(on a line by itself, of course) whenever you want to insert an
-author linebreak.  The appearance of the linebreak is controlled
-by the
-<a href="#LINEBREAK_CHAR">LINEBREAK_CHAR</a>
-macro.
+LINEBREAK takes no arguments.  Simply invoke it (on a line by
+itself, of course) whenever you want to insert an author linebreak.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="LINEBREAK_CHAR"><h4><u>Linebreak character control macro</u></h4></a>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="linebreak-control" class="docs defaults">LINEBREAK control macros and defaults</h3>
 
-<p>
-<nobr>Macro: <strong>LINEBREAK_CHAR</strong> <kbd>[ &lt;character&gt; ] [ &lt;iterations&gt; [ &lt;vertical adjustment&gt; ] ]</kbd></nobr>
-<br/>
+<p class="defaults">
+By default, mom marks
+<a href="definitions.html#linebreak">author linebreaks</a>
+with three centred asterisks (stars) in the prevailing colour of the
+document (by default, black).  You can alter this with the control
+macros
+</p>
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#linebreak-char">LINEBREAK_CHAR</a></li>
+  <li><a href="#linebreak-color">LINEBREAK_COLOR</a></li>
+</ol>
+</div>
 
-Alias: <strong>SECTION_CHAR</strong>
-<br/>
+<h4 id="linebreak-char" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Linebreak character</h4>
+<div class="box-macro-args">
+Macro: <b>LINEBREAK_CHAR</b> <kbd class="macro-args">[ &lt;character&gt; ] [ &lt;iterations&gt; [ &lt;vertical adjustment&gt; ] ]</kbd>
+</div>
 
-<em>*The third optional argument requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>.
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>SECTION_CHAR</b>
+</p>
+<p class="requires">
+&bull;&nbsp;The third optional argument requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 </p>
 
 <p>
-<strong>LINEBREAK_CHAR</strong> determines what <strong>mom</strong>
-prints when <strong>LINEBREAK</strong> is invoked.  It takes 3
-optional arguments: the character you want deposited at the line
-break, the number of times you want the character repeated, and a
-vertical adjustment factor.
+LINEBREAK_CHAR determines what mom prints when LINEBREAK is invoked.
+It takes 3 optional arguments: the character you want deposited at
+the line break, the number of times you want the character repeated,
+and a vertical adjustment factor.
 </p>
 
 <p>
 The first argument is any valid groff character (e.g. <kbd>*</kbd>
 [an asterisk], <kbd>\(dg</kbd> [a dagger], <kbd>\f(ZD\N'141\fP</kbd>
 [an arbitrary character from Zapf Dingbats], <kbd>\l'4P'</kbd> [a
-4-pica long rule]). <strong>Mom</strong> sets the character centred
-on the current line length.  (See &quot;man groff_char&quot; for a
-list of all valid groff characters.)
+4-pica long rule]). Mom sets the character centred on the current
+line length.  (See <kbd>man groff_char</kbd> for a list of all
+valid groff characters.)
 </p>
 
 <p>
@@ -1830,234 +1919,241 @@
 The third argument is a +|-value by which to raise (+) or lower (-)
 the character in order to make it appear visually centred between
 sections of text.  This lets you make vertical adjustments to
-characters that don't sit on the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+characters that don&#8217;t sit on the
+<a href="definitions.html#baseline">baseline</a>
 (such as asterisks).  The argument must be preceded by a plus or
 minus sign, and must include a unit of measure.
 </p>
 
 <p>
-If you enter <strong>LINEBREAK_CHAR</strong> with no arguments,
-sections of text will be separated by two blank lines when you
-invoke <kbd>.LINEBREAK</kbd>.
+If you enter LINEBREAK_CHAR with no arguments, sections of
+text will be separated by two blank lines when you invoke
+<kbd>.LINEBREAK</kbd>.
 </p>
 
 <p>
-<strong>Mom</strong>'s default for <strong>LINEBREAK_CHAR</strong> is
-
-<pre>
-    .LINEBREAK_CHAR * 3 -3p
-</pre>
-
+Mom&#8217;s default for LINEBREAK_CHAR is
+<br/>
+<span class="pre-in-pp">
+  .LINEBREAK_CHAR * 3 -3p
+</span>
 i.e. three asterisks, lowered 3 points from their normal vertical
 position (for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>;
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>;
 the vertical adjustment is -2 points for
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>).
 </p>
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>).
-
-<hr width="33%" align="left"/>
 
-<a name="LINEBREAK_COLOR"><h4><u>Linebreak colour control macro</u></h4></a>
+<h4 id="linebreak-color" class="docs" style="margin-top: -.25em; margin-bottom: .5em;">2. Linebreak colour</h4>
 
-<p>
-<nobr>Macro: <strong>LINEBREAK_COLOR</strong> <kbd>&lt;color name&gt;</kbd></nobr>
+<div class="box-macro-args">
+Macro: <b>LINEBREAK_COLOR</b> <kbd class="macro-args">&lt;color name&gt;</kbd>
+</div>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>SECTION_COLOR</b>
 </p>
 
 <p>
 To change the colour of the linebreak character(s), simply invoke
-<kbd>.LINBREAK_COLOR</kbd> with the name of a pre-defined (or
-&quot;initialized&quot;) colour.
+<kbd>.LINEBREAK_COLOR</kbd> with the name of a colour pre-defined
+(or &#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
+or
+<a href="color.html#xcolor">XCOLOR</a>.
+
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="QUOTE_INTRO"><h2><u>Quotes (line for line)</u></h2></a>
+<h2 id="quote-intro" class="macro-group">Quotes (line for line, poetry or code)</h2>
 
-<ul>
-    <li><a href="#QUOTE">Tag: QUOTE</a></li>
-    <li><a href="#QUOTE_CONTROL">Quote control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#quote">Tag: QUOTE</a></li>
+  <li><a href="#quote-control">Quote control macros and defaults</a></li>
 </ul>
 
 <p>
-<a href="definitions.html#TERMS_QUOTE">Quotes</a>
+<a href="definitions.html#quote">Quotes</a>
 are always set in
-<a href="definitions.html#TERMS_NOFILL">nofill mode</a>,
+<a href="definitions.html#filled">nofill mode</a>,
 flush left.  This permits entering quotes on a line for line basis
 in your text editor and have them come out the same way on output
 copy.  (See
-<a href="#BLOCKQUOTE_INTRO">Blockquotes</a>
-for how quotes, in the present sense, differ from longer
-passages of cited text.)
+<a href="#blockquote-intro">Blockquotes</a>
+for how quotes, in the present sense, differ from longer passages of
+cited text.)
 </p>
 
 <p>
-Since <strong>mom</strong> originally came into being to serve the
-needs of creative writers (i.e. novelists, short story writers, etc.
-&mdash; not to cast aspersions on the creativity of mathematicians
-and programmers), she sets quotes in italics
-<a href="docprocessing.html#PRINTSTYLE">(PRINTSTYLE TYPESET)</a>
+Since mom originally came into being to serve the needs of creative
+writers (i.e. novelists, short story writers, etc.&mdash;not
+to cast aspersions on the creativity of mathematicians and
+programmers), she sets quotes in italics
+<a href="docprocessing.html#printstyle">(PRINTSTYLE <kbd>TYPESET</kbd>)</a>
 or underlined
-<a href="docprocessing.html#PRINTSTYLE">(PRINTSTYLE TYPEWRITE)</a>,
-indented from the left margin.  Obviously, she's thinking
-&quot;quotes from poetry or song lyrics&quot;, but with the
-<a href="#QUOTE_CONTROL">quote control macros</a>
-you can change her defaults so <strong>QUOTE</strong> serves other
-needs, e.g. entering verbatim snippets of programming code, command
-line instructions, and so on.  (See the
-<a href="#CODE">CODE</a>
+<a href="docprocessing.html#printstyle">(PRINTSTYLE <kbd>TYPEWRITE</kbd>)</a>,
+indented from the left margin.  Obviously, she&#8217;s thinking
+&#8220;quotes from poetry or song lyrics&#8221;, but with the
+<a href="#quote-control">QUOTE control macros</a>
+you can change her defaults so QUOTE serves other needs, e.g.
+entering verbatim snippets of programming code, command line
+instructions, and so on.  (See the
+<a href="#code">CODE</a>
 for a convenience macro to assist in including programming code
 snippets in documents.)
 </p>
 
-<a name="QUOTE_SPACING"></a>
+<h3 id="quote-spacing" class="docs">QUOTE spacing</h3>
 
 <p>
-Besides indenting quotes, <strong>mom</strong> further sets them
-off from
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+Besides indenting quotes, mom further sets them off from
+<a href="definitions.html#running">running text</a>
 with a small amount of vertical whitespace top and bottom.  In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
 this is always one full linespace.  In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
-it's 1/2 of the prevailing
-<a href="definitions.html#TERMS_LEADING">leading</a>
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>,
+it&#8217;s 1/2 of the prevailing
+<a href="definitions.html#leading">leading</a>
 if the quote fits fully on the page (i.e. with running text above
-and below it), otherwise it's a full linespace either above or below
-as is necessary to balance the page to the bottom margin.  This
-behaviour can be changed with the control macro
-<a href="#ALWAYS_FULLSPACE_QUOTES">ALWAYS_FULLSPACE_QUOTES</a>.
+and below it), otherwise it&#8217;s a full linespace either above
+or below as is necessary to balance the page to the bottom margin.
+This behaviour can be changed with the control macro
+<a href="#always-fullspace-quotes">ALWAYS_FULLSPACE_QUOTES</a>.
 </p>
 
-<p>
-<strong>NOTE:</strong> <strong>ALWAYS_FULLSPACE_QUOTES</strong>
-applies to both
-<a href="#QUOTE">QUOTE</a>
-and
-<a href="#BLOCKQUOTE">BLOCKQUOTE</a>,
-as does the control macro
-<a href="#QUOTE_INDENT">QUOTE_INDENT</a>.
+<div class="box-tip">
+<h2 id="quote-spacing-notes" class="docs" style="padding-top: 9px; font-size: 100%;">Further notes on quote spacing</h2>
+<p class="cefaults">
+As of version 1.3 of mom, handling of the vertical whitespace around
+quotes changed slightly from its original implementation.
 </p>
 
 <p>
-<strong>Version 1.3: mom</strong>'s handling of the
-vertical whitespace around quotes has changed slightly.  In
-versions prior to 1.3, it was not possible to alter the
-<a href="definitions.html#TERMS_LEADING">leading</a>
+In versions of mom prior to 1.3, it was not possible to alter the
+<a href="definitions.html#leading">leading</a>
 of quotes and blockquotes (which was the same as the document
 leading), ensuring that the vertical whitespace remained consistent,
 as described above.
 </p>
 
 <p>
-In 1.3 and later, it is possible to change the leading of quotes
-and blockquote via the <strong>QUOTE_AUTOLEAD</strong> and
-<strong>BLOCKQUOTE_AUTOLEAD</strong> macros.  Now, if your quote
-(or blockquote) leading differs from the document leading,
-<strong>mom</strong> attempts to observe the same rules for vertical
+As of version 1.3, it became possible to change the
+leading of quotes and blockquotes with <kbd>.QUOTE_AUTOLEAD</kbd> and
+<kbd>BLOCKQUOTE_AUTOLEAD</kbd>, with the following changes in
+mom&#8217;s behaviour:
+</p>
+
+<p>
+If your quote (or blockquote) leading differs from the document
+leading, mom attempts to observe the same rules for vertical
 whitespace outlined above; however, she will also insert a small,
 flexible amount of extra whitespace around the quotes to make sure
-the whitespace is equal, top and bottom.  Since she does this on a
-quote by quote basis, rather than by figuring out how much extra
-whitespace is needed to adjust <em>all</em> quotes on a page,
+the whitespace is equal, top and bottom.  Since she does this
+on a quote by quote basis, rather than by figuring out how much
+extra whitespace is needed to adjust <i>all</i> quotes on a page,
 the spacing around multiple quotes on the same page will differ
 slightly, although each will be balanced between lines of normal
-<a href="definitions.html#TERMS_RUNNING">running text</a>,
+<a href="definitions.html#running">running text</a>,
 top and bottom.  (The inability to scan an entire page and insert
 equalized whitespace at marked places is a limitation of groff,
-which, by and large, works in a line-per-line fashion.)
+which, by and large, processes text on a line-per-line basis.)
 </p>
 
-<a name="NO_SHIM"></a>
-
 <p>
-If you don't want the behaviour described above (i.e. you don't want
-<strong>mom</strong> shimming [possibly irregularly linespaced]
-quotes or blockquotes), issue the macro <kbd>.NO_SHIM</kbd> prior
-to invoking <kbd>.QUOTE</kbd> or <kbd>.BLOCKQUOTE</kbd>.
-If you've disabled shimming of quotes and blockquotes with
-<kbd>.NO_SHIM</kbd> and you want <strong>mom</strong> to return to
-her default behaviour in this matter, invoke
-<nobr><kbd>.NO_SHIM OFF</kbd></nobr> (or <strong>QUIT, END, X</strong>, etc).
+If you don&#8217;t want the behaviour described above (i.e. you
+don&#8217;t want mom shimming [possibly irregularly linespaced]
+quotes or blockquotes), issue the macro
+<br/>
+<span class="pre-in-pp">
+  .NO_SHIM
+</span>
+prior to invoking <kbd>.QUOTE</kbd> or <kbd>.BLOCKQUOTE</kbd>.
 </p>
 
 <p>
-If you don't provide <strong>mom</strong> with a
-<strong>QUOTE_AUTOLEAD</strong>, quotes are leaded at the default
-for normal running text, meaning that multiple quotes on the same
-page are all spaced identically.
+If you&#8217;ve disabled shimming of quotes and blockquotes with
+<kbd>.NO_SHIM</kbd> and you want mom to return to her default
+behaviour in this matter, invoke <kbd>.NO_SHIM&nbsp;OFF</kbd> (or
+<kbd>QUIT, END, X</kbd>, etc).
 </p>
 
-<!-- -QUOTE- -->
+<p class="tip-bottom">
+If you don&#8217;t provide mom with a QUOTE_AUTOLEAD, quotes are
+leaded at the default for normal running text, meaning that multiple
+quotes on the same page are all spaced identically.
+</p>
+</div>
 
-<hr width="66%" align="left"/>
+<!-- -QUOTE- -->
 
-<a name="QUOTE"></a>
+<div class="macro-id-overline">
+<h3 id="quote" class="macro-id">QUOTE</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>QUOTE</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>QUOTE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<strong>QUOTE</strong> is a toggle macro.  To begin a section
+QUOTE is a toggle macro.  To begin a section
 of quoted text, invoke it with no argument, then type in your
-quote.  When you're finished, invoke <kbd>.QUOTE</kbd> with any
-argument (e.g. OFF, END, X, Q...) to turn it off.  Example:
-
-<pre>
-    .QUOTE
-    Nymphomaniacal Jill
-    Used a dynamite stick for a thrill
-    They found her vagina
-    In North Carolina
-    And bits of her tits in Brazil.
-    .QUOTE END
-</pre>
-</p>
-
-<hr width="33%" align="left"/>
-
-<a name="QUOTE_CONTROL"><h3><u>Quote control macros</u></h3></a>
-
-<ol>
-    <li><a href="#QUOTE_GENERAL">Family/font/size/leading/colour/indent</a></li>
-    <li><a href="#ALWAYS_FULLSPACE_QUOTES">Spacing above and below (typeset only)</a></li>
-    <li><a href="#UNDERLINE_QUOTES">Underline quotes (typewrite only)</a></li>
-    <li><a href="#BREAK_QUOTE">Manually break a footnoted quote that crosses pages/columns</a></li>
+quote.  When you&#8217;re finished, invoke <kbd>.QUOTE</kbd> with any
+argument (e.g. <kbd>OFF, END, X, Q</kbd>...) to turn it off.  Example:
+<br/>
+<span class="pre-in-pp">
+  .QUOTE
+  Nymphomaniacal Jill
+  Used a dynamite stick for a thrill
+  They found her vagina
+  In North Carolina
+  And bits of her tits in Brazil.
+  .QUOTE END
+</span>
+</p>
+
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="quote-control" class="docs defaults">QUOTE control macros and defaults</h3>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#quote-general">Family/font/size/leading/colour/indent</a></li>
+  <li><a href="#always-fullspace-quotes">Spacing above and below quotes (typeset only)</a></li>
+  <li><a href="#underline-quotes">Underlining quotes (typewrite only)</a></li>
+  <li><a href="#break-quote">Manually break a footnoted quote that crosses pages/columns (deprecated)</a></li>
 </ol>
+</div>
 
-<a name="QUOTE_GENERAL"><h4><u>1. Family/font/size/colour/indent</u></h4></a>
+<h4 id="quote-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/colour/indent</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .QUOTE_FAMILY   default = prevailing document family; default is Times Roman
 .QUOTE_FONT     default = italic; underlined in TYPEWRITE
 .QUOTE_SIZE     default = +0 (i.e. same size as paragraph text)
 .QUOTE_AUTOLEAD default = none; leading of quotes is the same as paragraphs
 .QUOTE_COLOR    default = black
-.QUOTE_INDENT   (see below)
-</pre>
+.QUOTE_INDENT  (see below, "Quote indent")
+</span>
+</div>
 
-<a name="QUOTE_INDENT"><h5><u>Quote indent</u></h5></a>
+<h4 id="quote-indent" class="docs" style="margin-top: -1.5em;">Quote indent</h4>
 
 <p>
-Prior to version 1.4-b, <strong>mom</strong> allowed only the
-passing of an integer to the macro, <kbd>.QUOTE_INDENT</kbd>.  The
-integer represented the amount by which to multiply the argument
-passed to
-<a href="#PARA_INDENT">PARA_INDENT</a>
+Prior to version 1.4-b, mom allowed only the passing of an integer
+to the macro, <kbd>.QUOTE_INDENT</kbd>.  The integer represented the
+amount by which to multiply the argument passed to
+<kbd><a href="#para-indent">PARA_INDENT</a></kbd>
 to arrive at an indent for quotes (and blockquotes).
 </p>
 
 <p>
 As of version 1.4-b, you can now append a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 to the argument passed to <kbd>.QUOTE_INDENT</kbd>, thus
 setting an absolute indent, relative to nothing.  The old
 behaviour is still respected, though; in other words, if you
@@ -2067,228 +2163,239 @@
 blockquotes).
 </p>
 
-<p>
-Please note that if your <strong>PARA_INDENT</strong> is 0
-(i.e. no indenting of the first line of paragraphs), you
-<em><strong>must</strong></em> set a <strong>QUOTE_INDENT</strong>
-yourself, with a unit of measure appended to the
-argument. <strong>Mom</strong> has no default for
-<strong>QUOTE_INDENT</strong> if paragraph first lines are not being
-indented.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your PARA_INDENT is 0 (i.e. no indenting of the first line of
+paragraphs), you <i>must</i> set a QUOTE_INDENT yourself, with a
+unit of measure appended to the argument. Mom has no default for
+QUOTE_INDENT if paragraph first lines are not being indented.
 </p>
+</div>
 
 <p>
-The default value for <strong>QUOTE_INDENT</strong> is 3 (for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>)
-and 2 (for PRINTSTYLE
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>).
+The default value for QUOTE_INDENT is 3 (for
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>)
+and 1 (for
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>).
 </p>
 
-<p>
-<strong>NOTE: QUOTE_INDENT</strong> also sets the indent for
-<a href="#BLOCKQUOTE">BLOCKQUOTES</a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+QUOTE_INDENT also sets the indent for
+<a href="#blockquote">blockquotes</a>.
 </p>
+</div>
 
-<a name="ALWAYS_FULLSPACE_QUOTES"><h4><u>2. Spacing above and below &mdash; ALWAYS_FULLSPACE_QUOTES (typeset only)</u></h4></a>
+<h4 id="always-fullspace-quotes" class="docs" style="margin-top: -.25em;">2. Spacing above and below quotes (typeset only)</h4>
 
 <p>
-If you'd like <strong>mom</strong> always to put a full linespace
-above and below quotes, invoke <kbd>.ALWAYS_FULLSPACE_QUOTES</kbd>
-with no argument.  If you wish to restore <strong>mom</strong>'s
+If you&#8217;d like mom always to put a full linespace above and
+below quotes, invoke
+<br/>
+<span class="pre-in-pp">
+  .ALWAYS_FULLSPACE_QUOTES
+</span>
+with no argument.  If you wish to restore mom&#8217;s
 default behaviour regarding the spacing of quotes (see
-<a href="#QUOTE_SPACING">above</a>),
-invoke the macro with any argument (<strong>OFF, QUIT, END,
-X</strong>...)
+<a href="#quote-spacing">above</a>),
+invoke the macro with any argument (<kbd>OFF, QUIT, END, X</kbd>...)
 </p>
 
-<p>
-<strong>NOTE:</strong> This macro also sets <strong>mom</strong>'s
-spacing policy for
-<a href="#BLOCKQUOTE_INTRO">blockquotes</a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+This macro also sets mom&#8217;s spacing policy for
+<a href="#blockquote-intro">blockquotes</a>.
 </p>
+</div>
 
-<a name="UNDERLINE_QUOTES"><h4><u>3. Underlining &mdash; UNDERLINE_QUOTES (typewrite only)</u></h4></a>
+<h4 id="underline-quotes" class="docs" style="margin-top: -.25em;">3. Underlining quotes (typewrite only)</h4>
 
 <p>
 By default in
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<strong>mom</strong> underlines quotes.  If you'd rather she didn't,
-invoke <kbd>.UNDERLINE_QUOTES</kbd> with any argument (<strong>OFF,
-QUIT, END, X</strong>...) to disable the feature.  Invoke it without
-an argument to restore <strong>mom</strong>'s default underlining of
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+mom underlines quotes.  If you&#8217;d rather she didn&#8217;t,
+invoke <kbd>.UNDERLINE_QUOTES</kbd> with any argument (<b>OFF,
+QUIT, END, X</b>...) to disable the feature.  Invoke it without
+an argument to restore mom&#8217;s default underlining of
 quotes.
 </p>
 
 <p>
-If you not only wish that <strong>mom</strong> not underline
+If you not only wish that mom not underline
 quotes, but also that she set them in italic, you must follow each
-instance of <strong>QUOTE</strong> with the typesetting macro
-<a href="typesetting.html#FONT">FT I</a>.
-Furthermore, since <strong>mom</strong> underlines all instances of
-italics by default in <strong>PRINTSTYLE TYPEWRITE</strong>, you
-must also make sure that <strong>ITALIC_MEANS_ITALIC</strong> is
+instance of QUOTE with the typesetting macro
+<a href="typesetting.html#font">FT I</a>.
+Furthermore, since mom underlines all instances of
+italics by default in <b>PRINTSTYLE TYPEWRITE</b>, you
+must also make sure that ITALIC_MEANS_ITALIC is
 enabled (see
-<a href="docprocessing.html#TYPEWRITE_CONTROL">PRINTSTYLE TYPEWRITE control macros</a>).
+<a href="docprocessing.html#typewrite-control">PRINTSTYLE TYPEWRITE control macros</a>).
 </p>
 
-<a name="BREAK_QUOTE"><h4><u>4. Manually break a footnoted quote &mdash; BREAK_QUOTE</u></h4></a>
-
-<p>
-<strong>NOTE:</strong> <em>As of version 1.1.9, the macro</em>
-<strong>BREAK_QUOTE</strong> <em>has become obsolete (or, at
-least, should have become obsolete.)  It remains here for backward
-compatibility with documents created prior to 1.1.9, and just in
-case despite my efforts to make it obsolete you still encounter
-the problem it's supposed to fix.  Should you find yourself having
-to use</em> <strong>BREAK_QUOTE</strong> <em>while running</em>
-<strong>mom</strong> 1.1.9 <em>or higher, please notify me
-immediately.</em>
-</p>
+<h4 id="break-quote" class="docs">4. Manually break a footnoted quote that crosses pages/columns (deprecated)</h4>
 
-<p>
-Exceptionally, a quote or blockquote containing a footnote may cross
-a page or column.  When this happens, the footnote marker may not be
-correct for its position relative to other footnotes on the page, and
-the footnote itself may appear on the wrong page or at the bottom of
-the wrong column.  When this happens, study your output to determine
-the precise point at which the quote breaks (or at which you want
-it to break), and add <kbd>.BREAK_QUOTE</kbd> on a line by itself
-afterwards.  No other intervention is required, and the footnote(s)
-will be marked correctly and appear on the correct page.
+<div class="box-tip">
+<p class="tip">
+<i>As of version 1.1.9, the macro</i> BREAK_QUOTE <i>became obsolete
+(or, at least, should have become obsolete.)  It remains here for
+backward compatibility with documents created prior to 1.1.9, and
+just in case despite my efforts to make it obsolete you still
+encounter the problem it&#8217;s supposed to fix.  Should you find
+yourself having to use</i> BREAK_QUOTE <i>while running</i> mom
+1.1.9 <i>or higher, please notify me immediately.</i>
+</p>
+</div>
+
+<p style="margin-top: -.5em;">
+Exceptionally, a quote or blockquote containing a footnote may
+cross a page or column.  When this happens, the footnote marker may
+not be correct for its position relative to other footnotes on the
+page, and the footnote itself may appear on the wrong page or at the
+bottom of the wrong column.  When this happens, study your output to
+determine the precise point at which the quote breaks (or at which
+you want it to break), and add
+<span class="pre-in-pp">
+  .BREAK_QUOTE
+</span>
+on a line by itself afterwards.  No other intervention is required,
+and the footnote(s) will be marked correctly and appear on the
+correct page.
 </p>
 
 <p>
-<strong>BREAK_QUOTE</strong> may be used with both quotes and
-blockquotes, and hence is aliased as <strong>BREAK_BLOCKQUOTE,
-BREAK_CITATION</strong> and <strong>BREAK_CITE</strong>.
+<kbd>.BREAK_QUOTE</kbd> may be used with both quotes and
+blockquotes, and hence is aliased as <kbd>.BREAK_BLOCKQUOTE</kbd>,
+<kbd>BREAK_CITATION</kbd> and <kbd>BREAK_CITE</kbd>.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="BLOCKQUOTE_INTRO"><h2><u>Blockquotes (cited passages)</u></h2></a>
+<h2 id="blockquote-intro" class="macro-group">Blockquotes (cited material)</h2>
 
-<ul>
-    <li><a href="#BLOCKQUOTE">Tag: BLOCKQUOTE (aliases: CITE, CITATION)</a></li>
-    <li><a href="#BLOCKQUOTE_CONTROL">BLOCKQUOTE control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#blockquote">Tag: BLOCKQUOTE</a></li>
+  <li><a href="#blockquote-control">BLOCKQUOTE control macros</a></li>
 </ul>
 
 <p>
-<strong>BLOCKQUOTES</strong> are used to cite passages from another
-author's work.  So that they stand out well from
-<a href="definitions.html#TERMS_RUNNING">running text</a>,
-<strong>mom</strong> indents them from both the left and right margins
-and sets them in a different point size
-(<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
+<a href="definitions.html#blockquote">Blockquotes</a>
+are used to cite passages from another author&#8217;s work.  So that
+they stand out well from
+<a href="definitions.html#running">running text</a>,
+mom indents them from both the left and right margins and sets them
+in a different point size
+(<a href="docprocessing.html#printstyle">PRINTSTYLE TYPESET</a>
 only).
-<a href="definitions.html#TERMS_OUTPUTLINE">Output lines</a>
+<a href="definitions.html#outputline">Output lines</a>
 are
-<a href="definitions.html#TERMS_FILLED">filled</a>,
+<a href="definitions.html#filled">filled</a>,
 and, by default,
-<a href="definitions.html#TERMS_QUAD">quadded</a>
+<a href="definitions.html#quad">quadded</a>
 left.
 </p>
 
 <p>
-Besides indenting blockquotes, <strong>mom</strong> further
-sets them off from running text with a small amount of vertical
-whitespace top and bottom.  (See
-<a href="#QUOTE_SPACING">above</a>
+Besides indenting blockquotes, mom further sets them off from
+running text with a small amount of vertical whitespace top and
+bottom.  (See
+<a href="#quote-spacing">above</a>
 for a complete explanation of how this is managed, and how
-to control it.  Be sure to read the section <strong>Version
-1.3</strong>.)
+to control it.)
 </p>
 
 <!-- -BLOCKQUOTE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="BLOCKQUOTE"></a>
-
-<p>
-<nobr>Macro: <strong>BLOCKQUOTE</strong> <kbd>toggle</kbd></nobr>
-<br/>
-
-Aliases: <strong>CITE, CITATION</strong>
-</p>
-
-<p>
-<strong>BLOCKQUOTE</strong> is a toggle macro.  To begin a cited
-passage, invoke the tag with no argument, then type in your quote.
-When you're finished, invoke <kbd>.BLOCKQUOTE</kbd> with any
-argument (e.g. OFF, END, X, Q...) to turn it off.  Example:
+<div class="macro-id-overline">
+<h3 id="blockquote" class="macro-id">BLOCKQUOTE</h3>
+</div>
 
-<pre>
-    .BLOCKQUOTE
-    Redefining the role of the United States from enablers to keep
-    the peace to enablers to keep the peace from peacekeepers is
-    going to be an assignment.
-    .RIGHT
-    \(emGeorge W. Bush
-    .BLOCKQUOTE END
-</pre>
-</p>
+<div class="box-macro-args">
+Macro: <b>BLOCKQUOTE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
-<p>
-If the cited passage runs to more than one paragraph, you MUST
-introduce each paragraph &mdash; <em>including the first!</em> &mdash;
-with
-<a href="#PP">PP</a>.
+<p class="alias" style="margin-bottom: 0;">
+<i>Aliases: </i> <b>CITE, CITATION</b>
 </p>
 
 <p>
-<strong>NOTE:</strong> The aliases <strong>CITE</strong>
-and <strong>CITATION</strong> may be used in place of the
-<strong>BLOCKQUOTE</strong> tag, as well as in any of the control
-macros that begin with <strong>BLOCKQUOTE_</strong> or end with
-<strong>_BLOCKQUOTE</strong>.
-</p>
-
-<hr width="33%" align="left"/>
-
-<a name="BLOCKQUOTE_CONTROL"><h3><u>Blockquote control macros</u></h3></a>
-
-<ol>
-    <li><a href="#BLOCKQUOTE_GENERAL">Family/font/size/leading/colour/quad/indent</a></li>
-    <li><a href="#BQ_ALWAYS_FULLSPACE_QUOTES">Spacing above and below (typeset only)</a></li>
-    <li><a href="#BREAK_QUOTE">Manually break a footnoted blockquote that crosses pages/columns</a></li>
+BLOCKQUOTE is a toggle macro.  To begin a cited passage, invoke
+the tag with no argument, then type in your blockquote.  When
+you&#8217;re finished, invoke <kbd>.BLOCKQUOTE</kbd> with any
+argument (e.g. <kbd>OFF, END, X, Q</kbd>...) to turn it off.
+Example:
+<br/>
+<span class="pre-in-pp">
+  .BLOCKQUOTE
+  Redefining the role of the United States from enablers to keep
+  the peace to enablers to keep the peace from peacekeepers is
+  going to be an assignment.
+  .RIGHT
+  \[em]George W. Bush
+  .BLOCKQUOTE END
+</span>
+If the cited passage runs to more than one paragraph, you must
+introduce each paragraph&mdash;including the first&mdash;with
+<kbd><a href="#pp">.PP</a></kbd>.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The aliases CITE and CITATION may be used in place of the BLOCKQUOTE
+tag, as well as in any of the control macros that begin or end with
+<kbd>BLOCKQUOTE_</kbd>.
+</p>
+</div>
+
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="blockquote-control" class="docs defaults">BLOCKQUOTE control macros and defaults</h3>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#blockquote-general">Family/font/size/leading/colour/quad/indent</a></li>
+  <li><a href="#bq-always-fullspace-quotes">Spacing above and below (typeset only)</a></li>
+  <li><a href="#break-quote">Manually break a footnoted blockquote that crosses pages/columns</a></li>
 </ol>
+</div>
 
-<a name="BLOCKQUOTE_GENERAL"><h4><u>1. Family/font/size/colour/quad/indent</u></h4></a>
+<h4 id="blockquote-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/colour/quad/indent</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .BLOCKQUOTE_FAMILY   default = prevailing document family; default is Times Roman
 .BLOCKQUOTE_FONT     default = roman
 .BLOCKQUOTE_SIZE     default = -1 (point)
 .BLOCKQUOTE_AUTOLEAD default = none; leading of blockquotes is the same as paragraphs
 .BLOCKQUOTE_COLOR    default = black
 .BLOCKQUOTE_QUAD     default = left
-.BLOCKQUOTE_INDENT   (see below)
-</pre>
+.BLOCKQUOTE_INDENT  (see below)
+</span>
+</div>
 
-<a name="BLOCKQUOTE_INDENT"><h5><u>Blockquote indent</u></h5></a>
+<h4 id="blockquote-indent" class="docs" style="margin-top: -1.5em;">Blockquote indent</h4>
 
 <p>
-Prior to version 1.4-b, <strong>mom</strong> allowed only the
-passing of an integer to the macro, <kbd>.BLOCKQUOTE_INDENT</kbd>.
-The integer represented the amount by which to multiply the argument
-passed to
-<a href="#PARA_INDENT">PARA_INDENT</a>
+Prior to version 1.4-b, mom allowed only the passing of an integer
+to the macro, BLOCKQUOTE_INDENT.  The integer represented the amount
+by which to multiply the argument passed to
+<kbd><a href="#para-indent">PARA_INDENT</a></kbd>
 to arrive at an indent for blockquotes (and quotes).
 </p>
 
 <p>
-As of version 1.4-b, you can now append a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+As of version 1.4-b, you can append a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 to the argument passed to <kbd>.BLOCKQUOTE_INDENT</kbd>, thus
 setting an absolute indent, relative to nothing.  The old
-behaviour is still respected, though; in other words, if you pass
+behaviour is still respected, though.  In other words, if you pass
 <kbd>.BLOCKQUOTE_INDENT</kbd> an integer with no unit of measure
 appended, the integer represents the amount by which to multiply
 <kbd>.PARA_INDENT</kbd> to arrive at an indent for blockquotes (and
@@ -2297,269 +2404,335 @@
 
 <p>
 The default value for <kbd>.BLOCKQUOTE_INDENT</kbd> is 3 (for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>)
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>)
 and 2 (for PRINTSTYLE
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>).
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>).
 </p>
 
-<p>
-Please note that if your <strong>PARA_INDENT</strong>
-is 0 (i.e. no indenting of the first line of
-paragraphs), you <em><strong>must</strong></em> set a
-<strong>BLOCKQUOTE_INDENT</strong> yourself, with a unit of measure
-appended to the argument. <strong>Mom</strong> has no default for
-<strong>BLOCKQUOTE_INDENT</strong> if paragraph first lines are not
-being indented.
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+If your PARA_INDENT is 0 (i.e. no indenting of the first line of
+paragraphs), you must set a BLOCKQUOTE_INDENT yourself, with a
+unit of measure appended to the argument. Mom has no default for
+BLOCKQUOTE_INDENT if paragraph first lines are not being indented.
 </p>
 
-<p>
-<strong>NOTE: BLOCKQUOTE_INDENT</strong> also sets the indent for
-<a href="#QUOTE">QUOTES</a>.
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+BLOCKQUOTE_INDENT also sets the indent for
+<a href="#quote">QUOTES</a>.
 </p>
+</div>
 
-<a name="BQ_ALWAYS_FULLSPACE_QUOTES"><h4><u>2. Spacing above and below &mdash; ALWAYS_FULLSPACE_QUOTES (typeset only)</u></h4></a>
+<h4 id="bq-always-fullspace-quotes" class="docs">2. Spacing above and below blockquotes (typeset only)</h4>
 
 <p>
-If you'd like <strong>mom</strong> always to put a
-full linespace above and below blockquotes, invoke
-<kbd>.ALWAYS_FULLSPACE_QUOTES</kbd> with no argument.  If you wish
-to restore <strong>mom</strong>'s default behaviour regarding the
-spacing of blockquotes (see
-<a href="#QUOTE_SPACING">above</a>),
-invoke the macro with any argument (<strong>OFF, QUIT, END,
-X</strong>...).
-</p>
-
-<p>
-<strong>NOTE:</strong> This macro also sets <strong>mom</strong>'s
-spacing policy for
-<a href="#QUOTE_INTRO">quotes</a>.
+If you&#8217;d like mom always to put a full linespace above and
+below blockquotes, invoke
+<br/>
+<span class="pre-in-pp">
+  .ALWAYS_FULLSPACE_QUOTES
+</span>
+with no argument.  If you wish to restore mom&#8217;s default
+behaviour regarding the spacing of blockquotes (see
+<a href="#quote-spacing">above</a>),
+invoke the macro with any argument (<b>OFF, QUIT, END,
+X</b>...).
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+This macro also sets mom&#8217;s spacing policy for
+<a href="#quote-intro">quotes</a>.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="CODE"><h2><u>Inserting code snippets into documents</u></h2></a>
+<h2 id="code-intro" class="macro-group">Inserting code snippets</h2>
 
-<p>
-<nobr>Macro: <strong>CODE</strong> <kbd>[BR | BREAK | SPREAD] toggle</kbd></nobr>
-<br/>
-
-Inline escape: <strong><kbd>\*[CODE]</kbd></strong>
-</p>
+<ul style="margin-left: -.5em;">
+  <li><a href="#code">Tag: CODE</a></li>
+  <li><a href="#code-control">CODE control macros and defaults</a></li>
+</ul>
 
 <p>
-<strong>CODE</strong> is a convenience macro that facilitates
-entering code snippets into documents.  Its use is not restricted to
-documents created using <strong>mom</strong>'s document processing
-macros; it can be used for &quot;manually&quot; typeset documents as
-well.
+CODE is a convenience macro that facilitates entering code snippets
+into documents.  Its use is not restricted to documents created
+using mom&#8217;s document processing macros; it can be used for
+&#8220;manually&#8221; typeset documents as well.
+</p>
+
+<div class="macro-id-overline">
+<h3 id="code" class="macro-id">CODE</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>CODE</b> <kbd class="macro-args">[BR | BREAK | SPREAD] toggle</kbd>
+</div>
+
+<p class="requires" style="font-style: normal">
+Inline escape: <b><kbd>\*[CODE]</kbd></b>
 </p>
 
 <p>
 When you invoke <kbd>.CODE</kbd> without an argument, or use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
+<a href="definitions.html#inlines">inline escape</a>,
 <kbd>\*[CODE]</kbd>,
-<strong>mom</strong> changes the font to Courier Roman (a
-<a href="definitions.html#TERMS_FIXEDWIDTHFONT">fixed-width font</a>)
-and turns
-<a href="goodies.html#SMARTQUOTES">SMARTQUOTES</a>
+mom changes the font to a
+<a href="definitions.html#fixedwidthfont">fixed-width font</a>
+(Courier, by default) and turns
+<a href="goodies.html#smartquotes">SMARTQUOTES</a>
 off.  Additionally, if you invoke <kbd>.CODE</kbd> inside
-<a href="docelement.html#QUOTE">QUOTE</a>
-while using
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>
-with the default underlining of quotes turned on, it disables
-the underlining for the duration of <strong>CODE</strong>.
+<a href="#quote">QUOTE</a>
+while in
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>
+with the default underlining of quotes turned on, it disables the
+underlining for the duration of CODE.
 </p>
 
 <p>
-Passing any argument other than <kbd>BR</kbd>, <kbd>BREAK</kbd> or
-<kbd>SPREAD</kbd> to <kbd>.CODE</kbd> (e.g. <strong>OFF, QUIT, END,
-X,</strong> etc.) turns <strong>CODE</strong> off and returns the
-family, font, smartquotes and (if applicable) underlining of quotes
-to their former state.  If you've used the inline escape to
+Passing any argument other than <kbd>BR</kbd>, <kbd>BREAK</kbd>
+or <kbd>SPREAD</kbd> to CODE (e.g. <kbd>OFF, QUIT, END, X,</kbd>
+etc.) turns CODE off and returns the family, font, smartquotes
+and (if applicable) underlining of quotes to their former state.
+If you&#8217;ve used the inline escape, <kbd>\*[CODE]</kbd>, to
 initiate a section of code, <kbd>\*[CODE OFF]</kbd> equally returns
 things to their former state.
 </p>
 
-<p>
-Please note that <kbd>.CODE</kbd> does <em>not</em> cause a line
-break when you're in a
-<a href="definitions.html#TERMS_FILLED">fill mode</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your code snippet includes the backslash character, which is
+groff&#8217;s escape character, you will have to change the
+escape character temporarily to something else with the macro,
+<a href="goodies.html#esc-char">ESC_CHAR</a>.
+Mom has no way of knowing what special characters you&#8217;re going
+to use in code snippets, therefore she cannot automatically replace
+the escape character with something else.
+</p>
+</div>
+
+<div class="box-important">
+<p class="tip-top">
+<span class="important">Important:</span>
+<kbd>.CODE</kbd> does not cause a line break when
+you&#8217;re in a
+<a href="definitions.html#filled">fill mode</a>
 (i.e.
-<a href="typesetting.html#JUSTIFY">JUSTIFY</a>
+<a href="typesetting.html#justify">JUSTIFY</a>
 or
-<nobr><a href="typesetting.html#QUAD">QUAD</a> LEFT, CENTER, or RIGHT)</nobr>.
-If you want <strong>CODE</strong> to deposit a break,
-invoke <kbd>.CODE</kbd> with the argument <kbd>BR</kbd> (or
-<kbd>BREAK</kbd>).  If, in addition to having <strong>mom</strong>
-break the line before <kbd>.CODE</kbd>, you want her to
-<a href="definitions.html#TERMS_FORCE">force justify</a>
-the line as well, invoke <kbd>.CODE</kbd> with the argument,
-<kbd>SPREAD</kbd>.
-</p>
-
-<p>
-Please also note that <kbd>BR</kbd>, <kbd>BREAK</kbd> and
-<kbd>SPREAD</kbd> must NOT be used with the inline escape,
-<kbd>\*[CODE]</kbd>; the assumption behind <kbd>\*[CODE]</kbd> is
-that you're inserting a bit of code into a line, not creating a
-distinct &quot;code block&quot;.
+<a href="typesetting.html#quad">QUAD</a>
+<kbd>LEFT, CENTER,</kbd> or <kbd>RIGHT</kbd>).
+If you want CODE to deposit a break, invoke <kbd>.CODE</kbd> with
+the argument <kbd>BR</kbd> (or <kbd>BREAK</kbd>).  If, in addition
+to having mom break the line before <kbd>.CODE</kbd>, you want her
+to
+<a href="definitions.html#force">force justify</a>
+it as well, invoke <kbd>.CODE</kbd> with the argument,
+<kbd>SPREAD</kbd>.  If, in addition to breaking the line before CODE
+you want a break afterwards, you must supply it manually with
+<a href="typesetting.html#br">BR</a>
+unless what follows immediately is a macro that automatically causes
+a break (e.g.
+<a href="#pp">PP</a>).
 </p>
 
-<h3><u>Changing the family mom uses for CODE</u></h3>
-
 <p>
-If you'd prefer to have <strong>CODE</strong> automatically
-load a fixed-width family other than Courier, invoke the macro,
-<kbd>.CODE_FAMILY</kbd> with the name of the fixed-width family you
-want.  For example, assuming you have a hypothetical fixed-width
-family called &quot;Mono&quot; whose <strong>groff</strong> name is
-simply &quot;M&quot;,
+In all likelihood, if you want the situation described above (i.e. a
+break before and after CODE), what you probably want is to use
+<a href="quote">QUOTE</a>
+in conjunction with CODE, like this:
+<br/>
+<span class="pre-in-pp">
+  .QUOTE
+  .CODE
+  $ echo "Hello, world" | sed -e 's/Hello,/Goodbye, cruel'
+  .CODE OFF
+  .QUOTE OFF
+</span>
+QUOTE takes care of breaking both the text and the code, as well as
+indenting the code and offsetting it from
+<a href="definitions.html#running">running text</a>
+with vertical whitespace.
+</p>
+
+<p class="tip-bottom">
+<span class="note">Note:</span>
+<kbd>BR</kbd>, <kbd>BREAK</kbd> and <kbd>SPREAD</kbd> have no
+effect when used with the inline escape, <kbd>\*[CODE]</kbd>.  The
+assumption behind <kbd>\*[CODE]</kbd> is that you&#8217;re inserting
+a bit of code into a line, not creating a distinct code block.
+</p>
+</div>
+
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="code-control" class="docs defaults">CODE control macros and defaults</h3>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#code-general">Family/Font/Color</a></li>
+  <li><a href="#code-size">Size</a></li>
+</ol>
+</div>
 
-<pre>
-    .CODE_FAMILY M
-</pre>
+<h4 id="code-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/colour</h4>
 
-is how you'd tell <strong>mom</strong> to use Mono for
-<strong>CODE</strong>, rather than her default, Courier.
-(See
-<a href="appendices.html#FONTS">Adding PostScript fonts to groff</a>
-for information on how you might set up the hypothetical
-fixed-width font called &quot;Mono&quot;.)
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
+See
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<p>
-<strong>NOTE</strong>: If your code snippet includes the backslash
-character, which is <strong>groff</strong>'s escape character, you
-will have to change the escape character temporarily to something
-else with the macro,
-<a href="goodies.html#ESC_CHAR">ESC_CHAR</a>.
-<strong>Mom</strong> has no way of knowing what special characters
-you're going to use in code snippets, therefore she cannot
-automatically replace the escape character with something else.
+<span class="pre defaults">
+.CODE_FAMILY  default = Courier
+.CODE_FONT    default = roman; see Note
+.CODE_COLOR   default = black
+
+Note: Unlike other control macros, CODE_FONT sets the code font for both
+PRINTSTYLE TYPESET and PRINTSTYLE TYPEWRITE.
+</span>
+</div>
+
+<h4 id="code-size" class="docs" style="margin-top: -1.25em;">2. Size</h4>
+
+<p>
+CODE_SIZE works a little differently from the other _SIZE macros
+(see <a href="#control-macro-args">Arguments to the control
+macros</a>).  The argument you pass it is a percentage of the
+prevailing document point size.  It does not require a pre-pended
+plus (<kbd>+</kbd>) or minus (<kbd>-</kbd>) sign, nor an appended
+percent sign (<kbd>%</kbd>).  Thus, is you want the point size of your CODE font to be
+90% of the prevailing document point size, you enter:
+<br/>
+<span class="pre-in-pp">
+  .CODE_SIZE 90
+</span>
+Fixed-width fonts have notoriously whimsical
+<a href="definitions.html#xheight">x-heights</a>,
+meaning that they frequently look bigger (or, in some cases,
+smaller) than the type surrounding them, even if they're technically
+the same point size.  CODE_SIZE lets you choose a percentage of the
+prevailing point size for your fixed-width CODE font so it doesn't look
+gangly or miniscule in relation to the type around it.  All
+invocations of <kbd>.CODE</kbd> or <kbd>\*[CODE]</kbd> will use this
+size, so that if you decide to change the prevailing point size of your
+document, the CODE font will be scaled proportionally.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="LIST_INTRO"><h2><u>Nested lists</u></h2></a>
+<h2 id="list-intro" class="macro-group">Nested lists</h2>
 
-<ul>
-    <li><a href="#LIST">Tag: LIST</a></li>
-    <li><a href="#ITEM">Tag: ITEM</a></li>
-    <li><a href="#LIST_CONTROL">LIST control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#list">Tag: LIST</a></li>
+  <li><a href="#item">Tag: ITEM</a></li>
+  <li><a href="#list-control">LIST control macros and defaults</a></li>
 </ul>
 
 <p>
 Lists are points or items of interest or importance that are
 separated from
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<a href="definitions.html#running">running text</a>
 by enumerators.  Some typical enumerators are
-<a href="definitions.html#TERMS_EM">en-dashes</a>,
-<a href="definitions.html#TERMS_BULLET">bullets</a>,
+<a href="definitions.html#em">en-dashes</a>,
+<a href="definitions.html#bullet">bullets</a>,
 digits and letters.
 </p>
 
 <p>
-Setting lists with <strong>mom</strong> is easy.  First, you
-initialize a list with the <strong>LIST</strong> macro.  Then, for
-every item in the list, you invoke the macro, <kbd>.ITEM</kbd>,
-followed by the text of the item.  When a list is finished,
-you exit the list with <nobr><kbd>.LIST OFF</kbd></nobr> (or
-<strong>QUIT</strong>, <strong>END</strong>, <strong>BACK</strong>,
-etc.)
-</p>
-
-<p>
-By default <strong>mom</strong> starts each list with the enumerator
-flush with the left margin of running text that comes before it,
-like this:
-
-<pre>
-    My daily schedule needs organizing.  I can't
-    seem to get everything done I want.
-    o an hour's worth of exercise
-    o time to prepare at least one healthy
-      meal per day
-    o reading time
-    o work on mom
-    o writing
-      - changes from publisher
-      - current novel
-    o a couple of hours at the piano
-</pre>
+Setting lists with mom is easy.  First, you initialize a list with
+the LIST macro.  Then, for every item in the list, you invoke
+the macro, <kbd>.ITEM</kbd>, followed by the text of the item.
+When a list is finished, you exit the list with
+<kbd>.LIST&nbsp;OFF</kbd> (or <kbd>QUIT, END, BACK,</kbd> etc.)
 </p>
 
 <p>
-In other words, <strong>mom</strong> does not, by default, indent
-entire lists.  Indenting a list is controlled by the macro,
-<a href="#SHIFT_LIST">SHIFT_LIST</a>.
+By default mom starts each list with the enumerator flush with the
+left margin of running text that comes before it, like this:
+<br/>
+<span class="pre-in-pp">
+  My daily schedule needs organizing.  I can&#8217;t
+  seem to get everything done I want.
+  o an hour&#8217;s worth of exercise
+  o time to prepare at least one healthy
+    meal per day
+  o reading time
+  o work on mom
+  o writing
+    - changes from publisher
+    - current novel
+  o a couple of hours at the piano
+</span>
+In other words, mom does not, by default, indent entire lists.
+Indenting a list is controlled by the macro,
+<a href="#shift-list">SHIFT_LIST</a>.
 (This is a design decision; there are too many instances where a
-default indent is not desirable.)  Equally, <strong>mom</strong>
-does not add any extra space above or below lists.
+default indent is not desirable.)  Equally, mom does not add any
+extra space above or below lists.
 </p>
 
 <p>
-Lists can be nested (as in the example above).  In other words, you
-can set lists within lists, each with an enumerator (and possibly,
-indent) of your choosing.  In nested lists, each invocation of
-<nobr><strong>LIST OFF</strong></nobr> (you may prefer to use
-<nobr><strong>LIST BACK</strong>)</nobr> takes you back to the
-previous depth (or level) of list, with that list's enumerator and
-indent intact.  The final <nobr><strong>LIST OFF</strong></nobr>
-exits lists completely and returns you to the left margin of running
-text.
+Lists can be nested (as in the example above).  In other words,
+you can set lists within lists, each with an enumerator (and
+possibly, indent) of your choosing.  In nested lists, each
+invocation of <kbd>.LIST&nbsp;OFF</kbd> (you may prefer to use
+<kbd>.LIST&nbsp;BACK</kbd>) takes you back to the previous depth
+(or level) of list, with that list&#8217;s enumerator and indent
+intact.  The final <kbd>.LIST&nbsp;OFF</kbd> exits lists completely
+and returns you to the left margin of running text.
 </p>
 
 <p>
 Finally, lists can be used in documents created with either the
-document processing macros or just the typesetting macros.
+<a href="docprocessing.html#top">document processing macros</a>
+or the
+<a href="typesetting.html#top">typesetting macros</a>.
 </p>
 
 <!-- -LIST- -->
 
-<hr width="66%" align="left"/>
-
-<a name="LIST"></a>
-
-<p>
-Macro: <strong>LIST</strong>
-<br/>
-
-<em>Macro arguments:</em>
-<br/>
-
-<kbd><nobr>[ BULLET | DASH | DIGIT | ALPHA | alpha | ROMAN&lt;n&gt; | roman&lt;n&gt; | USER &lt;string&gt;]</nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="list" class="macro-id">LIST</h3>
+</div>
 
-<nobr>[ &lt;separator&gt; | &lt;user-defined enumerator&gt; ] [ &lt;prefix&gt; ] [ &lt;off&gt; ]</nobr></kbd>
-</p>
+<div class="box-macro-args">
+Macro: <b>LIST</b> <kbd class="macro-args">[ BULLET | DASH | DIGIT | ALPHA | alpha | ROMAN&lt;n&gt; | roman&lt;n&gt; | USER &lt;string&gt;] [ &lt;separator&gt; | &lt;user-defined enumerator&gt; ] [ &lt;prefix&gt; ] [ &lt;off&gt; ]</kbd>
+</div>
 
 <p>
-Invoked by itself (i.e. with no argument), <kbd>.LIST</kbd>
+Invoked by itself (i.e. with no argument), LIST
 initializes a list (with bullets as the default enumerator).
 Afterwards, each block of input text preceded by
-<a href="#ITEM">.ITEM</a>,
+<kbd><a href="#item">.ITEM</a></kbd>,
 on a line by itself, is treated as a list item.
 </p>
 
-<p>
-<strong>NOTE:</strong> Every time you invoke <kbd>.LIST</kbd>
-to start a list (as opposed to
-<a href="#LIST_EXIT">exiting one</a>),
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Every time you invoke <kbd>.LIST</kbd> to start a list (as opposed to
+<a href="#list-exit">exiting one</a>),
 you must supply an enumerator (and optionally, a separator) for the
-list, unless you want <strong>mom</strong>'s default enumerator,
-which is a bullet.  Within nested lists, <strong>mom</strong>
-stores the enumerator, separator and indent for any list you return
-<em>backwards</em> to (i.e. with <nobr><strong>LIST OFF</strong>),</nobr>
-but does not store any information for lists you move
-<em>forward</em> to.
+list, unless you want mom&#8217;s default enumerator, which is a
+bullet.  Within nested lists, mom stores the enumerator, separator
+and indent for any list you return <i>backwards</i> to (i.e. with
+<kbd>.LIST OFF</kbd>), but does not store any information for lists
+you move <i>forward</i> to.
 </p>
+</div>
 
-<h3><u>The first argument &mdash; enumerator style</u></h3>
+<p>
+There are a lot of arguments (be sure to side-scroll through them
+all, above), so I&#8217;ll discuss them one at a time here.
+</p>
+<h3 class="docs">The first argument &ndash; enumerator style</h3>
 
 <p>
 The optional arguments <kbd>BULLET</kbd>, <kbd>DASH</kbd>,
@@ -2572,58 +2745,64 @@
 
 <p>
 The arguments, <kbd>ROMAN&lt;n&gt;</kbd> and
-<kbd>roman&lt;n&gt;</kbd>, are special.  You must append to
-them a digit (arabic, e.g. "1"  or "9"  or "17") saying how many
-items a particular roman-numeralled <strong>LIST</strong> is going
-to have. <strong>Mom</strong> requires this information in order to
-align roman numerals sensibly, and will abort &mdash; with a message
-&mdash; if you don't provide it.
+<kbd>roman&lt;n&gt;</kbd>, are special.  You must append to them
+a digit (arabic, e.g. "1" or "9" or "17") saying how many items a
+particular roman-numeralled LIST is going to have. Mom requires this
+information in order to align roman numerals sensibly, and will
+abort&mdash;with a message &mdash; if you don&#8217;t provide it.
 </p>
 
 <p>
 A roman-numeralled list containing, say, five items, would be set
 up like this:
-
-<pre>
-    .LIST roman5        producing        i)   Item 1.
-    .ITEM                                ii)  Item 2.
-    Item 1.                              iii) Item 3.
-    .ITEM                                iv)  Item 4.
-    Item 2.                              v)   Item 5.
-    .ITEM
-    Item 3
-    .ITEM
-    Item 4
-    .ITEM
-    Item 5
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .LIST roman5        producing        i)   Item 1.
+  .ITEM                                ii)  Item 2.
+  Item 1.                              iii) Item 3.
+  .ITEM                                iv)  Item 4.
+  Item 2.                              v)   Item 5.
+  .ITEM
+  Item 3
+  .ITEM
+  Item 4
+  .ITEM
+  Item 5
+</span>
 </p>
 
 <p>
 The argument, <kbd>USER</kbd>, lets you make up your own enumerator,
-and must be followed by a second argument: what you'd like the
-enumerator to look like.  For example, if you want a list enumerated
-with <kbd>=&gt;</kbd>,
+and must be followed by a second argument: what you&#8217;d like the
+enumerator to look like.
+</p>
 
-<pre>
-    .LIST USER =&gt;
-    .ITEM
-    A list item
-</pre>
+<p>
+For example, if you want a list enumerated
+with <kbd>=&gt;</kbd>,
+<br/>
+<span class="pre-in-pp">
+  .LIST USER =&gt;
+  .ITEM
+  A list item
+</span>
 
 will produce
-
-<pre>
-    =&gt; A list item
-</pre>
+<br/>
+<span class="pre-in-pp">
+  =&gt; A list item
+</span>
 </p>
 
-<p>
-<strong>Please note:</strong> if the argument to <kbd>USER</kbd>
-contains spaces, you must enclose the argument in double quotes.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If the argument to <kbd>USER</kbd> contains spaces, you must enclose
+the argument in double quotes.
 </p>
+</div>
 
-<h3><u>The second argument &mdash; separator style</u></h3>
+<h3 class="docs">The second argument &ndash; separator style</h3>
 
 <p>
 If you choose <kbd>DIGIT</kbd>, <kbd>ALPHA</kbd>, <kbd>alpha</kbd>,
@@ -2632,333 +2811,316 @@
 of separator you want after the enumerator.  The separator can be
 anything you like.  The default for <kbd>DIGIT</kbd> is a period
 (dot), like this:
-
-<pre>
-    1. A list item
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  1. A list item
+</span>
 The default separator for <kbd>ALPHA</kbd>, <kbd>alpha</kbd>,
 <kbd>ROMAN&lt;n&gt;</kbd> and <kbd>roman&lt;n&gt;</kbd> is a right
 parenthesis, like this:
-
-<pre>
-    a) An alpha-ed list item
-    b) A second alpha-ed list item
-
-       or
-
-    i)  A roman-ed list item
-    ii) A second roman-ed item
-</pre>
-</p>
-
-<p>
-If you'd prefer, say, digits with right-parenthesis separators
-instead of the default period, you'd do
-
-<pre>
-    .LIST DIGIT )
-    .ITEM
-    A numbered list item
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  a) An alpha-ed list item
+  b) A second alpha-ed list item
+</span>
+If you&#8217;d prefer, say, digits with right-parenthesis separators
+instead of the default period, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .LIST DIGIT )
+  .ITEM
+  A numbered list item
+</span>
 which would produce
-
-<pre>
-    1) A numbered list item
-</pre>
+<br/>
+<span class="pre-in-pp">
+  1) A numbered list item
+</span>
 </p>
 
-<p>
-<strong>Please note:</strong> <kbd>BULLET</kbd>, <kbd>DASH</kbd> and
-<kbd>USER</kbd> do not take a separator.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>BULLET</kbd>, <kbd>DASH</kbd> and <kbd>USER</kbd> do not take a
+separator.
 </p>
+</div>
 
-<h3><u>The third argument &mdash; prefix style</u></h3>
+<h3 class="docs">The third argument &ndash; prefix style</h3>
 
 <p>
 Additionally, you may give a prefix (i.e. a character
-that comes <em>before</em> the enumerator) when your
+that comes <i>before</i> the enumerator) when your
 enumerator style for a particular list is <kbd>DIGIT</kbd>,
-<kbd>ALPHA</kbd>, <kbd>alpha</kbd>, <kbd>ROMAN&lt;n&gt;</kbd>
-or <kbd>roman&lt;n&gt;</kbd>.  In the arguments to
-<strong>LIST</strong>, the prefix comes <em>after</em> the
-separator, which may seem counter-intuitive, so please be careful.
+<kbd>ALPHA</kbd>, <kbd>alpha</kbd>, <kbd>ROMAN&lt;n&gt;</kbd> or
+<kbd>roman&lt;n&gt;</kbd>.  In the arguments to LIST, the prefix
+comes <i>after</i> the separator, which is counter-intuitive,
+so please be careful.
 </p>
 
 <p>
-A prefix can be anything you like.  Most likely, you'll want some
-kind of open-bracket, such as a left parenthesis.  If, for example,
-you want a <kbd>DIGIT</kbd> list with the numbers enclosed in
-parentheses, you'd enter
-
-<pre>
-    .LIST DIGIT ) (
-    .ITEM
-    The first item on the list.
-    .ITEM
-    The second item on the list.
-</pre>
-
+A prefix can be anything you like.  Most likely, you&#8217;ll want
+some kind of open-bracket, such as a left parenthesis.  If, for
+example, you want a <kbd>DIGIT</kbd> list with the numbers enclosed
+in parentheses, you&#8217;d enter
+<br/>
+<span class="pre-in-pp">
+  .LIST DIGIT ) (
+  .ITEM
+  The first item on the list.
+  .ITEM
+  The second item on the list.
+</span>
 which would produce 
-
-<pre>
-    (1) The first item on the list.
-    (2) The second item on the list.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  (1) The first item on the list.
+  (2) The second item on the list.
+</span>
 </p>
 
-<p>
-<strong>Please note:</strong> <kbd>BULLET</kbd>, <kbd>DASH</kbd> and
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>BULLET</kbd>, <kbd>DASH</kbd> and
 <kbd>USER</kbd> do not take a prefix.
 </p>
+</div>
 
-<a name="LIST_EXIT"></a>
-
-<h3><u>Exiting lists &mdash; .LIST OFF/BACK or .QUIT_LISTS</u></h3>
+<h3 class="docs">Exiting lists &ndash; LIST OFF/BACK or QUIT_LISTS</h3>
 
 <p>
 Any single argument to <kbd>LIST</kbd> other than
 <kbd>BULLET</kbd>, <kbd>DASH</kbd>, <kbd>DIGIT</kbd>,
 <kbd>ALPHA</kbd>, <kbd>alpha</kbd>, <kbd>ROMAN&lt;n&gt;</kbd>,
-<kbd>roman&lt;n&gt;</kbd> or <kbd>USER</kbd> (e.g. <nobr><kbd>LIST
-OFF</kbd></nobr> or <nobr><kbd>LIST BACK</kbd>)</nobr> takes you out
+<kbd>roman&lt;n&gt;</kbd> or <kbd>USER</kbd> (e.g.
+<kbd>LIST&nbsp;OFF</kbd> or <kbd>LIST&nbsp;BACK</kbd>) takes you out
 of the current list.
 </p>
 
 <p>
-If you are at the first list-level (or "list-depth"),
-<strong>mom</strong> returns you to the left margin of running text.
-Any indents that were in effect prior to setting the list are fully
-restored.
+If you are at the first list-level (or list-depth), mom returns you
+to the left margin of running text.  Any indents that were in effect
+prior to setting the list are fully restored.
 </p>
 
 <p>
-If you are in a nested list, <strong>mom</strong> moves you
-<em>back one list-level</em> (i.e. does not take you out of the
-list structure) and restores the enumerator, separator and indent
-appropriate to that level.
+If you are in a nested list, mom moves you back one list-level
+(i.e. does not take you out of the list structure) and restores the
+enumerator, separator and indent appropriate to that level.
 </p>
 
 <p>
-Each invocation of <kbd>.LIST</kbd> should be be matched by a
-corresponding <nobr><kbd>.LIST OFF</kbd></nobr> in order to fully
-exit lists.  For example,
-
-<pre>
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-    o List item in level 1
-    o List item in level 1
-      - List item in level 2
-      - List item in level 2
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-</pre>
-
+Each invocation of <kbd>.LIST</kbd> should thus be be matched by
+a corresponding <kbd>.LIST&nbsp;OFF</kbd> in order to fully exit
+lists.  For example,
+<br/>
+<span class="pre-in-pp">
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+  o List item in level 1
+  o List item in level 1
+    - List item in level 2
+    - List item in level 2
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+</span>
 is created like this:
-
-<pre>
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-    .LIST BULLET
-    .ITEM
-    List item in level 1
-    .ITEM
-    List item in level 1
-    .LIST DASH
-    .ITEM
-    List item in level 2
-    .ITEM
-    List item in level 2
-    .LIST OFF    \" Turn level 2 list off
-    .LIST OFF    \" Turn level 1 list off
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+  .LIST BULLET
+  .ITEM
+  List item in level 1
+  .ITEM
+  List item in level 1
+  .LIST DASH
+  .ITEM
+  List item in level 2
+  .ITEM
+  List item in level 2
+  .LIST OFF    \" Turn level 2 list off
+  .LIST OFF    \" Turn level 1 list off
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+</span>
 </p>
 
 <p>
 Alternatively, you may use the single-purpose macro,
 <kbd>.QUIT_LISTS</kbd>, to get yourself out of a list structure.  In
-the example above, the two <nobr><kbd>.LIST OFF</kbd></nobr> lines
-could be replaced with a single <kbd>.QUIT_LISTS</kbd>.
+the example above, the two <kbd>.LIST&nbsp;OFF</kbd> lines could be
+replaced with a single <kbd>.QUIT_LISTS</kbd>.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="ITEM"></a>
+<div class="macro-id-overline">
+<h3 id="item" class="macro-id">ITEM</h3>
+</div>
 
-<p>
-Macro: <strong>ITEM</strong>
-</p>
+<div class="box-macro-args">
+Macro: <b>ITEM</b>
+</div>
 
 <p>
-After you've initialized a list with
-<a href="#LIST">LIST</a>,
-precede each item you want in the list with <kbd>.ITEM</kbd>.
-<strong>Mom</strong> takes care of everything else with respect to
-setting the item appropriate to the list you're in.
+After you&#8217;ve initialized a list with
+<a href="#list">LIST</a>,
+precede each item you want in the list with <kbd>.ITEM</kbd>.  Mom
+takes care of everything else with respect to setting the item
+appropriate to the list you&#8217;re in.
 </p>
 
 <p>
 In document processing, it is valid to have list items that contain
 multiple paragraphs.  Simply issue a
-<a href="#PP">PP</a>
-request for each paragraph <em>following</em> the first item.
-I.e., don't do this:
-
-<pre>
-    .ITEM
-    .PP
-    Some text...
-    .PP
-    A second paragraph of text
-</pre>
-
+<kbd><a href="#pp">.PP</a></kbd>
+request for each paragraph <i>following</i> the first item.
+I.e., don&#8217;t do this:
+<br/>
+<span class="pre-in-pp">
+  .ITEM
+  .PP
+  Some text...
+  .PP
+  A second paragraph of text
+</span>
 but rather
+<br/>
+<span class="pre-in-pp">
+  .ITEM
+  Some text...
+  .PP
+  A second paragraph of text
+</span>
+</p>
 
-<pre>
-    .ITEM
-    Some text...
-    .PP
-    A second paragraph of text
-</pre>
-</p>
-
-<hr width="33%" align="left"/>
-
-<a name="LIST_CONTROL"><h3><u>List control macros</u></h3></a>
-
-<ol>
-    <li><a href="#SHIFT_LIST">Indenting lists (SHIFT_LIST)</a></li>
-    <li><a href="#RESET_LIST">Resetting an initialized list's enumerator (RESET_LIST)</a></li>
-    <li><a href="#PAD_LIST_DIGITS">Padding digit enumerators (PAD_LIST_DIGITS)</a></li>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="list-control" class="docs defaults">LIST control macros and defaults</h3>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#shift-list">Indenting lists (SHIFT_LIST)</a></li>
+  <li><a href="#reset-list">Resetting an initialized list&#8217;s enumerator (RESET_LIST)</a></li>
+  <li><a href="#pad-list-digits">Padding digit enumerators (PAD_LIST_DIGITS)</a></li>
 </ol>
+</div>
 
-<a name="SHIFT_LIST"><h4><u>1. Indenting lists &mdash; SHIFT_LIST</u></h4></a>
+<h4 id="shift-list" class="docs" style="margin-top: -1.5em;">1. Indenting lists &ndash; SHIFT_LIST</h4>
 
 <p>
 If you want a list to be indented to the right of running text, or
-indented to the right of a current list, use the macro
-<strong>SHIFT_LIST</strong> immediately after
-<a href="#LIST">LIST</a>.
-<strong>SHIFT_LIST</strong> takes just one argument: the amount by
-which you want the list shifted to the right.  The argument requires
-a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
+indented to the right of a current list, use the macro SHIFT_LIST
+immediately after
+<a href="#list">LIST</a>.
+SHIFT_LIST takes just one argument: the amount by which you want the
+list shifted to the right.  The argument requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 </p>
 
 <p>
-<strong>SHIFT_LIST</strong> applies <em>only</em> to the list you
-just initialized with <strong>LIST</strong>.  It does not carry
-over from one invocation of <strong>LIST</strong> to the next.
-However, the indent remains in effect when you <em>return</em> to a
-list level in a nested list.
+SHIFT_LIST applies only to the list you just initialized with LIST.
+It does not carry over from one invocation of LIST to the next.
+However, the indent remains in effect when you return to a list
+level in a nested list.
 </p>
 
 <p>
 For example, if you want a 2-level list, with each list indented to
 the right by 18
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
-
-<pre>
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-    .LIST           \" List 1
-    .SHIFT_LIST 18p \" Indent 18 points right of running text
-    .ITEM
-    List 1 item
-    .ITEM
-    List 1 item
-    .LIST DASH      \" List 2
-    .SHIFT_LIST 18p \" Indent 18 points right of list 1
-    .ITEM
-    List 2 item
-    .ITEM
-    List 2 item
-    .LIST OFF       \" Move back to list 1
-    .ITEM
-    List 1 item
-    .ITEM
-    List 1 item
-    .LIST OFF       \" Exit lists
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-</pre>
-
+<a href="definitions.html#picaspoints">points</a>,
+<br/>
+<span class="pre-in-pp">
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+  .LIST           \" List 1
+  .SHIFT_LIST 18p \" Indent 18 points right of running text
+  .ITEM
+  List 1 item
+  .ITEM
+  List 1 item
+  .LIST DASH      \" List 2
+  .SHIFT_LIST 18p \" Indent 18 points right of list 1
+  .ITEM
+  List 2 item
+  .ITEM
+  List 2 item
+  .LIST OFF       \" Move back to list 1
+  .ITEM
+  List 1 item
+  .ITEM
+  List 1 item
+  .LIST OFF       \" Exit lists
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+</span>
 produces (approximately)
-
-<pre>
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-        o List 1 item
-        o List 1 item
-            - List 2 item
-            - List 2 item
-        o List 1 item
-        o List 1 item
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore.
-</pre>
-</p>
-
-<a name="RESET_LIST"><h4><u>2. Resetting an initialized list's enumerator &mdash; RESET_LIST</u></h4></a>
-
-<p>
-In nested lists, if your choice of list enumerator for a given
-level of list is <strong>DIGIT</strong>, <strong>ALPHA</strong>,
-<strong>alpha</strong>, <strong>ROMAN</strong> or
-<strong>roman</strong>, you may sometimes want to reset the list's
-enumerator when you return to that list.  Consider the following:
-
-<pre>
-    Things to do religiously each and every day:
-    1. Take care of the dog
-       a) walk every day
-       b) brush once a week
-          - trim around the eyes every fourth brushing
-          - don't forget to check nails
-    2. Feed the cat
-       a) soft food on Mon., Wed. and Fri.
-       b) dry food on Tues., Thurs. and Sat.
-       c) canned tuna on Sunday
-</pre>
+<br/>
+<span class="pre-in-pp">
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+      o List 1 item
+      o List 1 item
+          - List 2 item
+          - List 2 item
+      o List 1 item
+      o List 1 item
+  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+  sed diam nonumy eirmod tempor invidunt ut labore.
+</span>
+</p>
+
+<h4 id="reset-list" class="docs" style="margin-top: -.25em;">2. Resetting an initialized list&#8217;s enumerator &ndash; RESET_LIST</h4>
+
+<p>
+In nested lists, if your choice of list enumerator for a given level
+of list is <kbd>DIGIT</kbd>, <kbd>ALPHA</kbd>, <kbd>alpha</kbd>,
+<kbd>ROMAN</kbd> or <kbd>roman</kbd>, you may sometimes want to
+reset the list&#8217;s enumerator when you return to that list.
+Consider the following:
+<br/>
+<span class="pre-in-pp">
+  Things to do religiously each and every day:
+  1. Take care of the dog
+     a) walk every day
+     b) brush once a week
+        - trim around the eyes every fourth brushing
+        - don&#8217;t forget to check nails
+  2. Feed the cat
+     a) soft food on Mon., Wed. and Fri.
+     b) dry food on Tues., Thurs. and Sat.
+     c) canned tuna on Sunday
+</span>
 </p>
 
 <p>
 Normally, within a nested list, when you return to an
-incrementally-enumerated list, the enumerator continues
-incrementing from where it left off.  That means, in the example
-above, the normal state of affairs for the alpha'ed list under
-&quot;2.  Feed the cat&quot; would be c), d) and e).  The
-solution, in such a case, is simply to reset the enumerator
-&mdash; before <kbd>.ITEM</kbd> &mdash; with the macro,
-<kbd>.RESET_LIST</kbd>.
-</p>
-
-<p>
-By default, with no argument, <kbd>.RESET_LIST</kbd> resets the
-enumerator to 1, A, a, I or i depending on the style of enumerator.
-You may, if you wish, pass <kbd>.RESET_LIST</kbd> a
-<a href="definitions.html#TERMS_NUMERICARGUMENT">numeric argument</a>
+incrementally-enumerated list, the enumerator continues incrementing
+from where it left off.  That means, in the example above, the
+normal state of affairs for the alpha'ed list under
+<br/>
+<span class="pre-in-pp">
+  2.  Feed the cat
+</span>
+would be d), e) and f).  The solution, in such a case, is simply
+to reset the enumerator&mdash;before <kbd>.ITEM</kbd>&mdash;with
+the macro, <kbd>.RESET_LIST</kbd>.  By default, with no argument,
+<kbd>.RESET_LIST</kbd> resets the enumerator to 1, A, a, I or i
+depending on the style of enumerator.  You may, if you wish, pass
+<kbd>.RESET_LIST</kbd> a
+<a href="definitions.html#numericargument">numeric argument</a>
 representing the starting enumerator for the reset (if different
-from "1"), although I can't at present think of a use for this
+from "1"), although I can&#8217;t at present think of a use for this
 feature.
 </p>
 
-<a name="PAD_LIST_DIGITS"><h4><u>3. Padding digit enumerators (PAD_LIST_DIGITS)</u></h4></a>
+<h4 id="pad-list-digits" class="docs" style="margin-top: -.25em;">3. Padding digit enumerators &ndash; PAD_LIST_DIGITS</h4>
 
-<h5><u>Arabic digits</u></h5>
+<h5 class="docs" style="margin-top: 1em;">Arabic digits</h5>
 
-<p>
-When your choice of enumerators is <strong>DIGIT</strong> AND the
-number of items in the list exceeds nine (9), you have to make a
-design decision: should <strong>mom</strong> leave room for the
-extra numeral in two-numeral digits to the right or the left of the
-single-numeral digits?
+<p style="margin-top: .5em;">
+When your choice of enumerators is DIGIT and the number of items
+in the list exceeds nine (9), you have to make a design decision:
+should mom leave room for the extra numeral in two-numeral digits to
+the right or the left of the single-numeral digits?
 </p>
 
 <p>
@@ -2966,442 +3128,406 @@
 <kbd>.PAD_LIST_DIGITS</kbd> (with no argument), after
 <kbd>.LIST</kbd> and before <kbd>.ITEM</kbd>.  This will produce
 something like
-
-<pre>
-    8.  List item
-    9.  List item
-    10. List item
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  8.  List item
+  9.  List item
+  10. List item
+</span>
 If you want the extra space to the left, invoke
 <kbd>.PAD_LIST_DIGITS</kbd> with the single argument,
 <kbd>LEFT</kbd>, which will produce
-
-<pre>
-     8. List item
-     9. List item
-    10. List item
-</pre>
+<br/>
+<span class="pre-in-pp">
+   8. List item
+   9. List item
+  10. List item
+</span>
 </p>
 
 <p>
 Of course, if the number of items in the list is less than ten
-(10), there's no need for <strong>PAD_LIST_DIGITS</strong>.
+(10), there&#8217;s no need for PAD_LIST_DIGITS.
 </p>
 
-<h5><u>Roman numerals</u></h5>
+<h5 class="docs" style="margin-top: -.5em;">Roman numerals</h5>
 
-<p>
-By default, <strong>mom</strong> sets roman numerals in lists
-flush left.  The <kbd>&lt;n&gt;</kbd> argument appended to
-<kbd>ROMAN&lt;n&gt;</kbd> or <kbd>roman&lt;n&gt;</kbd>
-allows her to calculate how much space to put after each numeral in
-order to ensure that the text of items lines up properly.
+<p style="margin-top: .5em;">
+By default, mom sets roman numerals in lists flush left.  The
+<kbd>&lt;n&gt;</kbd> argument appended to <kbd>ROMAN&lt;n&gt;</kbd>
+or <kbd>roman&lt;n&gt;</kbd> allows her to calculate how much space
+to put after each numeral in order to ensure that the text of items
+lines up properly.
 </p>
 
 <p>
-If you'd like the roman numerals to line up flush right (i.e.
-be padded "left"), simply invoke
-<nobr><kbd>.PAD_LIST_DIGITS LEFT</kbd></nobr>
-after
-<nobr><kbd>.LIST ROMAN&lt;n&gt;</kbd></nobr>
-or
-<nobr><kbd>.LIST roman&lt;n&gt;</kbd></nobr>
-and before <kbd>.ITEM</kbd>.
+If you&#8217;d like the roman numerals to line
+up flush right (i.e. be padded "left"), simply
+invoke <kbd>.PAD_LIST_DIGITS&nbsp;LEFT</kbd> after
+<kbd>.LIST&nbsp;ROMAN&lt;n&gt;</kbd> or
+<kbd>.LIST&nbsp;roman&lt;n&gt;</kbd> and before <kbd>.ITEM</kbd>.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- -LINE NUMBERING- -->
 
-<a name="NUMBER_LINES_INTRO"><h2><u>Line numbering</u></h2></a>
+<h2 id="number-lines-intro" class="macro-group">Line numbering &ndash; prepend numbers to output lines</h2>
 
-<ul>
-    <li><a href="#NUMBER_LINES">Macro: NUMBER_LINES</a></li>
-    <ul>
-        <li><a href="#LN_CONTROL">Line numbering control (suspend/resume)</a></li>
-    </ul>
-    <li><a href="#NUMBER_LINES_CONTROL">Control macros</a>
-    <ul>
-        <li><a href="#NUMBER_LINES_CONTROL_QUOTE">Line numbering control macros for quotes and blockquotes</a></li>
-    </ul></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#number-lines">Macro: <b>NUMBER_LINES</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#ln-control">Line numbering control (off/suspend, resume)</a></li>
+  </ul></li>
+  <li><a href="#number-lines-control">Control macros and defaults</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#number-lines-control-quote">Line numbering control macros for quotes and blockquotes</a></li>
+  </ul></li>
 </ul>
 
-<p>
-When you turn line-numbering on, <strong>mom</strong>, by default
-
-<a name="NUMBER_LINES_DEFAULTS"></a>
-<ul>
-    <li>numbers every line of paragraph text; line-numbering is
-        suspended for all other document processing tags (like
-        docheaders, epigraphs, heads, subheads, etc.) and special
-        pages (covers, endotes, bibliographies, etc.); be aware,
-        though, that if you turn
-        <a href="definitions.html#TERMS_DOCHEADER">docheaders</a>
-        off (with
-        <a href="docprocessing.html#DOCHEADER">DOCHEADER</a> <strong>OFF</strong>)
-        and create your own docheader, <strong>mom</strong>
-        <em>will</em> line-number your custom docheader
-    </li>
-    <li>doesn't touch your line length; line numbers are hung
-        outside your current left margin (as set with
-        <a href="typesetting.html#L_MARGIN">L_MARGIN</a>,
-        <a href="typesetting.html#PAGE">PAGE</a>
-        or
-        <a href="docprocessing.html#DOC_LEFT_MARGIN">DOC_LEFT_MARGIN</a>),
-        regardless of any indents that may be active
-    </li>
-    <li>separates line numbers from running text by two
-        <a href="definitions.html#TERMS_FIGURESPACE">figure spaces</a>.
-    </li>
-</ul>
+<p style="margin-top: -.5em;">
+When you turn line-numbering on, mom, by default
 </p>
+<ul style="margin-top: -.5em;">
+  <li>numbers every line of paragraph text; line-numbering is
+      suspended for all other document processing tags (like
+      docheaders, epigraphs, heads, subheads, etc.) and special
+      pages (covers, endotes, bibliographies, etc.); be aware,
+      though, that if you turn
+      <a href="definitions.html#docheader">docheaders</a>
+      off (with
+      <a href="docprocessing.html#docheader">DOCHEADER</a> OFF)
+      and create your own docheader, mom
+      <i>will</i> line-number your custom docheader
+  </li>
+  <li>doesn&#8217;t touch your line length; line numbers are hung
+      outside your current left margin (as set with
+      <a href="typesetting.html#l-margin">L_MARGIN</a>,
+      <a href="typesetting.html#page">PAGE</a>
+      or
+      <a href="docprocessing.html#doc-left-margin">DOC_LEFT_MARGIN</a>),
+      regardless of any indents that may be active
+  </li>
+  <li>separates line numbers from running text by two
+      <a href="definitions.html#figurespace">figure spaces</a>.
+  </li>
+</ul>
 
 <p>
 Line numbering may be enabled and disabled for
-<a href="#QUOTE">QUOTE</a>
+<kbd><a href="#quote">QUOTE</a></kbd>
 and/or
-<a href="#BLOCKQUOTE">BLOCKQUOTE</a>
+<kbd><a href="#blockquote">BLOCKQUOTE</a></kbd>
 in one of three styles.  See
-<a href="#NUMBER_LINES_CONTROL_QUOTE">Line numbering control macros for quotes and blockquotes</a>.
-</p>
-
-<p>
-The first time you invoke
-<a href="#NUMBER_LINES"><kbd>.NUMBER_LINES</kbd></a>
-you must, at a minimum, tell it what line number you want the
-<em>next</em>
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>
-to have.  Optional arguments allow you to state which lines should
-be numbered (e.g. every five or every ten lines), and the gutter to
-place between line numbers and
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-</p>
-
-<p>
-Subsequently, you can turn line-numbering off, either permanently,
-or resume it later at a place of your choosing.  When you
-resume line-numbering, the line numbers pick up where you left off.
+<a href="#number-lines-control-quote">Line numbering control macros for quotes and blockquotes</a>.
 </p>
 
 <!-- -NUMBER_LINES- -->
 
-<hr width="66%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="number-lines" class="macro-id">NUMBER_LINES</h3>
+</div>
 
-<a name="NUMBER_LINES"></a>
+<div class="box-macro-args">
+Macro: <b>NUMBER_LINES</b> <kbd class="macro-args">&lt;start number&gt; [ &lt;which lines to number&gt; [ &lt;gutter&gt; ] ]</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>NUMBER_LINES</strong> <kbd>&lt;start number&gt; [ &lt;which lines to number&gt; [ &lt;gutter&gt; ] ]</kbd></nobr>
-<br/>
-
-<nobr>Macro: <strong>NUMBER_LINES</strong>  <kbd>&lt;anything&gt; | RESUME</kbd></nobr>
-</p>
+<div class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>NUMBER_LINES</b>  <kbd class="macro-args">&lt;anything&gt; | RESUME</kbd>
+</div>
 
 <p>
-<strong>NUMBER_LINES</strong> does what it says: prints line
-numbers, to the left of
-<a href="definitions.html#TERMS_OUTPUTLINE">output lines</a>
+NUMBER_LINES does what it says: prints line numbers, to the left of
+<a href="definitions.html#outputline">output lines</a>
 of paragraph text.  One of the chief reasons for wanting numbered
 lines is in order to identify footnotes or endnotes by line number
 instead of by a marker in the text.  (See
-<a href="#FOOTNOTE_LINENUMBERS">FOOTNOTE_MARKER_STYLE LINE</a>
+<a href="#footnote-linenumbers">FOOTNOTE_MARKER_STYLE LINE</a>
 for instructions on line-numbered footnotes, and
-<a href="#ENDNOTE_MARKER_STYLE">ENDNOTE_MARKER_STYLE</a>
+<a href="#endnote-marker-style">ENDNOTE_MARKER_STYLE</a>
 for instructions on line-numbered endnotes.)
 </p>
 
 <p>
-Every time you invoke <kbd>.NUMBER_LINES</kbd>, unless you are
-using the argument <strong>OFF</strong> (or <strong>QUIT</strong>,
-<strong>END</strong>, <strong>X</strong>, etc.) or <kbd>RESUME</kbd>
-you must, at a minimum, pass it one argument, namely the number
-(digit) you want the <em>next</em>
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>
-to have.  For example,
-
-<pre>
-    .NUMBER_LINES 3
-</pre>
-
-will prepend the number, 3, to the next output line.
-</p>
-
-<p>
-Normally, of course, you will number lines of text starting at 1.
-All you have to do in that case is ensure that
-
-<pre>
-    .NUMBER_LINES 1
-</pre>
-
-precedes your first line of input text, which will also be the
-first line of output text.
-</p>
-
-<p>
-You can alter <strong>mom</strong>'s default line numbering
-behaviour (see
-<a href="#NUMBER_LINES_DEFAULTS">above</a>)
-with the optional arguments <kbd>&lt;which lines to number&gt;</kbd>
-and <kbd>&lt;gutter&gt;</kbd>.
+The first time you invoke
+<a href="#number-lines">NUMBER_LINES</a>
+you must, at a minimum, tell it what line number you want the
+<i>next</i>
+<a href="definitions.html#outputline">output line</a>
+to have.  The optional arguments which <kbd>lines to number</kbd>
+and <kbd>gutter</kbd> allow you to state which lines should
+be numbered (e.g. every five or every ten lines), and the gutter to
+place between line numbers and
+<a href="definitions.html#running">running text</a>.
 </p>
 
 <p>
-<kbd>&lt;which lines to number&gt;</kbd> instructs
-<kbd>NUMBER_LINES</kbd> to number only certain lines, e.g. every two
-lines or every five lines.  If you want, say, only every five lines
-to have a prepended number, you'd do
-
-<pre>
-    .NUMBER_LINES 1 5
-</pre>
-
-<strong>GOTCHA!</strong> The argument to <kbd>&lt;which lines to
-number&gt;</kbd> only numbers those lines that are multiples of
-the argument.  Hence, in the above example, line number "1"  will
-<em>not</em> be numbered, since "1"  is not a multiple of "5".
+For example, if you want mom to number output lines using her defaults,
+<span class="pre-in-pp">
+  .NUMBER_LINES 1
+</span>
+will prepend the number, 1, to the next output line and number all
+subsequent output lines sequentially.
 </p>
 
 <p>
-If you wanted line number "1"  to be numbered, you'd have to invoke
-<kbd>.NUMBER_LINES 1 1</kbd> before the first output line, then
-study your <em>output</em> copy and determine where best to insert
-the following in your <em>input</em> copy:
-
-<pre>
-    .NUMBER_LINES \n(ln 5
-</pre>
-
-(The escape, <kbd>\n(ln</kbd>, ensures that
-<strong>NUMBER_LINES</strong> automatically supplies the correct
-value for the first argument, <kbd>&lt;start number&gt;</kbd>.)
+If you want only every five lines numbered, pass mom the optional
+<kbd>which lines to number</kbd> argument, like this:
+<span class="pre-in-pp">
+  .NUMBER_LINES 1 5
+</span>
 </p>
 
-<p>
-Following this recipe, line number 1 will be numbered; subsequently,
-only line numbers that are multiples of 5 will be numbered.  A
-little experimentation may be required to determine the best place
-for it.
+<div class="box-important">
+<p class="tip-top">
+<span class="important">GOTCHA!</span>
+The argument to <kbd>&lt;which lines to number&gt;</kbd> instructs
+mom to number only those lines that are multiples of the argument.
+Hence, in the above example, line number <kbd>1</kbd> will
+<i>not</i> be numbered, since <kbd>1</kbd> is not a multiple of
+<kbd>5</kbd>.
 </p>
 
 <p>
-The optional argument, <kbd>&lt;gutter&gt;</kbd>, tells
-<strong>mom</strong> how much space to put between the line numbers
-and the running text.
+If you want line number <kbd>1</kbd> to be numbered, you have to
+invoke <kbd>.NUMBER_LINES 1 1</kbd> before the first output line
+you want numbered, then study your <i>output</i> copy and determine
+where best to insert the following in your <i>input</i> input text:
+<br/>
+<span class="pre-in-pp">
+  .NUMBER_LINES \n[ln] 5
+</span>
+(The escape, <kbd>\n[ln]</kbd>, ensures that NUMBER_LINES
+automatically supplies the correct value for the first argument,
+<kbd>&lt;start number&gt;</kbd>.)
 </p>
 
-<p>
-<strong>Note</strong>: when giving a value for
-<kbd>&lt;gutter&gt;</kbd>, you cannot skip the <kbd>&lt;which lines
-to number&gt;</kbd> argument.  Either fill in the desired value, or
-use two double-quotes ( <kbd>""</kbd> ) to have <strong>mom</strong>
-use the value formerly in effect.
+<p class="tip-bottom">
+Following this recipe, line number <kbd>1</kbd> will be numbered;
+subsequently, only line numbers that are multiples of 5 will be
+numbered.  A little experimentation may be required to determine the
+best place for it in your input text.
 </p>
+</div>
 
 <p>
+The optional argument, <kbd>&lt;gutter&gt;</kbd>, tells mom how much
+space to put between the line numbers and the running text.
 <kbd>&lt;gutter&gt;</kbd> does not require (or even accept) a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 The argument you pass to it is the number of
-<a href="definitions.html#TERMS_FIGURESPACE">figure spaces</a>
+<a href="definitions.html#figurespace">figure spaces</a>
 you want between line numbers and running text.
-<strong>Mom</strong>'s default gutter is two figure spaces.  If
-you'd like a wider gutter, say, four figures spaces, you'd do
+Mom&#8217;s default gutter is two figure spaces.  If
+you&#8217;d like a wider gutter, say, four figures spaces, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .NUMBER_LINES 1 1 4
+                  |
+                  +-- Notice you *must* supply a value
+                      for the 2nd argument in order to supply
+                      a value for the 3rd.
+</span>
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+When giving a value for <kbd>&lt;gutter&gt;</kbd>, you cannot skip
+the <kbd>&lt;which lines to number&gt;</kbd> argument.  Either fill
+in the desired value, or use two double-quotes ( <kbd>""</kbd> ) to
+have mom use the value formerly in effect.
+</p>
+</div>
+
+<h3 id="ln-control" class="docs" style="margin-top: -.5em;">Off/suspend, resume</h3>
+
+<p style="margin-top: .5em;">
+After initializing line numbering, you can suspend it, with the
+option to resume, using
+<br/>
+<span class="pre-in-pp">
+  .NUMBER_LINES&nbsp;OFF
+</span>
+(or <kbd>END, QUIT, X,</kbd> etc).
+</p>
 
-<pre>
-    .NUMBER_LINES 1 1 4
-                    |
-                    +-- Notice you *must* supply a value
-                        for the 2nd argument in order to supply
-                        a value for the 3rd.
-</pre>
-</p>
-
-<p>
-After you've set up line-numbering, <strong>NUMBER_LINES</strong>
-can be used to control line numbering.
-</p>
-
-<hr width="33%" align="left"/>
-
-<a name="LN_CONTROL"></a>
-
-<h3><u>Line-numbering control</u></h3>
-
-<p>
-<nobr><strong>NUMBER_LINES OFF</strong></nobr> (or <strong>END,
-QUIT, X,</strong> etc.) turns line-numbering off.
-</p>
-
-<p>
-Sometimes, you merely want to suspend line-numbering.  In that
-case, turn line numbering off with
-<nobr><kbd>.NUMBER_LINES OFF</kbd>.</nobr> Later, when you want
-it to resume, enter
-
-<pre>
-    .NUMBER_LINES RESUME
-</pre>
-
-Line numbering will resume exactly where it left off.  If this is
-not what you want &mdash; say you want to reset the line number to
-"1" &mdash; simply invoke <kbd>.NUMBER_LINES</kbd> with whatever
-arguments are needed for the desired result.
-</p>
-
-<h4><u>Extra Notes:</u></h4>
-
-<ol>
-    <li>In document processing, you may invoke <kbd>.NUMBER_LINES</kbd>
-        either before or after <kbd>.START</kbd>.
-        <strong>Mom</strong> doesn't care.
-    </li>
-    <li>If you're collating documents with
-        <a href="rectoverso.html#COLLATE">COLLATE</a>,
-        you should re-invoke, at a minimum,
-        <nobr><kbd>.NUMBER_LINES 1</kbd></nobr> for each collated
-        document, in order to ensure that each begins with the
-        number "1"  prepended to the first line (unless, of course,
-        that is not what you want).
-    </li>
-    <li>Occasionally, you may want to change the current gutter
-        between line numbers and running text without knowing
-        what the next output line number should be.  Since
-        <strong>NUMBER_LINES</strong> requires this number
-        as its first argument, in such instances, pass
-        <strong>NUMBER_LINES</strong> as its first argument the
-        escape <kbd>\n(ln</kbd>.
-        <br/><br/>
-
-        For example, if you were numbering every 5 lines with a
-        gutter of 2 (figure spaces) and you needed to change the
-        gutter to 4 (figures spaces),
-        <br/><br/>
-
-        <kbd>&nbsp;&nbsp;&nbsp;&nbsp;.NUMBER_LINES \n(ln 5 4</kbd>
-        <br/><br/>
-        would do the trick.
-    </li>
-    <li>If you're using margin notes in a document, be sure to set
-        the gutter for margin notes wide enough to allow room for
-        the line numbers.
-    </li>
-    <li><strong>Mom</strong> (groff, actually), only numbers lines
-        <em>to the left of text</em>.  For aesthetic reason,
-        therefore, the use of line numbering when setting a document
-        in columns is discouraged.  However, should you wish to
-        number lines when setting in columns, make sure the
-        <a href="definitions.html#TERMS_GUTTER">gutter(s)</a>
-        between columns is wide enough to leave room for the
-        numbers.
-    </li>
+<p>To resume line numbering:
+<br/>
+<span class="pre-in-pp">
+  .NUMBER_LINES RESUME
+</span>
+When you resume, the line number will be the next in sequence
+from where you left off.  If that is not what you want&mdash;say
+you want to reset the line number to <kbd>1</kbd>&mdash;re-invoke
+<kbd>.NUMBER_LINES</kbd> with whatever arguments are needed for the
+desired result.
+</p>
+
+<div class="box-tip" style="margin-left: 6px;">
+<p class="tip">
+<span class="note">Additional notes:</span>
+</p>
+<ol style="margin-top: -1.25em; margin-left: -1.25em; padding-bottom: .5em;">
+  <li>In document processing, you may invoke
+      <kbd>.NUMBER_LINES</kbd> either before or after
+      <kbd>.START</kbd>.  Mom doesn&#8217;t care.
+  </li>
+  <li style="margin-top: .25em;">If you&#8217;re collating documents with
+      <a href="rectoverso.html#collate">COLLATE</a>,
+      you should re-invoke, at a minimum,
+      <kbd>.NUMBER_LINES&nbsp;1</kbd> for each collated
+      document, in order to ensure that each begins with the
+      number, <kbd>1</kbd>, prepended to the first line.
+  </li>
+  <li style="margin-top: .25em;">Occasionally, you may want to
+      change the current gutter between line numbers and running
+      text without knowing what the next output line number should
+      be.  Since NUMBER_LINES requires this number as its first
+      argument, in such instances, pass NUMBER_LINES as its first
+      argument the escape
+      <kbd>\n[ln]</kbd>.
+      <br/>
+      <span style="display: block; margin-top: .5em;">For example, if you were numbering every 5 lines with a
+      gutter of 2 (figure spaces) and you needed to change the
+      gutter to 4 (figures spaces),
+      <br/>
+      <span class="pre-in-pp" style="margin-bottom: -2em;">
+  .NUMBER_LINES \n[ln] 5 4
+      </span>
+      would do the trick.
+      </span>
+  </li>
+  <li style="margin-top: .25em;">If you&#8217;re using
+      <a href="#mn-intro">margin notes</a>
+      in a document, be sure to set the gutter for margin notes wide
+      enough to allow room for the line numbers.
+  </li>
+  <li style="margin-top: .25em;">Mom (groff, actually), only numbers
+      lines <i>to the left</i> of running text.  For aesthetic
+      reason, therefore, the use of line numbering when setting a
+      document in columns is discouraged.  However, should you wish
+      to number lines when setting in columns, make sure the
+      <a href="definitions.html#gutter">gutter(s)</a>
+      between columns is wide enough to leave room for the numbers.
+  </li>
 </ol>
+</div>
+
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="number-lines-control" class="docs defaults">NUMBER_LINES control macros and defaults</h3>
 
-<hr width="33%" align="left"/>
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#number-lines-general">Family/font/size/colour</a></li>
+  <li><a href="#number-lines-control-quote">Line numbering control for quotes and blockquotes</a>
+  <ul style="margin-left: -.75em; list-style-type: disc;">
+    <li><a href="#number-quote-lines">Number QUOTE lines</a></li>
+    <li><a href="#number-blockquote-lines">Number BLOCKQUOTE lines</a></li>
+    <li><a href="#number-lines-control-case">Numbering QUOTE and BLOCKQUOTE lines on a case by case basis</a></li>
+  </ul></li>
+</ol>
+</div>
 
-<a name="NUMBER_LINES_CONTROL"><h3><u>Line numbering control macros</u></h3></a>
+<h4 id="number-lines-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/colour</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .LINENUMBER_FAMILY default = prevailing family or document family; default is Times Roman
 .LINENUMBER_FONT   default = prevailing font
 .LINENUMBER_SIZE   default = +0
 .LINENUMBER_COLOR  default = black
-</pre>
-
-<a name="NUMBER_LINES_CONTROL_QUOTE"><h3><u>Line numbering control macros for QUOTE and BLOCKQUOTE</u></h3></a>
+</span>
+</div>
 
-<ol>
-    <li><a href="#NUMBER_QUOTE_LINES">NUMBER_QUOTE_LINES</a></li>
-    <li><a href="#NUMBER_BLOCKQUOTE_LINES">NUMBER_BLOCKQUOTE_LINES</a></li>
-    <li><a href="#NUMBER_LINES_QUOTES">Setting up line numbering in quotes and blockquotes on a case by case basis</a></li>
-</ol>
+<h4 id="number-lines-control-quote" class="docs" style="margin-top: -1.75em;">2. Line numbering control macros for QUOTE and BLOCKQUOTE</h4>
 
-<a name="NUMBER_QUOTE_LINES"><h4><u>1. NUMBER_QUOTE_LINES</u></h4></a>
+<h5 id="number-quote-lines" class="docs" style="margin-top: 1em;">Number QUOTE lines</h5>
 
 <p>
-If you'd like <strong>mom</strong> to number lines of output text
+If you&#8217;d like mom to number lines of output text
 in a
-<a href="#QUOTE">QUOTE</a>
+<a href="#quote">QUOTE</a> 
 as part of the same order and sequence as paragraph text, simply
-invoke <kbd>.NUMBER_QUOTE_LINES</kbd> by itself.
+invoke
+<span class="pre-in-pp">
+  .NUMBER_QUOTE_LINES
+</span>
+by itself.
 </p>
 
 <p>
-There is a catch with numbering quotes, though.  Owing to groff's
-restriction of accepting only the figure space as the line number
-gutter's unit of measure, it is not possible for line numbers
-in quotes to hang outside a document's overall left margin and
+There is a catch with numbering quotes, though.  Owing to groff&#8217;s
+restriction on accepting only the figure space as the line number
+gutter&#8217;s unit of measure, it is not possible for line numbers
+in quotes to hang outside a document&#8217;s overall left margin and
 be reliably flush with the line numbers of paragraph text.
 Conseqently, line numbers in quotes hang to the left of the quote,
 separated from the quote by the <kbd>&lt;gutter&gt;</kbd> argument.
 </p>
 
 <p>
-If you'd like to change the gutter for quotes line-numbered in
+If you&#8217;d like to change the gutter for quotes line-numbered in
 this way, invoke <kbd>.NUMBER_QUOTE_LINES</kbd> with a digit
 representing the number of
-<a href="definitions.html#TERMS_FIGURESPACE">figure spaces</a>
-you'd like between the line numbers and the quoted text, like this:
-
-<pre>
-    .NUMBER_QUOTE_LINES 1
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#figurespace">figure spaces</a>
+you&#8217;d like between the line numbers and the quoted text, like this:
+<br/>
+<span class="pre-in-pp">
+  .NUMBER_QUOTE_LINES 1
+</span>
 With the above, line numbers in quotes (and only quotes) will have
 a gutter of 1 figure space.
 </p>
 
 <p>
-If you are using "line numbering style" for footnotes
-<nobr>(<a href="#FOOTNOTE_MARKER_STYLE">.FOOTNOTE_MARKER_STYLE</a> <strong>LINE</strong>)</nobr>,
-you may not wish to have quotes <em>visibly</em> line-numbered, but
+If you&#8217;re using "line numbering style" for footnotes
+(<a href="#footnote-marker-style">FOOTNOTE_MARKER_STYLE <kbd>LINE</kbd>)</a>,
+you may not wish to have quotes <i>visibly</i> line-numbered, but
 still want to embed footnotes inside quotes.  In order to do that,
-<strong>mom</strong> allows you to say <kbd>.NUMBER_QUOTE_LINES
-SILENT</kbd>.
-</p>
-
-<p>
-When you invoke <nobr><kbd>.NUMBER_QUOTE_LINES SILENT</kbd></nobr>,
-<strong>mom</strong> continues to increment line numbers while
-quotes are being output, but they won't appear in the output copy.
-(Compare this with <strong>mom</strong>'s default behaviour of
-<em>suspending</em> incrementing of line numbers during the output
-of quotes.)  This allows you to embed line-numbered footnotes inside
-quotes and have the line number "label" in the footnote come out
-sensibly.
+mom allows you to say
+<span class="pre-in-pp">
+  .NUMBER_QUOTE_LINES&nbsp;SILENT
+</span>
+When you invoke <kbd>.NUMBER_QUOTE_LINES&nbsp;SILENT</kbd>,
+mom continues to increment line numbers while quotes are being
+output, but they won&#8217;t appear in the output copy.  (Compare
+this with mom&#8217;s default behaviour of <i>suspending</i>
+incrementing of line numbers during the output of quotes.)  This
+allows you to embed line-numbered footnotes inside quotes and have
+the line number label in the footnote come out sensibly.
 </p>
 
 <p>
-Once having turned <strong>NUMBER_QUOTE_LINES</strong> on, you
-may disable it with
-<nobr><kbd>.NUMBER_QUOTE_LINES OFF</kbd></nobr>
-(or <strong>QUIT</strong>, <strong>END</strong>, <strong>X</strong>,
-etc).
+Once having turned NUMBER_QUOTE_LINES on, you may disable it with
+<span class="pre-in-pp">
+  .NUMBER_QUOTE_LINES OFF
+</span>
+(or <kbd>QUIT, END, X,</kbd> etc).
 </p>
 
-<a name="NUMBER_BLOCKQUOTE_LINES"><h4><u>2. NUMBER_BLOCKQUOTE_LINES</u></h4></a>
+<h5 id="number-blockquote-lines" class="docs">Number BLOCKQUOTE lines</h5>
 
 <p>
-If you'd like <strong>mom</strong> to number lines of output text
+If you&#8217;d like mom to number lines of output text
 in a
-<a href="#QUOTE">BLOCKQUOTE</a>
+<a href="#quote">BLOCKQUOTE</a>
 as part of the same order and sequence as paragraph text, simply
-invoke <kbd>.NUMBER_BLOCKQUOTE_LINES</kbd> by itself.
+invoke
+<span class="pre-in-pp">
+  .NUMBER_BLOCKQUOTE_LINES
+</span>
+by itself.
 </p>
 
 <p>
 There is a catch with numbering blockquotes, though.  Owing to
-groff's restriction of accepting only the figure space as the
-line number gutter's unit of measure, it is not possible for line
-numbers in blockquotes to hang outside a document's overall left
+groff&#8217;s restriction of accepting only the figure space as the
+line number gutter&#8217;s unit of measure, it is not possible for line
+numbers in blockquotes to hang outside a document&#8217;s overall left
 margin and be reliably flush with the line numbers of paragraph
 text.  Conseqently, line numbers in blockquotes hang to the
 left of the blockquote, separated from the blockquote by the
@@ -3409,16 +3535,19 @@
 </p>
 
 <p>
-If you'd like to change the gutter for blockquotes line-numbered in
-this way, invoke <kbd>.NUMBER_BLOCKQUOTE_LINES</kbd> with a digit
-representing the number of
-<a href="definitions.html#TERMS_FIGURESPACE">figure spaces</a>
-you'd like between the line numbers and the blockquoted text, like
+If you&#8217;d like to change the gutter for blockquotes line-numbered in
+this way, invoke
+<span class="pre-in-pp">
+  .NUMBER_BLOCKQUOTE_LINES
+</span>
+with a digit representing the number of
+<a href="definitions.html#figurespace">figure spaces</a>
+you&#8217;d like between the line numbers and the blockquoted text, like
 this:
-
-<pre>
-    .NUMBER_BLOCKQUOTE_LINES 1
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .NUMBER_BLOCKQUOTE_LINES 1
+</span>
 
 With the above, line numbers in blockquotes (and only blockquotes)
 will have a gutter of 1 figure space.
@@ -3426,33 +3555,32 @@
 
 <p>
 If you are using "line numbering style" for footnotes
-<nobr>(<a href="#FOOTNOTE_MARKER_STYLE">FOOTNOTE_MARKER_STYLE</a> <strong>LINE</strong>),</nobr>
-you may not wish to have blockquotes <em>visibly</em> line-numbered,
-but still want to embed footnotes inside blockquotes.  In
-order to do that, <strong>mom</strong> allows you to say
-<kbd>.NUMBER_BLOCKQUOTE_LINES SILENT</kbd>.
-</p>
-
-<p>
-When you invoke
-<nobr><kbd>.NUMBER_BLOCKQUOTE_LINES SILENT</kbd>,</nobr>
-<strong>mom</strong> continues to increment line numbers while
-blockquotes are being output, but they won't appear in the output
-copy.  (Compare this with <strong>mom</strong>'s default behaviour
-of <em>suspending</em> incrementing of line numbers during the
-output of blockquotes.)  This allows you to embed line-numbered
-footnotes inside blockquotes and have the line number "label" in the
-footnote come out sensibly.
+(<a href="#footnote-marker-style">FOOTNOTE_MARKER_STYLE <kbd>LINE</kbd>)</a>,
+you may not wish to have blockquotes <i>visibly</i> line-numbered,
+but still want to embed footnotes inside blockquotes.  In order to
+do that, mom allows you to say
+<span class="pre-in-pp">
+  .NUMBER_BLOCKQUOTE_LINES&nbsp;SILENT
+</span>
+When you invoke <kbd>.NUMBER_BLOCKQUOTE_LINES&nbsp;SILENT</kbd>,
+mom continues to increment line numbers while blockquotes are being
+output, but they won&#8217;t appear in the output copy.  (Compare
+this with mom&#8217;s default behaviour of <i>suspending</i>
+incrementing of line numbers during the output of blockquotes.)
+This allows you to embed line-numbered footnotes inside blockquotes
+and have the line number label in the footnote come out sensibly.
 </p>
 
 <p>
-Once having turned <strong>NUMBER_BLOCKQUOTE_LINES</strong> on,
-you may disable it with <nobr><kbd>.NUMBER_BLOCKQUOTE_LINES
-OFF</kbd></nobr> (or <strong>QUIT</strong>, <strong>END</strong>,
-<strong>X</strong>, etc).
+Once having turned NUMBER_BLOCKQUOTE_LINES on, you may disable it
+with
+<span class="pre-in-pp">
+  .NUMBER_BLOCKQUOTE_LINES OFF
+</span>
+(or <kbd>QUIT, END, X,</kbd> etc).
 </p>
 
-<a name="NUMBER_LINES_QUOTES"><h4><u>3. Setting up line numbering in quotes and blockquotes on a case by case basis</u></h4></a>
+<h4 id="number-lines-control-case" class="docs" style="margin-top: -.25em;">3. Numbering QUOTE and BLOCKQUOTE lines on a case by case basis</h4>
 
 <p>
 Sometimes, you may want quotes or blockquotes to have a different
@@ -3460,567 +3588,553 @@
 Or, you may want line numbering enabled only inside a particular
 quote or blockquote.  A common reason for this would be if you were
 using the
-<a href="#QUOTE">QUOTE</a>
+<a href="#quote">QUOTE</a>
 macro to insert lines of programming code into a document.
 </p>
 
 <p>
 To enable line numbering within quotes or blockquotes on a case by
-case basis, simply invoke <kbd>.NUMBER_LINES</kbd>, with the
-arguments you need, immediately after entering <kbd>.QUOTE</kbd>
-or <kbd>.BLOCKQUOTE</kbd>.  (<strong>NUMBER_QUOTE_LINES</strong>
-and/or <strong>NUMBER_BLOCKQUOTE_LINES</strong> should be turned
-off if you're doing this.)  The quote or blockquote will then be
-line-numbered according to your specifications: the starting line
-number of the quote or blockquote will be the one you give as a
-first argument to <strong>NUMBER_LINES</strong>; which lines to
-number will be the value you pass to <nobr><kbd>&lt;which lines to
-number&gt;</kbd></nobr> (defaults to "1"); line numbers will hang
-to the left of the quote or blockquote, separated from the quote or
-blockquote by <kbd>&lt;gutter&gt;</kbd> (defaults to "2").
+case basis, simply invoke
+<a href="#number-lines">NUMBER_LINES</a>
+with the arguments you need immediately after entering
+<kbd><a href="#quote">.QUOTE</a></kbd>
+or
+<kbd><a href="#blockquote">.BLOCKQUOTE</a></kbd>.
+(<a href="number-quote-lines">NUMBER_QUOTE_LINES</a>
+and/or
+<a href="number-blockquote-lines">NUMBER_BLOCKQUOTE_LINES</a>
+should be turned off if you&#8217;re doing this.)  The quote
+or blockquote will then be line-numbered according to your
+specifications: the starting line number of the quote or blockquote
+will be the one you give as a first argument to NUMBER_LINES; which
+lines to number will be the value you pass to <kbd>which lines
+to number</kbd> (defaults to <kbd>1</kbd>); line numbers will
+hang to the left of the quote or blockquote, separated from the
+quote or blockquote by <kbd>gutter</kbd> (defaults to <kbd>2</kbd>).
 </p>
 
 <p>
-As soon as <strong>QUOTE</strong> or <strong>BLOCKQUOTE</strong>
-is turned off, line numbering ceases, not only with respect to
-subsequent paragraph text (if they are not being line-numbered),
-but also for any subsequent invocation of <kbd>.QUOTE</kbd> or
-<kbd>.BLOCKQUOTE</kbd>.  In other words, you must re-enable
-quote or blockquote line-numbering inside every instance of
-<strong>QUOTE</strong> or <strong>BLOCKQUOTE</strong> when
-line-numbering either of them on a case by case basis.
+As soon as QUOTE or BLOCKQUOTE is turned off, line numbering ceases,
+not only with respect to subsequent paragraph text (if they are
+not being line-numbered), but also for any subsequent invocation
+of <kbd>.QUOTE</kbd> or <kbd>.BLOCKQUOTE</kbd>.  In other words,
+you must re-enable quote or blockquote line-numbering inside every
+instance of QUOTE or BLOCKQUOTE when line-numbering either of them
+on a case by case basis.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="FOOTNOTE_INTRO"><h2><u>Footnotes</u></h2></a>
+<h2 id="footnote-intro" class="macro-group">Footnotes</h2>
 
 <ul>
-    <li><a href="#FOOTNOTE_BEHAVIOUR">Footnote behaviour</a></li>
-    <ul>
-        <li><a href="#FN_AND_PUNCT">Footnote markers and punctuation in the running text</a></li>
-    </ul>
-    <li><a href="#FOOTNOTE">Tag: FOOTNOTE</a></li>
-    <li><a href="#FOOTNOTE_CONTROL">FOOTNOTE control macros</a></li>
+  <li><a href="#footnote-behaviour">Footnote behaviour</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#fn-and-punct">Footnote markers and punctuation in the running text</a></li>
+  </ul></li>
+  <li><a href="#footnote">Tag: FOOTNOTE</a></li>
+  <li><a href="#footnote-control">Footnote control macros and defaults</a></li>
 </ul>
 
 <p>
 For something so complex behind the scenes, footnotes are easy to use.
-You just type, for example
-
-<a name="FOOTNOTE_EXAMPLE"></a>
-
-<pre>
-    ...the doctrines of Identity as urged by Schelling\c
-    .FOOTNOTE
-    &lt;footnote about who the hell is Schelling&gt;
-    .FOOTNOTE OFF
-     were generally the points of discussion presenting the most
-    of beauty to the imaginative Morella.
-</pre>
-
+You just type, for example,
+<br/>
+<span id="footnote-example" class="pre-in-pp">
+  ...the doctrines of Identity as urged by Schelling\c
+  .FOOTNOTE
+  &lt;footnote about who the hell is Schelling&gt;
+  .FOOTNOTE OFF
+  were generally the points of discussion presenting the most
+  of beauty to the imaginative Morella.
+</span>
 and be done with it.
-</p>
-
-<p>
 (Note the obligatory use of the <kbd>\c</kbd>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>.
-It is required when your
-<a href="#FOOTNOTE_MARKER_STYLE">FOOTNOTE_MARKER_STYLE</a>
-is either <strong>STAR</strong> [star/dagger footnotes] or
-<strong>NUMBER</strong> [superscript numbers]; it is NOT to be used
-when the <strong>FOOTNOTE_MARKER_STYLE</strong> is
-<strong>LINE</strong>, or when footnote markers have been disabled
-with
-<a href="#FOOTNOTE_MARKERS">.FOOTNOTE_MARKERS</a>
-<strong>OFF</strong>.)
-</p>
-
-<p>
-<strong>***Version 1.3-d change***</strong>
+<a href="definitions.html#inlines">inline escape</a>,
+required whenever your
+<a href="#footnote-marker-style">FOOTNOTE_MARKER_STYLE</a>
+is either <kbd>STAR</kbd> [star/dagger footnotes] or
+<kbd>NUMBER</kbd> [superscript numbers].)
 </p>
 
 <p>
-As of version 1.3-d, the manner of entering the line <em>after</em>
-<nobr><kbd>.FOOTNOTE OFF</kbd></nobr> has changed to accommodate
-users' differing wishes with respect to the order of punctuation and
-footnote markers.  Please see
-<a href="#FN_AND_PUNCT">Footnote markers and punctuation in the running text</a>
-for more information.
-</p>
-
-<p>
-<strong>***End of version 1.3-d change***</strong>
+After you invoke <kbd>.FOOTNOTE</kbd>, mom takes care of everything:
+putting footnote markers in the body of the document, keeping track
+of how many footnotes are on the page, identifying the footnotes
+themselves appropriately, balancing them properly with the bottom
+margin, deferring footnotes that don&#8217;t fit on the page...
+Even if you&#8217;re using
+<a href="docprocessing.html#columns">COLUMNS</a>,
+mom knows what to do, and Does The Right Thing.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+See
+<a href="refer.html">refer.html</a>
+for information on using footnotes with the <kbd>refer</kbd>
+bibliographic database.
 </p>
+</div>
 
-<p>
-After you invoke <kbd>.FOOTNOTE</kbd>, <strong>mom</strong>
-takes care of everything: putting footnote markers in the body of
-the document, keeping track of how many footnotes are on the page,
-identifying the footnotes themselves appropriately, balancing them
-properly with the bottom margin, deferring footnotes that don't fit
-on the page...  Even if you're using
-<a href="docprocessing.html#COLUMNS">COLUMNS</a>,
-<strong>mom</strong> knows what to do, and Does The Right Thing.
-</p>
+<h3 id="footnote-behaviour" class="docs">Footnote behaviour</h3>
 
 <p>
-Footnotes can be sly little beasts, though.  If you're writing a
-document that's footnote-heavy, you might want to read the following.
+Footnotes can be sly little beasts.  If you&#8217;re writing a
+document that&#8217;s footnote-heavy, you might want to read the
+following.
 </p>
 
-<a name="FOOTNOTE_BEHAVIOUR"><h3><u>Footnote behaviour</u></h3></a>
-
 <p>
-By default, <strong>mom</strong> marks footnotes with alternating
-stars (asterisks), daggers, and double-daggers.  The first footnote
-gets a star, the second a dagger, the third a double-dagger, the
-fourth two stars, the fifth two daggers, etc.  If you prefer
-numbered footnotes, rest assured <strong>mom</strong> is happy to
-oblige.
+By default, mom marks footnotes with alternating stars (asterisks),
+daggers, and double-daggers.  The first footnote gets a star, the
+second a dagger, the third a double-dagger, the fourth two stars,
+the fifth two daggers, etc.  If you prefer numbered footnotes, rest
+assured mom is happy to oblige.
 </p>
 
 <p>
 A small amount of vertical whitespace and a short horizontal rule
 separate footnotes from the document body.  The amount of whitespace
 varies slightly from page to page depending on the number of lines
-in the footnotes. <strong>Mom</strong> tries for a nice balance
-between too little whitespace and too much, but when push comes to
-shove, she'll usually opt for ample over cramped.  The last lines of
-footnotes are always flush with the document's bottom margin.
+in the footnotes. Mom tries for a nice balance between too little
+whitespace and too much, but when push comes to shove, she&#8217;ll
+usually opt for ample over cramped.  The last lines of footnotes are
+always flush with the document&#8217;s bottom margin.
 </p>
 
-<a name="FOOTNOTE_RULES"></a>
-
 <p>
-If <strong>mom</strong> sees that a portion of a footnote cannot
-be fit on its page, she carries that portion over to the next
-page.  If an entire footnote can't be fit on its page (i.e.
-<strong>FOOTNOTE</strong> has been called too close to the bottom),
-she defers the footnote to the next page, but sets it with the
-appropriate marker from the previous page.
+If mom sees that a portion of a footnote cannot be fit on its page,
+she carries that portion over to the next page.  If an entire
+footnote can&#8217;t be fit on its page (i.e.  FOOTNOTE has been
+called too close to the bottom), she defers the footnote to the next
+page, but sets it with the appropriate marker from the previous
+page.
 </p>
 
 <p>
 When footnotes occur within cited text, for example a
-<a href="#QUOTE">QUOTE</a>
+<a href="#quote">QUOTE</a>
 or a
-<a href="#BLOCKQUOTE">BLOCKQUOTE</a>,
-<strong>mom</strong> will usually opt for deferring the footnote
-over to the next page if it allows her to complete the cited text
-on one page.
+<a href="#blockquote">BLOCKQUOTE</a>,
+mom will usually opt for deferring the footnote over to the next
+page if it allows her to complete the cited text on one page.
 </p>
 
 <p>
 In the unfortunate happenstance that a deferred footnote is the
-only footnote on its page (i.e. it's marked in the document body with
-a star) and the page it's deferred to has its own footnotes,
-<strong>mom</strong> separates the deferred footnote from the page's
-proper footnote(s) with a blank line.  This avoids the confusion that
-might result from readers seeing two footnote entries on the same page
-identified by a single star (or the number 1 if you've requested
-numbered footnotes that begin at 1 on every page).  The blank line
-makes it clear that the first footnote entry belongs to the previous
-page.
+only footnote on its page (i.e. it&#8217;s marked in the document
+body with a star) and the page it&#8217;s deferred to has its own
+footnotes, mom separates the deferred footnote from the page&#8217;s
+proper footnote(s) with a blank line.  This avoids the confusion
+that might result from readers seeing two footnote entries on
+the same page identified by a single star (or the number 1 if
+you&#8217;ve requested numbered footnotes that begin at 1 on every
+page).  The blank line makes it clear that the first footnote entry
+belongs to the previous page.
 </p>
 
 <p>
 In the circumstance where a deferred footnote is not the only one
-on its page, and is consequently marked by something other than a
-single star, there's no confusion and <strong>mom</strong> doesn't
+on its page, and is consequently marked by something other than
+a single star, there&#8217;s no confusion and mom doesn&#8217;t
 bother with the blank line.  (By convention, the first footnote on
 a page is always marked with a single star, so if readers see, say,
-a dagger or double-dagger marking the first footnote entry, they'll
-know the entry belongs to the previous page).
+a dagger or double-dagger marking the first footnote entry,
+they&#8217;ll know the entry belongs to the previous page).
 </p>
 
 <p>
 Very exceptionally, two footnotes may have to be deferred (e.g. one
 occurs on the second to last line of a page, and another on the last
-line).  In such a circumstance, <strong>mom</strong> does not add
-a blank after the second deferred footnote.  If you'd like a blank
+line).  In such a circumstance, mom does not add
+a blank after the second deferred footnote.  If you&#8217;d like a blank
 line separating both deferred footnotes from any footnotes proper to
 the page the deferred ones were moved to, add the space manually by
 putting a
-<a href="typesetting.html#SPACE"><kbd>.SPACE</kbd></a>
-command at the end of the footnote text, before <nobr><kbd>.FOOTNOTE
-OFF</kbd></nobr> (or <strong>X, QUIT, EXIT, etc...</strong>).
+<a href="typesetting.html#space"><kbd>.SPACE</kbd></a>
+command at the end of the footnote text, before
+<kbd>.FOOTNOTE&nbsp;OFF</kbd> (or <kbd>X, QUIT, EXIT</kbd>, etc).
 </p>
 
 <p>
-Obviously, deferred footnotes aren't an issue if you request
+Obviously, deferred footnotes aren&#8217;t an issue if you request
 numbered footnotes that increase incrementally throughout the whole
-document &mdash; yet another convenience <strong>mom</strong> has
-thought of.
+document&mdash;yet another convenience mom has thought of.
 </p>
 
 <p>
-While <strong>mom</strong>'s handling of footnotes is sophisticated,
+While mom&#8217;s handling of footnotes is sophisticated,
 and tries to take nearly every imaginable situation under which they
 might occur into account, some situations are simply impossible from
 a typographic standpoint.  For example, if you have a
-<a href="#HEAD">HEAD</a>
-near the bottom of the page AND that page has some footnotes on it,
-<strong>mom</strong> may simply not have room to set any text under
-the head (normally, she insists on having room for at least one line
-of text beneath a head).  In such an instance, <strong>mom</strong>
-will either set the head, with nothing under it but footnotes, or
-transfer the head to the next page.  Either way, you'll have a
-gaping hole at the bottom of the page.  It's a sort of typographic
-Catch-22, and can only be resolved by you, the writer or formatter
-of the document, adjusting the type on the offending page so as to
-circumvent the problem.
-</p>
-
-<p>
-<strong>NOTE:</strong> Exceptionally, you may encounter problems
+<a href="#head">HEAD</a>
+near the bottom of a page and the page has some footnotes on it, mom
+may simply not have room to set any text under the head (normally,
+she insists on having room for at least one line of text beneath
+a head).  In such an instance, mom will either set the head, with
+nothing under it but footnotes, or transfer the head to the next
+page.  Either way, you&#8217;ll have a gaping hole at the bottom
+of the page.  It&#8217;s a sort of typographic Catch-22, and can
+only be resolved by you, the writer or formatter of the document,
+adjusting the type on the offending page so as to circumvent the
+problem.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Exceptionally, you may encounter problems
 with footnotes inside quotes and blockquotes that cross a page or
 column.  See
-<a href="#BREAK_QUOTE">BREAK_QUOTE</a>
+<a href="#break-quote">BREAK_QUOTE</a>
 for a solution.
 </p>
+</div>
 
-<a name="FN_AND_PUNCT"><h3><u>Footnote markers and punctuation in the running text</u></h3></a>
+<h3 id="fn-and-punct" class="docs">Footnote markers and punctuation in the running text</h3>
 
-<p>
-As of version 1.3-d, the manner of entering the line <em>after</em>
-<nobr><strong>.FOOTNOTE OFF</strong></nobr> has changed.
-</p>
+<ol style="margin-left: -1.25em;">
+  <li><a href="#fn-and-punct-fill">&#8220;Fill&#8221; modes &ndash; JUSTIFY, or QUAD LEFT | CENTER | RIGHT</a></li>
+  <li><a href="#fn-and-punct-nofill">&#8220;No-fill&#8221; modes &ndash; LEFT, CENTER, RIGHT</a></li>
+</ol>
 
-<a name="FN_AND_PUNCT_FILL"><h4><u>"Fill" modes &mdash; JUSTIFY, or QUAD LEFT | CENTER | RIGHT</u></h4></a>
+<h4 id="fn-and-punct-fill" class="docs">1. &#8220;Fill&#8221; modes &ndash; JUSTIFY, or QUAD LEFT | CENTER | RIGHT</h4>
 
 <p>
-In fill modes, the correct way to enter the line after
-<nobr><kbd>.FOOTNOTE OFF</kbd></nobr> is to input it as if it's
+In
+<a href="definitions.html#filled">fill</a>
+modes, the correct way to enter the line after
+<kbd>.FOOTNOTE&nbsp;OFF</kbd> is to input it as if it&#8217;s
 literally a continuation of the input line you were entering before
 you invoked <kbd>.FOOTNOTE</kbd>.  Therefore, if necessary, the
 input line may have to begin with space(s) or a punctuation mark, as
 in the two following examples.
-
-<pre>
-       Example 1
-       ---------
-    A line of text,\c
-    .FOOTNOTE
-    A footnote line.
-    .FOOTNOTE OFF
-     broken up with a comma.
-    ^
-    (last line begins with a literal space)
-
-       Example 2
-       ---------
-    A line of text\c
-    .FOOTNOTE
-    A footnote line.
-    .FOOTNOTE OFF
-    , broken up with a comma.
-    ^
-    (last line begins with a comma and a space)
-</pre>
 </p>
 
+<div id="examples-footnotes-1" class="examples-container" style="padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0; margin-bottom: -.25em;">Example 1</div>
+<span class="pre">
+A line of text,\c
+.FOOTNOTE
+A footnote line.
+.FOOTNOTE OFF
+ broken up with a comma.
+^
+(last line begins with a literal space)
+</span>
+</div>
+
+<div id="examples-footnotes-2" class="examples-container" style="margin-top: 1em; padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0; margin-bottom: -.25em;">Example 2</div>
+<span class="pre">
+A line of text\c
+.FOOTNOTE
+A footnote line.
+.FOOTNOTE OFF
+, broken up with a comma.
+^
+(last line begins with a comma and a space)
+</span>
+</div>
+
 <p>
 Example 1 produces, on output
-
-<pre>
-    A line of text,* broken up with a comma.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  A line of text,* broken up with a comma.
+</span>
 Example 2 produces
-
-<pre>
-    A line of text*, broken up with a comma.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  A line of text*, broken up with a comma.
+</span>
 Care must be taken, though, if the punctuation mark that begins the
-line after <nobr><strong>FOOTNOTE OFF</strong></nobr> is a period
-(dot).  You <strong><em>must</em></strong> begin such lines with
-<kbd>\&amp;.</kbd>, like this:
-
-<pre>
-    end of a sentence\c
-    .FOOTNOTE
-    A footnote line.
-    .FOOTNOTE OFF
-    \&amp;.  A new sentence...
-</pre>
-</p>
-
-<p>
+line after <kbd>.FOOTNOTE&nbsp;OFF</kbd> is a period (dot).  You
+<b><i>must</i></b> begin such lines with <kbd>\&amp;.</kbd>, like
+this:
+<br/>
+<span class="pre-in-pp">
+  ...end of sentence\c
+  .FOOTNOTE
+  A footnote line.
+  .FOOTNOTE OFF
+  \&amp;.  A new sentence...
+</span>
 If you omit the <kbd>\&amp;.</kbd>, the line will vanish!
 </p>
 
-<p>
-<strong>NOTE:</strong> The document element tags,
-<a href="#EPIGRAPH">EPIGRAPH</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The document element tags,
+<a href="#epigraph">EPIGRAPH</a>
 and
-<a href="#BLOCKQUOTE">BLOCKQUOTE</a>,
-imply a "fill" mode, therefore these instructions also apply when
-you insert a footnote into epigraphs or blockquotes.
+<a href="#blockquote">BLOCKQUOTE</a>,
+imply a fill mode, therefore these instructions also apply when you
+insert a footnote into epigraphs or blockquotes.
 </p>
+</div>
 
-<a name="FN_AND_PUNCT_NOFILL"><h4><u>"No-fill" modes &mdash; LEFT, CENTER, RIGHT</u></h4></a>
+<h4 id="fn-and-punct-nofill" class="docs">2. &#8220;No-fill&#8221; modes &ndash; LEFT, CENTER, RIGHT</h4>
 
 <p>
-In no-fill modes, you must decide a) whether text on the
-<em>input</em> line after <nobr><kbd>.FOOTNOTE OFF</kbd></nobr> is
-to be joined to the <em>output</em> line before <kbd>.FOOTNOTE</kbd>
-was invoked, or b) whether you want the <em>output</em> text to
-begin on a new line.
+In
+<a href="definitions.html#filled">no-fill</a>
+modes, you must decide a) whether text on the <i>input</i> line
+after <kbd>.FOOTNOTE&nbsp;OFF</kbd> is to be joined to the
+<i>output</i> line before <kbd>.FOOTNOTE</kbd> was invoked, or b)
+whether you want the <i>output</i> text to begin on a new line.
 </p>
 
 <p>
 In the first instance, simply follow the instructions,
-<a href="#FN_AND_PUNCT_FILL">above</a>,
+<a href="#fn-and-punct-fill">above</a>,
 for fill modes.
 </p>
 
 <p>
-In the second instance, you must explicitly tell
-<strong>mom</strong> that you want input text after
-<nobr><kbd>FOOTNOTE OFF</kbd></nobr> to begin on a new output
-line.  This is accomplished by passing <nobr><kbd>.FOOTNOTE
-OFF</kbd></nobr> (or <strong>QUIT, END, X,</strong> etc) an
+In the second instance, you must explicitly tell mom that
+you want input text after <kbd>.FOOTNOTE&nbsp;OFF</kbd> to
+begin on a new output line.  This is accomplished by passing
+<kbd>.FOOTNOTE&nbsp;OFF</kbd> (or <kbd>QUIT, END, X,</kbd> etc) an
 additional argument: <kbd>BREAK</kbd> or <kbd>BR</kbd>.
 </p>
 
 <p>
 Study the two examples below to understand the difference.
-
-<pre>
-    Example 1 &mdash; No-fill mode, FOOTNOTE OFF with no BREAK
-    -----------------------------------------------------
-    .LEFT
-    A line of text\c
-    .FOOTNOTE
-    A footnote line
-    .FOOTNOTE OFF
-    that carries on after the footnote.
-</pre>
-
-produces, on output
-
-<pre>
-    A line of text* that carries on after the footnote.
-</pre>
-
-whereas
-
-<pre>
-    Example 2 &mdash; No-fill mode, FOOTNOTE OFF with BREAK
-    --------------------------------------------------
-    .LEFT
-    A line of text\c
-    .FOOTNOTE
-    A footnote line
-    .FOOTNOTE OFF BREAK
-    that doesn't carry on after the footnote.
-</pre>
-
-produces the following on output:
-
-<pre>
-    A line of text*
-    that doesn't carry on after the footnote.
-</pre>
 </p>
 
-<p>
-The distinction becomes particularly important if you like to see
-punctuation marks come <em>after</em> footnote markers.  In no-fill
-modes, that's accomplished like this:
-
-<pre>
-    .LEFT
-    A line of text\c
-    .FOOTNOTE
-    A footnote line
-    .FOOTNOTE OFF
-    ,
-    broken up with a comma.
-</pre>
-</p>
+<div id="examples-footnotes-3" class="examples-container" style="padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0; margin-bottom: -.25em;">Example 1</div>
+<span class="pre">
+.LEFT
+A line of text\c
+.FOOTNOTE
+A footnote line
+.FOOTNOTE OFF
+that carries on after the footnote.
+</span>
+</div>
+
+<div id="examples-footnotes-4" class="examples-container" style="margin-top: 1em; padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0; margin-bottom: -.25em;">Example 2</div>
+<span class="pre">
+.LEFT
+A line of text\c
+.FOOTNOTE
+A footnote line
+.FOOTNOTE OFF BREAK
+that doesn&#8217;t carry on after the footnote.
+</span>
+</div>
 
 <p>
+Example 1, on output, produces
+<br/>
+<span class="pre-in-pp">
+  A line of text* that carries on after the footnote.
+</span>
+whereas Example 2 produces
+<span class="pre-in-pp">
+  A line of text*
+  that doesn&#8217;t carry on after the footnote.
+</span>
+The distinction becomes particularly important if you like to see
+punctuation marks come <i>after</i> footnote markers.  In no-fill
+modes, that&#8217;s accomplished like this:
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  A line of text\c
+  .FOOTNOTE
+  A footnote line
+  .FOOTNOTE OFF
+  ,
+  broken up with a comma.
+</span>
 The output of the above looks like this:
-
-<pre>
-    A line of text*,
-    broken up with a comma.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  A line of text*,
+  broken up with a comma.
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> The document element tag,
-<a href="#QUOTE">QUOTE</a>,
-implies a "no-fill" mode, therefore these
-instructions also apply when you insert footnotes into quotes.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The document element tag,
+<a href="#quote">QUOTE</a>,
+implies a no-fill mode, therefore these instructions also apply when
+you insert footnotes into quotes.
 </p>
+</div>
 
 <!-- -FOOTNOTE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="FOOTNOTE"></a>
+<div class="macro-id-overline">
+<h3 id="footnote" class="macro-id">FOOTNOTE</h3>
+</div>
+
+<div class="box-macro-args">
+Tag: FOOTNOTE <kbd class="macro-args">&lt;toggle&gt; [ BREAK | BR ] | INDENT LEFT | RIGHT | BOTH &lt;indent value&gt;</kbd>
+</div>
 
-<p>
-<nobr>Tag: <strong>FOOTNOTE</strong> <kbd>&lt;toggle&gt; [ BREAK | BR ] | INDENT LEFT | RIGHT | BOTH &lt;indent value&gt;</kbd></nobr>
-<br/>
-
-<em>*See <a href="#FOOTNOTE_NOTE">HYPER-IMPORTANT NOTE</a>!!!</em>
+<p class="requires">
+&bull;&nbsp;<kbd>&lt;indent value&gt;</kbd> requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 <br/>
-
-<kbd>&lt;indent value&gt;</kbd> <em>requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+See <span style="font-style: normal"><a href="#footnote-note">HYPER-IMPORTANT NOTE</a></span>.
 </p>
 
 <p>
-<strong>FOOTNOTE</strong> is a toggle macro, therefore invoking it
-on a line by itself allows you to enter a footnote in the body of a
-document.  Invoking it with any argument <em>other than INDENT</em>
-(i.e. <strong>OFF, QUIT, END, X...</strong>) tells <strong>mom</strong>
-you're finished.
+FOOTNOTE is a toggle macro, therefore invoking it on a line by
+itself allows you to enter a footnote in the body of a document.
+Invoking it with any argument other than INDENT (i.e. <kbd>OFF,
+QUIT, END, X...</kbd>) tells mom you&#8217;re finished.
 </p>
 
 <p>
 Footnotes are the only element of
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<a href="definitions.html#running">running text</a>
 that are not affected by the typesetting
-<a href="typesetting.html#INDENTS">indent macros</a>.
-In the unlikely event that you want a page's footnotes to line
-up with a running indent, invoke <kbd>.FOOTNOTE</kbd> with
+<a href="typesetting.html#indents">indent macros</a>.
+In the unlikely event that you want a page&#8217;s footnotes to
+line up with a running indent, invoke <kbd>.FOOTNOTE</kbd> with
 the <kbd>INDENT</kbd> argument and pass it an indent direction and
 indent value. <kbd>L, R,</kbd> and <kbd>B</kbd> may be used in place
-of <kbd>LEFT, RIGHT,</kbd> and <kbd>BOTH</kbd>. <kbd>FOOTNOTE</kbd>
-must be invoked with <kbd>.INDENT</kbd> for every footnote you want
-indented; <strong>mom</strong> does not save any footnote indent
-information from invocation to invocation.
+of <kbd>LEFT, RIGHT,</kbd> and <kbd>BOTH</kbd>. FOOTNOTE must be
+invoked with <kbd>INDENT</kbd> for every footnote you want indented;
+mom does not save any footnote indent information from invocation to
+invocation.
 </p>
 
-<p>
-<strong>NOTE:</strong> If a footnote runs to more than one
-paragraph(!), <strong>DO NOT</strong> begin the footnote with
-the
-<a href="#PP">PP</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If a footnote runs to more than one paragraph, do <i>not</i> begin
+the footnote with the
+<a href="#pp">PP</a>
 tag.  Use <kbd>.PP</kbd> only to introduce subsequent paragraphs.
 </p>
+</div>
 
-<p>
-<a name="FOOTNOTE_NOTE"><strong>HYPER-IMPORTANT NOTE:</strong></a>
+<div id="footnote-note" class="box-tip">
+<p class="tip-top">
+<span class="note">HYPER-IMPORTANT NOTE:</span>
 The final word on the
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
-that comes immediately before <strong>FOOTNOTE</strong> MUST terminate
-with a
-<a href="typesetting.html#JOIN"><kbd>\c</kbd></a>
+<a href="definitions.html#inputline">input line</a>
+that comes immediately before FOOTNOTE <i>must</i> terminate with a
+<kbd><a href="typesetting.html#join">\c</a></kbd>
 inline escape if your
-<a href="#FOOTNOTE_MARKER_STYLE">FOOTNOTE_MARKER_STYLE</a>
-is either <strong>STAR</strong> or <strong>NUMBER</strong>.
-See the
-<a href="#FOOTNOTE_EXAMPLE">footnote example</a>
+<a href="#footnote-marker-style">FOOTNOTE_MARKER_STYLE</a>
+is either <kbd>STAR</kbd> or <kbd>NUMBER</kbd>.  See the
+<a href="#footnote-example">footnote example</a>
 above.
 </p>
 
 <p>
 Additionally, in
-<a href="definitions.html#TERMS_FILLED">fill</a>
+<a href="definitions.html#filled">fill</a>
 modes
-<nobr>(<a href="typesetting.html#JUSTIFY">JUSTIFY</a></nobr>
+(<a href="typesetting.html#justify">JUSTIFY</a>
 or
-<a href="typesetting.html#QUAD">QUAD</a>),
-the line <em>after</em> a <nobr><kbd>.FOOTNOTE OFF</kbd></nobr>
-should be entered as if there were no interruption in the input
-text, i.e. the line should begin with a literal space or punctuation
-mark (see explanation and examples
-<a href="#FN_AND_PUNCT">here</a>).
+<a href="typesetting.html#quad">QUAD</a>),
+the line <i>after</i> a <kbd>.FOOTNOTE&nbsp;OFF</kbd> should be
+entered as if there were no interruption in the input text, i.e.
+the line should begin with a literal space or punctuation mark (see
+explanation and examples
+<a href="#fn-and-punct">here</a>).
 </p>
 
 <p>
 In
-<a href="definitions.html#TERMS_NOFILL">no-fill</a>
-modes, the optional argument <kbd>BREAK</kbd> or
-<kbd>BR</kbd> may be used after the <strong>OFF</strong> (or
-<strong>QUIT, END, X,</strong> etc.) argument to instruct
-<strong>mom</strong> NOT to join the next input line to the previous
-output.  See
-<a href="#FN_AND_PUNCT_NOFILL">here</a>
+<a href="definitions.html#filled">no-fill</a>
+modes, the optional argument <kbd>BREAK</kbd> or <kbd>BR</kbd> may
+be used after the <kbd>OFF</kbd> (or <kbd>QUIT, END, X,</kbd> etc.)
+argument to instruct mom not to join the next input line to the
+previous output.  See
+<a href="#fn-and-punct-nofill">here</a>
 for a more complete explanation, with examples.
 </p>
 
-<p>
-Do NOT use the <kbd>\c</kbd> inline escape if your
-<strong>FOOTNOTE_MARKER_STYLE</strong> is <strong>LINE</strong>, or
-if you have disabled footnote markers with
-<nobr><a href="#FOOTNOTE_MARKERS"><kbd>.FOOTNOTE_MARKERS</kbd></a> <kbd>OFF</kbd></nobr>.
-In these instances, the line after
-<nobr><strong>FOOTNOTE&nbsp;OFF</strong></nobr> should be entered normally.
-</p>
-
-<a name="FOOTNOTE_CONTROL"><h3><u>Footnote control macros</u></h3></a>
-
-<ol>
-    <li><a href="#FOOTNOTE_GENERAL">Family/font/size/colour/lead/quad</a></li>
-    <li><a href="#FOOTNOTE_MARKERS">Footnote markers</a> &mdash; on or off</li>
-    <li><a href="#FOOTNOTE_MARKER_STYLE">Footnote marker style</a> &mdash; star+dagger, numbered or by line number</li>
-    <ul>
-        <li><a href="#FOOTNOTE_LINENUMBER_BRACKETS">FOOTNOTE_LINENUMBER_BRACKETS</a></li>
-        <li><a href="#FOOTNOTE_LINENUMBER_SEPARATOR">FOOTNOTE_LINENUMBER_SEPARATOR</a></li>
-        <li><a href="#FOOTNOTES_RUN_ON">FOOTNOTES_RUN_ON</a>&mdash; line-numbered footnotes only</li>
-    </ul>
-    <li><a href="#RESET_FOOTNOTE_NUMBER">Reset footnote number</a> &mdash; set footnote marker number to 1</li>
-    <li><a href="#FOOTNOTE_SPACE">Inter-footnote spacing</a></li>
-    <li><a href="#FOOTNOTE_RULE">Footnote rule</a> &mdash; on or off</li>
-    <li><a href="#FOOTNOTE_RULE_LENGTH">Footnote rule length</a> &mdash; length of footnote separator rule</li>
-    <li><a href="#FOOTNOTE_RULE_WEIGHT">Footnote rule weight</a> &mdash; weight of footnote separator rule</li>
-    <li><a href="#FOOTNOTE_RULE_ADJ">Adjust vertical position of footnote separator rule</a></li>
+<p class="tip-bottom">
+Do not use the <kbd>\c</kbd> inline escape if your
+FOOTNOTE_MARKER_STYLE is <kbd>LINE</kbd>, or if you have disabled
+footnote markers with
+<kbd><a href="#footnote-markers">.FOOTNOTE_MARKERS OFF</a></kbd>.
+In these instances, the line after <kbd>.FOOTNOTE&nbsp;OFF</kbd>
+should be entered normally.
+</p>
+</div>
+
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="footnote-control" class="docs defaults">FOOTNOTE control macros macros and defaults</h3>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#footnote-general">Family/font/size/colour/lead/quad</a></li>
+  <li><a href="#footnote-markers">Footnote markers</a> &ndash; on or off</li>
+  <li><a href="#footnote-marker-style">Footnote marker style</a> &ndash; star+dagger or numbered
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#footnote-number-placeholders">Left padding of footnote numbers</a></li>
+  </ul></li>
+  <li><a href="#footnotes-by-linenumber">Footnotes by line number</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#footnote-linenumber-brackets">FOOTNOTE_LINENUMBER_BRACKETS</a></li>
+    <li><a href="#footnote-linenumber-separator">FOOTNOTE_LINENUMBER_SEPARATOR</a></li>
+    <li><a href="#footnotes-run-on">FOOTNOTES_RUN_ON</a> &ndash; line-numbered footnotes only</li>
+  </ul></li>
+  <li><a href="#reset-footnote-number">Reset footnote number</a> &ndash; set footnote marker number to 1</li>
+  <li><a href="#footnote-space">Inter-footnote spacing</a></li>
+  <li><a href="#footnote-rule">Footnote rule</a> &ndash; on or off</li>
+  <li><a href="#footnote-rule-length">Footnote rule length</a> &ndash; length of footnote separator rule</li>
+  <li><a href="#footnote-rule-weight">Footnote rule weight</a> &ndash; weight of footnote separator rule</li>
+  <li><a href="#footnote-rule-adj">Adjust vertical position of footnote separator rule</a></li>
 </ol>
+</div>
 
-<a name="FOOTNOTE_GENERAL"><h4><u>1. Family/font/size/colour/lead/quad</u></h4></a>
+<h4 id="footnote-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/colour/lead/quad</h4>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .FOOTNOTE_FAMILY    default = prevailing document family; default is Times Roman
 .FOOTNOTE_FONT      default = roman
 .FOOTNOTE_SIZE      default = -2 (points)
 .FOOTNOTE_COLOR     default = black
 .FOOTNOTE_AUTOLEAD  default = 2 points (typeset); single-spaced (typewrite)
 .FOOTNOTE_QUAD      default = same as paragraphs
-</pre>
+</span>
+</div>
 
-<a name="FOOTNOTE_MARKERS"><h4><u>2. Footnote markers &mdash; FOOTNOTE_MARKERS</u></h4></a>
+<h4 id="footnote-markers" class="docs" style="margin-top: -1.25em;">2. Footnote markers &ndash; FOOTNOTE_MARKERS</h4>
 
 <p>
-If you don't want footnote markers, in either the body of
-the document or beside footnote entries themselves, toggle
-them off with <nobr><kbd>.FOOTNOTE_MARKERS OFF</kbd></nobr> (or
-<strong>END, QUIT, X</strong>...).  This means, of course, that
-you'll have to roll your own.  If you want them back on, invoke
+If you don&#8217;t want footnote markers, in either the body of
+the document or beside footnote entries themselves, toggle them
+off with <kbd>.FOOTNOTE_MARKERS&nbsp;OFF</kbd> (or <kbd>END, QUIT,
+X</kbd>...).  This means, of course, that you&#8217;ll
+have to roll your own.  If you want them back on, invoke
 <kbd>.FOOTNOTE_MARKERS</kbd> with no argument.  Footnote markers are
 on by default.
 </p>
 
 <p>
-If <strong>FOOTNOTE_MARKERS</strong> are disabled, do NOT use
-the <kbd>\c</kbd> inline escape to terminate the line before
-<kbd>.FOOTNOTE</kbd>.
+If FOOTNOTE_MARKERS are disabled, do not use the <kbd>\c</kbd>
+inline escape to terminate the line before <kbd>.FOOTNOTE</kbd>.
 </p>
 
-<a name="FOOTNOTE_MARKER_STYLE"><h4><u>3. Footnote marker style &mdash; FOOTNOTE_MARKER_STYLE</u></h4></a>
+<h4 id="footnote-marker-style" class="docs" style="margin-top: -.25em;">3. Footnote marker style &ndash; FOOTNOTE_MARKER_STYLE</h4>
 
 <p>
-<strong>Mom</strong> gives you two choices of footnote marker style:
-star+dagger (see 
-<a href="#FOOTNOTE_BEHAVIOUR">footnote behaviour</a>
+Mom gives you two choices of footnote marker style: star+dagger (see
+<a href="#footnote-behaviour">footnote behaviour</a>
 above), or numbered.
 </p>
 
@@ -4034,335 +4148,421 @@
 <kbd>.FOOTNOTE_MARKER_STYLE NUMBER</kbd> gives you superscript
 numbers, both in the document body and in the footnote entries
 themselves.  By default, footnote numbers increase incrementally
-(prev. footnote number + 1) throughout the whole document.  You can
-ask <strong>mom</strong> to start each page's footnote numbers at 1
-with <kbd>.RESET_FOOTNOTE_NUMBER</kbd>
-(<a href="#RESET_FOOTNOTE_NUMBER">see below</a>.)
+(prev. footnote number + 1) throughout the whole document.  You
+can ask mom to start each page&#8217;s footnote numbers at 1 with
+<kbd>.RESET_FOOTNOTE_NUMBER</kbd>
+(<a href="#reset-footnote-number">see below</a>.)
+</p>
+
+<p>
+If your
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+is <kbd>TYPEWRITE</kbd> and you would prefer that the footnotes
+themselves not use superscript numbers, you may pass
+<kbd>.FOOTNOTE_MARKER_STYLE NUMBER</kbd> an additional argument:
+<kbd>NO_SUPERSCRIPT</kbd>.  While the marker in the text will still
+be superscript, the footnotes themselves will be identified with
+normal-sized, base aligned numbers, surrounded by parentheses.
+</p>
+
+<h5 id="footnote-number-placeholders" class="docs">Left padding of footnote numbers</h5>
+
+<p>
+When footnote numbering is enabled, in order to ensure that the
+left margin of footnote text aligns regardless of the footnote
+number, you sometimes have to pad the footnote numbers.  This will
+be the case any time the footnote numbers change from 9 to 10 on
+the same page, or from 99 to 100.  Consider this scenario:
+<br/>
+<span class="pre-in-pp">
+  <sup>9</sup>&nbsp;Footnote text
+  <sup>10</sup>&nbsp;Footnote text
+  <sup>11</sup>&nbsp;Footnote text
+</span>
+As you can see, the left margins of the footnotes are not aligned.
+</p>
+
+<p>
+In order to correct this, use the macro
+<kbd>.FOOTNOTE_NUMBER_PLACEHOLDERS</kbd>, which takes a single
+argument: the number of placeholders in the longer digit.  For
+example, placed at an appropriate point in your input file,
+<kbd>.FOOTNOTE_NUMBER_PLACEHOLDERS&nbsp;2</kbd> causes the above
+example to come out like this:
+<br/>
+<span class="pre-in-pp">
+  <sup> 9</sup> Footnote text
+  <sup>10</sup> Footnote text
+  <sup>11</sup> Footnote text
+</span>
+Given the impossibility of knowing in advance when the number of
+placeholders required for footnote numbers will change, you must
+study your <i>output</i> file to determine where to insert this
+macro into your <i>input</i> file.
+</p>
+
+<p>
+Obviously, mom does not provide a default for
+<kbd>.FOOTNOTE_NUMBER_PLACEHOLDERS</kbd>.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>.FOOTNOTE_NUMBER_PLACEHOLDERS</kbd> affects both superscript
+footnote numbers, and, in
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+the normal, base-aligned numbers surrounded by parentheses that you
+get with
+<kbd>.FOOTNOTE_MARKER_STYLE&nbsp;NUMBER&nbsp;NO_SUPERSCRIPT</kbd>.
 </p>
+</div>
 
-<a name="FOOTNOTE_LINENUMBERS"></a>
+<h4 id="footnotes-by-linenumber" class="docs" style="margin-top: -.25em;">4. Footnotes by line number &ndash; FOOTNOTE_MARKER_STYLE LINE</h4> 
 
 <p>
-<kbd>.FOOTNOTE_MARKER_STYLE LINE</kbd> lets you have footnotes which
-are identified by line number, rather than by a marker in the text.
-(Note that
-<a href="#NUMBER_LINES">NUMBER_LINES</a>
+FOOTNOTE_MARKER_STYLE with the argument, <kbd>LINE</kbd> lets you
+have footnotes which are identified by line number, rather than by a
+marker in the text.  (Note that
+<a href="#number-lines">NUMBER_LINES</a>
 must be enabled in order to use this marker style.)
 </p>
 
 <p>
-With <strong>FOOTNOTE_MARKER_STYLE LINE</strong>,
-<strong>mom</strong> will identify footnotes either by single line
-numbers, or line ranges.  If what you want is a single line number,
-you need only invoke <kbd>.FOOTNOTE</kbd>, <em>without terminating
-the text line before it with</em> <kbd>\c</kbd>, at the appropriate
-place in running text.
+With FOOTNOTE_MARKER_STYLE <kbd>LINE</kbd>, mom will identify
+footnotes either by single line numbers, or line ranges.  If
+what you want is a single line number, you need only invoke
+<kbd>.FOOTNOTE</kbd>, <i>without the terminating</i> <kbd>\c</kbd>,
+at the appropriate place in running text.  Input lines after the
+footnote has been terminated (e.g. with <kbd>.FOOTNOTE OFF</kbd>)
+must begin at the left margin.
 </p>
 
 <p>
 If you want a range of line numbers (e.g.&nbsp;[5-11]&nbsp;),
-insert, directly into the first line of the range you want, the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<kbd>\*[FN-MARK]</kbd>.  For the terminating line number of
-the range, you need only invoke <kbd>.FOOTNOTE</kbd>, (again,
-without attaching <kbd>\c</kbd> to the text line before it).
-<strong>Mom</strong> is smart enough to figure out that where
-<kbd>.FOOTNOTE</kbd> was invoked represents the terminating
+insert, directly into the first line of the range you want,
+the <a href="definitions.html#inlines">inline escape</a>,
+<kbd>\*[FN_MARK]</kbd>.  For the terminating line number of the
+range, you need only invoke <kbd>.FOOTNOTE</kbd> (again, without the
+terminating <kbd>\c</kbd>); mom is smart enough to figure out that
+where <kbd>.FOOTNOTE</kbd> was invoked represents the terminating
 line number.  Range-numbered footnotes are always output on the
 page where <kbd>.FOOTNOTE</kbd> was invoked, not the page where
-<kbd>\*[FN-MARK]</kbd> appears (subject, of course, to the rules for
+<kbd>\*[FN_MARK]</kbd> appears (subject, of course, to the rules for
 footnotes that fall too close to the bottom of a page, as outlined
-<a href="#FOOTNOTE_RULES">here</a>).
+<a href="#footnote-rules">here</a>).
 </p>
 
-<a name="FOOTNOTE_LINENUMBER_BRACKETS"></a>
-
 <p>
-<strong>Mom</strong>, by default, puts footnote line numbers inside
-square brackets.  The style of the brackets may be changed with
-the macro, <strong>FOOTNOTE_LINENUMBER_BRACKETS</strong>, which
-takes one of three possible arguments: <kbd>PARENS</kbd> ("round"
-brackets), <kbd>SQUARE</kbd> (the default) or <kbd>BRACES</kbd>
-(curly braces).  If you prefer a shortform, the arguments,
-<kbd>(</kbd>, <kbd>[</kbd> or <kbd>{</kbd> may be used instead.
+The behaviour of line-numbered footnotes can be controlled with the
+macros:
+<br/>
+<span style="display: inline-block; margin-left: 2em; margin-top: .5em;"><a href="#footnote-linenumber-brackets">FOOTNOTE_LINENUMBER_BRACKETS</a></span>
+<br/>
+<span style="margin-left: 2em;"><a href="#footnote-linenumber-separator">FOOTNOTE_LINENUMBER_SEPARATOR</a></span>
+<br/>
+<span style="margin-left: 2em;"><a href="#footnotes-run-on">FOOTNOTES_RUN_ON</a></span>
 </p>
 
-<a name="FOOTNOTE_LINENUMBER_SEPARATOR"></a>
+<div style="margin-left: 1.25em;">
+<h5 id="footnote-linenumber-brackets" class="docs" style="margin-top: -.25em;">&bull;&nbsp;FOOTNOTE_LINENUMBER_BRACKETS</h5>
 
-<p>
-If you don't want the numbers enclosed in brackets, you may tell
-<strong>mom</strong> to use a "separator" instead.  A common
-separator would be the colon, but it can be anything you like.  The
-macro to do this is <strong>FOOTNOTE_LINENUMBER_SEPARATOR</strong>,
+<p style="margin-left: .5em;">
+Mom, by default, surrounds footnote line numbers with square
+brackets.  The style of the brackets may be changed with the macro,
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_LINENUMBER_BRACKETS
+</span>
+which takes one of three possible arguments: <kbd>PARENS</kbd>
+(round brackets), <kbd>SQUARE</kbd> (the default) or
+<kbd>BRACES</kbd> (curly braces).  If you prefer a shortform, the
+arguments, <kbd>(</kbd>, <kbd>[</kbd> or <kbd>{</kbd> may be used
+instead.
+</p>
+
+<p style="margin-left: .5em;">Thus, for example, either
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_LINENUMBER_BRACKETS PARENS
+</span>
+or
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_LINENUMBER_BRACKETS (
+</span>
+will surround footnote line numbers with round brackets.
+</p>
+
+<h5 id="footnote-linenumber-separator" class="docs" style="margin-top: -.25em;">&bull;&nbsp;FOOTNOTE_LINENUMBER_SEPARATOR</h5>
+
+<p style="margin-left: .5em;">
+If you don&#8217;t want the numbers enclosed in brackets, you
+may tell mom to use a &#8220;separator&#8221; instead.  A common
+separator would be the colon, but it can be anything you like.
+The macro to do this is
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_LINENUMBER_SEPARATOR
+</span>
 which takes, as its single argument, the separator you want.  For
-safety and consistency's sake, ALWAYS enclose the argument in
-double-quotes.
+safety and consistency&#8217;s sake, always enclose the argument in
+double-quotes.  The separator can be composed of any valid groff
+character, or any combination of characters.
 </p>
 
-<p>
-The separator can be composed of any valid groff character, or any
-combination of characters. <strong>A word of caution:</strong> when
-using a separator, <strong>mom</strong> doesn't insert a space
-after the separator.  Hence, if you want the space (you probably
-do), you must make the space part of the argument you pass to
-<strong>FOOTNOTE_LINENUMBER_SEPARATOR</strong>.  For example,
-to get a colon separator with a space after it, you'd do
-
-<pre>
-    .FOOTNOTE_LINENUMBER_SEPARATOR ": "
-</pre>
-</p>
-
-<a name="FOOTNOTES_RUN_ON"><h5><u>RUN-ON FOOTNOTES</u></h5></a>
-
-<p>
-Finally, if your footnote marker style is <strong>LINE</strong>, you
-may instruct <strong>mom</strong> to do "run-on style" footnotes.
-Run-on footnotes do not treat footnotes as discrete entities, i.e.
-on a line by themselves.  Rather, each footnote is separated from
-the footnote before it by a space, so that the footnotes on any
-given page form a continuous block, like lines in a paragraph.
-The macro to get <strong>mom</strong> to run footnotes on is
-<kbd>.FOOTNOTES_RUN_ON</kbd>.  Invoked by itself, it turns the
-feature on.  Invoked with any other argument (<strong>OFF</strong>,
-<strong>NO</strong>, etc.), it turns the feature off.  It is
-generally NOT a good idea to turn the feature on and off during the
-course of a single document.  If you do, <strong>mom</strong> will
-issue a warning if there's going to be a problem.  However, it is
-always perfectly safe to enable/disable the feature after
-<a href="rectoverso.html#COLLATE">COLLATE</a>.
+<p style="margin-left: .5em;">
+<b>A word of caution:</b> when using a separator, mom doesn&#8217;t
+insert any space after the separator.  Hence, if you want space
+(you probably do), you must make the space part of the argument you
+pass to FOOTNOTE_LINENUMBER_SEPARATOR.  For example, to get a colon
+separator with a space after it, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_LINENUMBER_SEPARATOR ": "
+</span>
 </p>
 
-<p>
-The usual reason for wanting run-on footnotes is that you're
-using them to hold many, short references.  (See
-<a href="refer.html#TOP">here</a>
-for instructions on using the <strong>groff</strong> program,
-<strong>refer</strong>, to set up references.)
+<h5 id="footnotes-run-on" class="docs" style="margin-top: -1em;">&bull;&nbsp;FOOTNOTES_RUN_ON</h5>
+
+<p style="margin-left: .5em;">
+Finally, if your footnote marker style is <kbd>LINE</kbd>, you may
+instruct mom to do &#8220;run-on style&#8221; footnotes.  Run-on
+footnotes do not treat footnotes as discrete entities, i.e. each
+beginning on a new line.  Rather, each footnote is separated from
+the footnote before it by horizontal space in the running line, so
+that the footnotes on any given page form a continuous block, like
+lines in a paragraph.
 </p>
 
-<a name="RESET_FOOTNOTE_NUMBER"><h4><u>4. Reset footnote number &mdash; RESET_FOOTNOTE_NUMBER</u></h4></a>
+<p style="margin-left: .5em;">
+The macro to get mom to run footnotes on is
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTES_RUN_ON
+</span>
+Invoked by itself, it turns the feature on.  Invoked with any other
+argument (<kbd>OFF, NO</kbd>, etc.), it turns the feature off.
+It is generally not a good idea to turn the feature on and off
+during the course of a single document.  If you do, mom will issue
+a warning if there&#8217;s going to be a problem.  However, it is
+always perfectly safe to enable/disable the feature after
+<a href="rectoverso.html#collate">COLLATE</a>.
+</p>
+</div>
+
+<h4 id="reset-footnote-number" class="docs" style="margin-top: -.25em;">5. Reset footnote number &ndash; RESET_FOOTNOTE_NUMBER</h4>
 
 <p>
-<kbd>.RESET_FOOTNOTE_NUMBER</kbd>, by itself, resets
-footnote numbering so that the next footnote you enter is
-numbered 1.
+<kbd>.RESET_FOOTNOTE_NUMBER</kbd>, by itself, resets footnote
+numbering so that the next footnote you enter is numbered 1.
 </p>
 
 <p>
-<nobr><kbd>.RESET_FOOTNOTE_NUMBER PAGE</kbd></nobr> tells
-<strong>mom</strong> to start every page's footnote numbering at 1.
+<kbd>.RESET_FOOTNOTE_NUMBER&nbsp;PAGE</kbd> tells mom to start every
+page&#8217;s footnote numbering at 1.
 </p>
 
-<a name="FOOTNOTE_SPACE"><h4><u>5. Inter-footnote spacing &mdash; FOOTNOTE_SPACE</u></h4></a>
+<h4 id="footnote-space" class="docs" style="margin-top: -.25em;">6. Inter-footnote spacing &ndash; FOOTNOTE_SPACING</h4>
 
 <p>
-If you'd like a little extra space between footnotes, you can have
-<strong>mom</strong> put it in for you by invoking
-<kbd>.FOOTNOTE_SPACE</kbd> with an argument representing the
-amount of extra space you'd like.  The argument to
-<strong>FOOTNOTE_SPACE</strong> requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+If you&#8217;d like some space between footnotes, you can
+have mom put it in for you by invoking <kbd>.FOOTNOTE_SPACING</kbd>
+with an argument representing the amount of extra space you&#8217;d
+like.  The argument to FOOTNOTE_SPACING requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 </p>
 
 <p>
 In the following example, footnotes will be separated from each
 other by 3
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>.
+<a href="definitions.html#picaspoints">points</a>.
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_SPACING 3p
+</span>
+</p>
 
-<pre>
-    .FOOTNOTE_SPACE 3p
-</pre>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you&#8217;re using footnotes for references generated from the
+refer database (see
+<a href="refer.html">refer.html</a>),
+correct MLA style requires a full linespace between footnotes, which
+you can accomplish with <kbd>.FOOTNOTE_SPACING&nbsp;1v</kbd>.
 </p>
+</div>
 
-<a name="FOOTNOTE_RULE"><h4><u>6. Footnote rule &mdash; FOOTNOTE_RULE</u></h4></a>
+<h4 id="footnote-rule" class="docs" style="margin-top: -.25em;">7. Footnote rule &ndash; FOOTNOTE_RULE</h4>
 
 <p>
-If you don't want a footnote separator rule, toggle it off with
-<nobr><kbd>.FOOTNOTE_RULE OFF</kbd></nobr> (or <strong>END,
-QUIT, X</strong>...).  Toggle it back on by invoking
-<kbd>.FOOTNOTE_RULE</kbd> with no argument.  The default is to print
-the rule.
+If you don&#8217;t want a footnote separator rule, toggle it off with
+<kbd>.FOOTNOTE_RULE&nbsp;OFF</kbd> (or <kbd>END, QUIT, X</kbd>...).
+Toggle it back on by invoking <kbd>.FOOTNOTE_RULE</kbd> with no
+argument.  The default is to print the rule.
 </p>
 
-<a name="FOOTNOTE_RULE_LENGTH"><h4><u>7. Footnote rule length &mdash; FOOTNOTE_RULE_LENGTH</u></h4></a>
+<h4 id="footnote-rule-length" class="docs" style="margin-top: -.25em;">8. Footnote rule length &ndash; FOOTNOTE_RULE_LENGTH</h4>
 
 <p>
 If you want to change the length of the footnote separator rule,
-invoke <kbd>.FOOTNOTE_RULE_LENGTH</kbd> with a length, like
-this,
-
-<pre>
+invoke <kbd>.FOOTNOTE_RULE_LENGTH</kbd> with a length, like this,
+<br/>
+<span class="pre-in-pp">
     .FOOTNOTE_RULE_LENGTH 1i
-</pre>
+</span>
 
 which sets the length to 1 inch.  Note that a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 is required.  The default is 4
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>
+<a href="definitions.html#picaspoints">picas</a>
 for both
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLES</a>.
+<a href="docprocessing.html#printstyle">PRINTSTYLES</a>.
 </p>
 
-<a name="FOOTNOTE_RULE_WEIGHT"><h4><u>8. Footnote rule weight &mdash; FOOTNOTE_RULE_WEIGHT</u></h4></a>
+<h4 id="footnote-rule-weight" class="docs" style="margin-top: -.25em;">9. Footnote rule weight &ndash; FOOTNOTE_RULE_WEIGHT</h4>
 
 <p>
-If you want to change the weight (&quot;thickness&quot;) of the
+If you want to change the weight (&#8220;thickness&#8221;) of the
 footnote separator rule, invoke <kbd>.FOOTNOTE_RULE_WEIGHT</kbd>
 with the desired weight.  The weight is measured in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>;
-however, do NOT append the
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
+<a href="definitions.html#picaspoints">points</a>;
+however, do not append the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
 <kbd>p</kbd>, to the argument.
 </p>
 
 <p>
-<strong>Mom</strong>'s default footnote rule weight is 1/2 point.
-If you'd like a 1-point rule instead,
-<pre>
-    .FOOTNOTE_RULE_WEIGHT 1
-</pre>
-
-is how you'd get it.
+Mom&#8217;s default footnote rule weight is 1/2 point.  If
+you&#8217;d like a 1-point rule instead,<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_RULE_WEIGHT 1
+</span>
+is how you&#8217;d get it.
 </p>
 
-<a name="FOOTNOTE_RULE_ADJ"><h4><u>9. Adjust vertical position of footnote separator rule &mdash; FOOTNOTE_RULE_ADJ</u></h4></a>
+<h4 id="footnote-rule-adj" class="docs" style="margin-top: -.25em;">10. Adjust vertical position of footnote separator rule &ndash; FOOTNOTE_RULE_ADJ</h4>
 
 <p>
 The footnote separator rule is a rule whose bottom edge falls
-<em>on</em>
-the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+on the 
+<a href="definitions.html#baseline">baseline</a>
 (at the footnote
-<a href="definitions.html#TERMS_LEADING">leading</a>)
-one line above the first line of a page's footnotes.  By default,
-<strong>mom</strong> raises the rule 3
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-from the baseline so that the separator and the footnotes don't
-look jammed together.  If you'd prefer a different vertical
+<a href="definitions.html#leading">leading</a>)
+one line above the first line of a page&#8217;s footnotes.  By default,
+mom raises the rule 3
+<a href="definitions.html#picaspoints">points</a>
+from the baseline so that the separator and the footnotes don&#8217;t
+look jammed together.  If you&#8217;d prefer a different vertical
 adjustment, invoke <kbd>.FOOTNOTE_RULE_ADJ</kbd> with the
-amount you'd like.  For example
-
-<pre>
-    .FOOTNOTE_RULE_ADJ 4.25p
-</pre>
-
+amount you&#8217;d like.  For example
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_RULE_ADJ 4.25p
+</span>
 raises the rule by 4-1/4 points.  Note that you can only raise
 the rule, not lower it.  A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 is required.
 </p>
 
-<p>
-<strong>Tip:</strong> If your document
-<a href="definitions.html#TERMS_LEADING">leading</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your document
+<a href="definitions.html#leading">leading</a>
 is 2
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+<a href="definitions.html#picaspoints">points</a>
 or less (e.g your
-<a href="definitions.html#TERMS_PS">point size</a>
-is 10 and your linespacing is 10, 11, or 12), lowering
-<strong>mom</strong>'s default footnote rule adjustment will
-almost certainly give you nicer looking results than leaving
-the adjustment at the default.  Furthermore, you can invoke
-<kbd>.FOOTNOTE_RULE_ADJ</kbd> on any page in which footnotes
-appear, or in any column, so that the placement of the footnote rule
-can be changed on-the-fly, should you wish to do so.
+<a href="definitions.html#ps">point size</a>
+is 10 and your linespacing is 10, 11, or 12), lowering mom&#8217;s
+default footnote rule adjustment will almost certainly give you
+nicer looking results than leaving the adjustment at the default.
+Furthermore, you can invoke <kbd>.FOOTNOTE_RULE_ADJ</kbd> on any
+page in which footnotes appear, or in any column, so that the
+placement of the footnote rule can be changed on-the-fly, should you
+wish.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="ENDNOTE_INTRO"><h2><u>Endnotes</u></h2></a>
+<h2 id="endnote-intro" class="macro-group">Endnotes</h2>
 
-<ul>
-    <li><a href="#ENDNOTE_BEHAVIOUR">Endnote behaviour</a></li>
-    <ul>
-        <li><a href="#ENDNOTE_SPACING">A Note on Endnote Spacing</a></li>
-        <li><a href="#ENDNOTE_COLUMNS">Endnotes and columnar documents</a></li>
-    </ul>
-    <li><a href="#ENDNOTE">Tag: ENDNOTE</a></li>
-    <li><a href="#ENDNOTES">Macro: ENDNOTES</a> &mdash; tell <strong>mom</strong> to output endnotes</li>
-    <li><a href="#ENDNOTE_CONTROL">ENDNOTES control macros</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#endnote-behaviour">Endnotes behaviour</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnote-columns">Endnotes and columnar documents</a></li>
+  </ul></li>
+  <li><a href="#endnote">Tag: ENDNOTE</a></li>
+  <li><a href="#endnotes">Macro: <b>ENDNOTES</b></a>&mdash;tell mom to output endnotes</li>
+  <li><a href="#endnote-control">ENDNOTES control macros and defaults</a></li>
 </ul>
 
 <p>
-Embedding endnotes into <strong>mom</strong> documents is accomplished
-the same way as embedding
-<a href="#FOOTNOTE_INTRO">footnotes</a>.  The example below is
-identical to the one shown in the
-<a href="#FOOTNOTE_EXAMPLE">introduction to footnotes</a>,
+Embedding endnotes into mom documents is accomplished the same way
+as embedding
+<a href="#footnote-intro">footnotes</a>.
+The example below is identical to the one shown in the
+<a href="#footnote-example">introduction to footnotes</a>,
 except that <kbd>.FOOTNOTE</kbd> has been replaced with
 <kbd>.ENDNOTE</kbd>.
-
-<a name="ENDNOTE_EXAMPLE"></a>
-<pre>
-    ...the doctrines of Identity as urged by Schelling\c
-    .ENDNOTE
-    &lt;endnote about who the hell is Schelling&gt;
-    .ENDNOTE OFF
-     were generally the points of discussion presenting the most
-    of beauty to the imaginative Morella.
-</pre>
 </p>
 
+<div id="examples" class="examples-container" style="padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0; margin-bottom: -.25em;">Example</div>
+<span id="endnote-example" class="pre">
+  ...the doctrines of Identity as urged by Schelling\c
+  .ENDNOTE
+  &lt;endnote about who the hell is Schelling&gt;
+  .ENDNOTE OFF
+  were generally the points of discussion presenting the most
+  of beauty to the imaginative Morella.
+</span>
+</div>
+
 <p>
 As with footnotes, note the obligatory use of the <kbd>\c</kbd>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+<a href="definitions.html#inlines">inline escape</a>
 when your
-<a href="#ENDNOTE_MARKER_STYLE">ENDNOTE_MARKER_STYLE</a>
-is <strong>NUMBER</strong> (which marks endnotes references in
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<a href="#endnote-marker-style">ENDNOTE_MARKER_STYLE</a>
+is <kbd>NUMBER</kbd> or <kbd>SUPERSCRIPT</kbd> (both of which mark
+endnotes references in
+<a href="definitions.html#running">running text</a>
 with superscript numbers).  When the marker style is
-<strong>LINE</strong>, you must <em>not</em> use the <kbd>\c</kbd>
+<kbd>LINE</kbd>, you must <i>not</i> use the <kbd>\c</kbd>
 escape.
 </p>
 
 <p>
-<strong>***Version 1.3-d change***</strong>
-</p>
-
-<p>
-As of version 1.3-d, the manner of entering the line <em>after</em>
-<nobr><kbd>.ENDNOTE OFF</kbd></nobr> has changed to accommodate
-users' differing wishes with respect to the order of punctuation and
-endnote markers. <strong>Mom</strong> handles endnotes and footnotes
-identically in this regard, so please read the footnote section,
-<a href="#FN_AND_PUNCT">Footnote markers and punctuation in the running text</a>,
-for an explanation.
-</p>
-
-<p>
-<strong>***End version 1.3-d change***</strong>
-</p>
-
-<p>
 Endnotes differ from footnotes in two ways (other than the fact that
 endnotes come at the end of a document whereas footnotes appear in
 the body of the document):
 </p>
 
-<ol>
-    <li>When your <strong>ENDNOTE_MARKER_STYLE</strong> is
-        <strong>NUMBER</strong>, endnotes are always numbered
-        incrementally, starting at "1".
-    </li>
-    <li>Endnotes MUST be output explicitly; <strong>mom</strong> does
-        not output them for you.  In
-        <a href="rectoverso.html#COLLATE">collated</a>
-        documents, this allows you to choose whether you
-        want the endnotes to appear at the end of each chapter or
-        article in a document, or grouped together at the very end
-        of the document.
-    </li>
+<ol style="margin-top: -.5em;">
+  <li>When your ENDNOTE_MARKER_STYLE is <kbd>NUMBER</kbd> or
+      <kbd>SUPERSCRIPT</kbd>, endnotes are always numbered
+      incrementally, starting at &#8220;1&#8221;.
+  </li>
+  <li>Endnotes must be output explicitly; mom does not output
+      them for you.  In
+      <a href="rectoverso.html#collate">collated</a>
+      documents, this allows you to choose whether you want the
+      endnotes to appear at the end of each chapter or article in a
+      document, or grouped together at the very end of the document.
+  </li>
 </ol>
 
 <p>
 Within endnotes, you may use the document element tags
-<a href="#PP">PP</a>,
-<a href="#QUOTE">QUOTE</a>
+<a href="#pp">PP</a>,
+<a href="#quote">QUOTE</a>
 and
-<a href="#BLOCKQUOTE">BLOCKQUOTE</a>.
+<a href="#blockquote">BLOCKQUOTE</a>.
 This provides the flexibility to create endnotes that run to several
 paragraphs, as well as to embed cited text within endnotes.
 </p>
@@ -4370,191 +4570,185 @@
 <p>
 Should you wish to change the appearance of quotes or blockquotes
 that appear within endnotes, you may do so with the
-<a href="#QUOTE_CONTROL">quote control macros</a>
+<a href="#quote-control">quote control macros</a>
 or
-<a href="#BLOCKQUOTE_CONTROL">blockquote control macros</a>.
-HOWEVER...  you must make the changes <em>within</em> each endnote,
+<a href="#blockquote-control">blockquote control macros</a>.
+However, you must make the changes <i>within</i> each endnote,
 prior to invoking <kbd>.QUOTE</kbd> or <kbd>.BLOCKQUOTE</kbd>,
 and undo them prior to terminating the endnote (i.e. before
-<nobr><kbd>.ENDNOTE OFF</kbd>)</nobr>, otherwise the changes will
-affect subsequent quotes and blockquotes that appear in the document
-body as well.
+<kbd>.ENDNOTE&nbsp;OFF</kbd>), otherwise the changes will affect
+subsequent quotes and blockquotes that appear in the document body
+as well.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+See
+<a href="refer.html">refer.html</a>
+for information on using endnotes with the <kbd>refer</kbd>
+bibliographic database.
 </p>
+</div>
 
-<a name="ENDNOTE_BEHAVIOUR"><h3><u>Endnote behaviour</u></h3></a>
+<h3 id="endnote-behaviour" class="docs">Endnotes behaviour</h3>
 
 <p>
 When you output endnotes (with
-<a href="#ENDNOTES">ENDNOTES</a>),
-<strong>mom</strong> finishes processing the last page of your document,
-then breaks to a new page for printing the endnotes.  If the document
-type is
-<a href="docprocessing.html#DOCTYPE">CHAPTER</a>,
+<kbd><a href="#endnotes">.ENDNOTES</a></kbd>),
+mom finishes processing the last page of your document, then breaks
+to a new page for printing the endnotes.  If the document type is
+<kbd><a href="docprocessing.html#doctype">CHAPTER</a></kbd>,
 the centre part of the
-<a href="definitions.html#TERMS_HEADER">header</a>
+<a href="definitions.html#header">header</a>
 (or footer), which, by default, contains a chapter number or title,
 is removed.
 </p>
 
 <p>
-By default, <strong>mom</strong> starts the endnotes page with
-a bold, centred, double-underlined head, &quot;ENDNOTES&quot;.
-Underneath &mdash; flush left, bold, and underscored &mdash; she
-prints the document title (or, in the case of chapters, the chapter
-number or title).  She then prints the endnotes.  Each endnote is
-identified by its appropriate number, in bold, right aligned to two
-placeholders.  The text of the endnotes themselves is indented to
-the right of the numbers.
+By default, mom starts the endnotes page with a bold,
+centred, double-underscored head, &#8220;ENDNOTES&#8221;.
+Underneath&mdash;flush left, bold, and underscored&mdash;she prints
+the document title (or, in the case of chapters, the chapter number
+or title).  She then prints the endnotes.  Endnotes are identified
+by superscript numbers.  The text of the endnotes themselves is
+indented to the right of the numbers.
 </p>
 
 <p>
-If the endnotes are grouped together at the end of a collated document,
-each section of the document that contains endnotes is identified by its
-own unique title (or chapter number or title), bold, flush left, and
-underscored.
+If the endnotes are grouped together at the end of a collated
+document, each section of the document that contains endnotes is
+identified by its own unique title (or chapter number or title),
+bold, flush left, and underscored.
 </p>
 
 <p>
 Of course, all the defaults, as well as the overall style of the
-endnotes page, can be changed with the
-<a href="#ENDNOTE_CONTROL">endnote control macros</a>.
+endnotes pages, can be changed with the
+<a href="#endnote-control">endnote control macros</a>.
 The attentive will notice that endnotes have an awful lot of control
 macros.  This is because endnotes are like a mini-document unto
-themselves, and therefore need not be bound by the style parameters of
-the body of the document.
+themselves, and therefore need not be bound by the style parameters
+of the body of the document.
 </p>
 
-<a name="ENDNOTE_SPACING"><h3><u>A Note on Endnote Spacing</u></h3></a>
-
-<p>
-On the endnotes page(s), each new endnote is separated from the
-previous endnote by a full line space.  This can result in a bottom
-margin that hangs, and is the one instance, other than the use of
-<a href="#PP_SPACE">PARA_SPACE</a>,
-where <strong>mom</strong> allows unequal bottom alignment of pages.
-Should you wish to correct this, by adding or subtracting small amounts
-of space between endnotes that appear together on an endnotes page, make
-the adjustment (with
-<a href="typesetting.html#ALD">ALD</a>,
-<a href="typesetting.html#RLD">RLD</a>
-or
-<a href="typesetting.html#SPACE">SPACE</a>)
-<em>at the end of each endnote</em> (i.e. just before invoking
-<nobr><a href="#ENDNOTE"><kbd>.ENDNOTE OFF</kbd></a>)</nobr>
-rather than at the top.
-</p>
 
-<a name="ENDNOTE_COLUMNS"><h3><u>Endnotes and columnar documents</u></h3></a>
+<h3 id="endnote-columns" class="docs">Endnotes and columnar documents</h3>
 
 <p>
-Formerly (pre 1.1.6), there was no way to set a document in columns
-(see
-<a href="docprocessing.html#COLUMNS">COLUMNS</a>)
-and then turn off column mode for endnotes.  As of version 1.1.6,
-you may now do so.  See
-<a href="#ENDNOTES_NO_COLUMNS">ENDNOTES_NO_COLUMNS</a>.
+If your document is set in columns (see
+<a href="docprocessing.html#columns">COLUMNS</a>),
+mom gives you the option to have endnotes appear in either
+the column format or set to the full page width.  See
+<a href="#endnotes-no-columns">ENDNOTES_NO_COLUMNS</a>.
 </p>
 
 <!-- -ENDNOTE- -->
 
-<hr width="66%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="endnote" class="macro-id">ENDNOTE</h3>
+</div>
 
-<a name="ENDNOTE"></a>
-
-<p>
-<nobr>Macro: <strong>ENDNOTE</strong> <kbd>&lt;toggle&gt; [ BREAK | BR ]</kbd></nobr>
-<br/>
-
-<em>*See <a href="#ENDNOTE_NOTE">HYPER-IMPORTANT NOTE</a>!!!</em>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE</b> <kbd class="macro-args">&lt;toggle&gt; [ BREAK | BR ]</kbd>
+</div>
+<p class="requires">
+See <span style="font-style: normal"><a href="#endnote-note">HYPER-IMPORTANT NOTE</a></span>
 </p>
 
 <p>
-<strong>ENDNOTE</strong> is a toggle macro, therefore invoking it
-on a line by itself allows you to enter an endnote in the body of a
-document.  Invoking it with any other argument (i.e. <strong>OFF,
-QUIT, END, X...</strong>) tells <strong>mom</strong> that you've
-finished the endnote.
+ENDNOTE is a toggle macro, therefore invoking it on a line by itself
+allows you to enter an endnote in the body of a document.  Invoking
+it with any other argument (i.e. <kbd>OFF, QUIT, END, X...</kbd>)
+tells mom that you&#8217;ve finished the endnote.
 </p>
 
-<p>
-<strong>NOTE:</strong> If an endnote runs to more than one
-paragraph, <strong>DO NOT</strong> begin the endnote with the
-<a href="#PP">PP</a>
-tag.  Use <strong>PP</strong> only to introduce subsequent
-paragraphs.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If an endnote runs to more than one paragraph, do <i>not</i> begin
+the endnote with the
+<a href="#pp">PP</a>
+tag.  Use PP only to introduce subsequent paragraphs.
 </p>
+</div>
 
-<p>
-<a name="ENDNOTE_NOTE"><strong>HYPER-IMPORTANT NOTE:</strong></a>
+<div id="endnote-note" class="box-tip">
+<p class="tip-top">
+<span class="note">HYPER-IMPORTANT NOTE:</span>
 If your
-<a href="#ENDNOTE_MARKER_STYLE">ENDNOTE_MARKER_STYLE</a>
-is <strong>NUMBER</strong> (<strong>mom</strong>'s default), the
-final word on the
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
-that comes immediately before <kbd>.ENDNOTE</kbd> MUST
-terminate with a
-<a href="typesetting.html#JOIN"><kbd>\c</kbd></a>
+<a href="#endnote-marker-style">ENDNOTE_MARKER_STYLE</a>
+is <kbd>NUMBER</kbd> or <kbd>SUPERSCRIPT</kbd> (mom&#8217;s
+default is <kbd>NUMBER</kbd> unless you have
+<a href="refer.html#endnote-refs">ENDNOTE_REFS</a>
+enabled, in which case it&#8217;s <kbd>SUPERSCRIPT</kbd>), the final word on the
+<a href="definitions.html#inputline">input line</a>
+that comes immediately before <kbd>.ENDNOTE</kbd> must terminate
+with a
+<a href="typesetting.html#join"><kbd>\c</kbd></a>
 inline escape.  See the
-<a href="#ENDNOTE_EXAMPLE">endnote example</a>
+<a href="#endnote-example">endnote example</a>
 above.
 </p>
 
 <p>
 Additionally, in
-<a href="definitions.html#TERMS_FILLED">fill</a>
+<a href="definitions.html#filled">fill</a>
 modes
-(<a href="typesetting.html#JUSTIFY">JUSTIFY</a>
+(<a href="typesetting.html#justify">JUSTIFY</a>
 or
-<a href="typesetting.html#QUAD">QUAD</a>,
-the line <em>after</em> <nobr><kbd>.ENDNOTE OFF</kbd></nobr>
-should be entered as if there were no interruption in the input
-text, i.e. the line should begin with a literal space or punctuation
-mark (see explanation and examples
-<a href="#FN_AND_PUNCT">here</a>).
+<a href="typesetting.html#quad">QUAD</a>,
+the line after <kbd>.ENDNOTE&nbsp;OFF</kbd> should be
+entered as if there were no interruption in the input text, i.e.
+the line should begin with a literal space or punctuation mark (see
+explanation and examples for footnotes, which apply equally to
+endnotes,
+<a href="#fn-and-punct">here</a>).
 </p>
 
 <p>
 In
-<a href="definitions.html#TERMS_NOFILL">no-fill</a> modes, the
-optional argument <kbd>BREAK</kbd> or <kbd>BR</kbd> may be used
-after the <kbd>OFF</kbd> (or <strong>QUIT, END, X,</strong> etc.)
-argument to instruct <strong>mom</strong> NOT to join the next input
-line to the previous output.  See
-<a href="#FN_AND_PUNCT_NOFILL">here</a>
-for a more complete explanation, with examples.
-</p>
-
-<p>
-If your <strong>ENDNOTE_MARKER_STYLE</strong> is
-<strong>LINE</strong>, do NOT use the <kbd>\c</kbd> escape, and
-enter the line after <nobr><kbd>.ENDNOTE OFF</kbd></nobr>
-normally.
+<a href="definitions.html#filled">no-fill</a>
+modes, the optional argument <kbd>BREAK</kbd> or <kbd>BR</kbd> may
+be used after the <kbd>OFF</kbd> (or <kbd>QUIT, END, X,</kbd> etc.)
+argument to instruct mom not to join the next input line to the
+previous output.  See
+<a href="#fn-and-punct-nofill">here</a>
+for a more complete explanation.  The examples are for
+<kbd>.FOOTNOTE</kbd>, but apply equally to <kbd>.ENDNOTE</kbd>.
+</p>
+
+<p class="tip-bottom">
+If your ENDNOTE_MARKER_STYLE is LINE, do not use the <kbd>\c</kbd>
+escape, and enter the line after <kbd>.ENDNOTE OFF</kbd> normally,
+i.e. at your text editor&#8217;s left margin.
 </p>
+</div>
 
 <!-- -ENDNOTES- -->
 
-<hr width="33%" align="left"/>
-
-<a name="ENDNOTES"></a>
+<div class="macro-id-overline">
+<h3 id="endnotes" class="macro-id">ENDNOTES</h3>
+</div>
 
-<p>
-<a name="ENDNOTES">Tag: <strong>ENDNOTES</strong></a>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTES</b>
+</div>
 
 <p>
-Unlike footnotes, which <strong>mom</strong> automatically outputs
-at the bottom of pages, endnotes must be explicitly output by you,
-the user. <strong>ENDNOTES</strong>, by itself (i.e. without any
-argument), is the macro to do this.
+Unlike footnotes, which mom automatically outputs at the bottom
+of pages, endnotes must be explicitly output by you, the
+user. ENDNOTES, by itself (i.e. without any argument), is the macro
+to do this.
 </p>
 
 <p>
-Typically, you'll use <strong>ENDNOTES</strong> at the end of
-a document.  If it's a single (i.e. not collated) document,
-<strong>mom</strong> will print the endnotes pertaining to it.  If
-it's a collated document, <strong>mom</strong> will print all the
-endnotes contained within all sections of the document (typically
-chapters), appropriately identified and numbered.
+Typically, you&#8217;ll use ENDNOTES at the end of a document.  If
+it&#8217;s a single (i.e. not collated) document, mom will print
+the endnotes pertaining to it.  If it&#8217;s a collated document,
+mom will print all the endnotes contained within all sections of
+the document (typically chapters), appropriately identified and
+numbered.
 </p>
 
 <p>
@@ -4562,290 +4756,324 @@
 collated document at the ends of the sections (instead of at the
 very end of the document), simply invoke <kbd>.ENDNOTES</kbd>
 immediately prior to
-<a href="rectoverso.html#COLLATE">COLLATE</a>.
-<strong>Mom</strong> will print the endnotes, identified and
-numbered appropriately, on a separate page prior to starting
-the next section of the document.  Each subsequent invocation
-of <kbd>.ENDNOTES</kbd> outputs only those endnotes that
-<strong>mom</strong> collected after the previous invocation.
+<a href="rectoverso.html#collate">COLLATE</a>.
+Mom will print the endnotes, identified and numbered appropriately,
+on a separate page prior to starting the next section of the
+document.  Each subsequent invocation of <kbd>.ENDNOTES</kbd>
+outputs only those endnotes that mom collected after the previous
+invocation.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="ENDNOTE_CONTROL"><h3><u>Endnote control macros</u></h3></a>
-
-<h4><u>VERY IMPORTANT NOTE!</u></h4>
-
-<p>
-Endnote control macros must always be invoked prior to the first
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="endnote-control" class="docs defaults">ENDNOTES control macros and defaults</h3>
+
+<div class="box-important" style="width: 700px; margin: auto; background-color: #ded4bd;">
+<p class="tip-top" style="color: #000056;">
+<span class="important">Important:</span>
+Endnotes control macros must always be invoked prior to the first
 instance of
-<a href="#ENDNOTE"><nobr><kbd>.ENDNOTE / .ENDNOTE OFF</kbd></nobr></a>.
+<a href="#endnote"><kbd>.ENDNOTE</kbd></a>.
 </p>
 
-<p>
-When you embed endnotes in the body of a document,
-<strong>mom</strong> collects <em>and processes</em> them for later
-outputting (when you invoke
-<a href="#ENDNOTES"><kbd>.ENDNOTES</kbd></a>).
-By the time you do invoke <kbd>.ENDNOTES</kbd>, it's much too late
-to change your mind about how you want them to look.
-</p>
-
-<p>
-My advice?  If you're planning to change the default appearance of
-endnotes pages, set them up prior to
-<a href="docprocessing.html#START">START</a>.
-</p>
-
-<ol>
-    <li><a href="#ENDNOTES_GENERAL"><strong>General endnotes-pages style control</strong></a></li>
-        <ul>
-            <li><a href="#ENDNOTE_STYLE">Base family/font/quad for endnotes-pages</a></li>
-            <li><a href="#ENDNOTE_PT_SIZE">Base point size for the endnotes-pages</a></li>
-            <li><a href="#ENDNOTE_LEAD">Leading of endnotes-pages</a></li>
-            <li><a href="#SINGLESPACE_ENDNOTES">Singlespace endnotes (for TYPEWRITE only)</a></li>
-            <li><a href="#ENDNOTE_PARA_INDENT">Size of paragraph first line indent in multi-paragraph endnotes</a></li>
-            <li><a href="#ENDNOTE_PARA_SPACE">Inserting space between paragraphs of multi-paragraph endnotes</a></li>
-            <li><a href="#ENDNOTES_NO_COLUMNS">Turning off column mode during endnotes output</a></li>
-            <li><a href="#ENDNOTES_PAGINATION">Pagination of endnotes</a></li>
-            <ul>
-                <li><a href="#ENDNOTES_PAGENUM_STYLE">Endnotes-pages page numbering style</a></li>
-                <li><a href="#ENDNOTES_FIRST_PAGENUMBER">Setting the first page number of endnotes pages</a></li>
-                <li><a href="#ENDNOTES_NO_FIRST_PAGENUM">Omitting a page number on the first page of endnotes</a></li>
-            </ul>
-            <li><a href="#SUSPEND_PAGINATION">Suspending pagination of endnotes pages</a></li>
-        </ul>
-    <li><a href="#ENDNOTES_HEADER_CONTROL"><strong>Endnotes-page header/footer control</strong></a></li>
-        <ul>
-            <li><a href="#ENDNOTES_MODIFY_HDRFTR">Modifying what goes in the endnotes-pages header/footer</a></li>
-            <li><a href="#ENDNOTES_HDRFTR_CENTER">Enabling a header/footer centre when doctype is CHAPTER</a></li>
-            <li><a href="#ENDNOTES_ALLOWS_HEADERS">Allow headers on endnotes-pages</a></li>
-        </ul>
-    <li><a href="#ENDNOTES_MAIN_TITLE"><strong>Endnotes-page head (i.e. the title at the top) control</strong></a></li>
-        <ul>
-            <li><a href="#ENDNOTE_STRING">Creating/modifying the endnotes-page head</a></li>
-            <li><a href="#ENDNOTE_STRING_CONTROL">Endnotes-page head control</a></li>
-            <li><a href="#ENDNOTE_STRING_UNDERLINE">Endnotes-page head underlining</a></li>
-            <li><a href="#ENDNOTE_STRING_CAPS">Endnotes-page head capitalization</a></li>
-        </ul>
-    <li><a href="#ENDNOTES_DOC_TITLE"><strong>Endnote document-identification title</strong></a></li>
-        <ul>
-            <li><a href="#ENDNOTE_TITLE">Creating/modifying the endnote document-identification title</a></li>
-            <li><a href="#ENDNOTE_TITLE_CONTROL">Document-identification title control</a></li>
-            <li><a href="#ENDNOTE_TITLE_UNDERSCORE">Document-identification title underscoring</a></li>
-        </ul>
-    <li><a href="#ENDNOTES_NUMBERING"><strong>Endnotes-pages endnote numbering style</strong></a></li>
-        <ul>
-            <li><a href="#ENDNOTE_MARKER_STYLE">Endnote marker style</a> &mdash; by numbers in the text, or by line number</li>
-            <ul>
-                <li><a href="#ENDNOTE_LINENUMBER_GAP">ENDNOTE_LINENUMBER_GAP</a></li>
-                <li><a href="#ENDNOTE_LINENUMBER_BRACKETS">ENDNOTE_LINENUMBER_BRACKETS</a></li>
-                <li><a href="#ENDNOTE_LINENUMBER_SEPARATOR">ENDNOTE_LINENUMBER_SEPARATOR</a></li>
-            </ul>
-            <li><a href="#ENDNOTE_NUMBER_CONTROL">Endnotes-pages endnote numbering style control</a></li>
-            <li><a href="#ENDNOTE_NUMBER_ALIGNMENT">Endnote numbering alignment</a></li>
-            <ul>
-                <li><a href="#ENDNOTE_NUMBERS_ALIGN_RIGHT">ENDNOTE_NUMBERS_ALIGN_RIGHT</a></li>
-                <li><a href="#ENDNOTE_NUMBERS_ALIGN_LEFT">ENDNOTE_NUMBERS_ALIGN_LEFT</a></li>
-            </ul>
-        </ul>
+<p style="color: #000056; margin-top: -.5em;">
+When you embed endnotes in the body of a document, mom collects
+<i>and processes</i> them for later outputting (when you invoke
+<a href="#endnotes"><kbd>.ENDNOTES</kbd></a>).
+By the time you do invoke <kbd
+style="color: #000056;">.ENDNOTES</kbd>, it&#8217;s much too late to
+change your mind about how you want them to look.
+</p>
+
+<p class="tip-bottom" style="color: #000056; margin-top: -.5em;">
+My advice?  If you&#8217;re planning to change the default
+appearance of endnotes pages, set them up prior to
+<a href="docprocessing.html#start">START</a>.
+</p>
+</div>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#endnotes-general"><b>General endnotes style control</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnote-style">Base family/font/quad</a></li>
+    <li><a href="#endnote-pt-size">Base point size</a></li>
+    <li><a href="#endnote-lead">Leading</a></li>
+    <li><a href="#endnote-spacing">Spacing between endnotes</a></li>
+    <li><a href="#singlespace-endnotes">Singlespace endnotes (TYPEWRITE only)</a></li>
+    <li><a href="#endnote-para-indent">Paragraph indenting</a></li>
+    <li><a href="#endnote-para-space">Paragraph spacing</a></li>
+    <li><a href="#endnotes-no-columns">Turning off column mode during endnotes output</a></li>
+  </ul></li>
+  <li><a href="#endnotes-pagination"><b>Pagination of endnotes</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnotes-pagenum-style">Page numbering style</a></li>
+    <li><a href="#endnotes-first-pagenumber">Setting the first page number of endnotes</a></li>
+    <li><a href="#endnotes-no-first-pagenum">Omitting a page number on the first page of endnotes</a></li>
+    <li><a href="#suspend-pagination">Suspending pagination during endnotes output</a></li>
+  </ul></li>
+  <li><a href="#endnotes-header-control"><b>Header/footer control</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnotes-modify-hdrftr">Modifying what goes in the endnotes header/footer</a></li>
+    <li><a href="#endnotes-hdrftr-center">Header/footer centre string when doctype is CHAPTER</a></li>
+    <li><a href="#endnotes-allows-headers">Allow headers on endnotes pages</a></li>
+  </ul></li>
+  <li><a href="#endnotes-main-title"><b>Endnotes' first-page title control</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnote-string">Title string</a></li>
+    <li><a href="#endnote-string-control">Title string control macros and defaults</a></li>
+    <li><a href="#endnote-string-placement">Title string placement</a></li>
+    <li><a href="#endnote-string-underline">Title string underscoring</a></li>
+    <li><a href="#endnote-string-caps">Title string capitalization</a></li>
+  </ul></li>
+  <li><a href="#endnotes-doc-title"><b>Endnotes document-identification string control</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnote-title">Document-identification string(s)</a></li>
+    <li><a href="#endnote-title-control">Document-identification string control macros and defaults</a></li>
+    <li><a href="#endnote-title-underscore">Document-identification string underscoring</a></li>
+  </ul></li>
+  <li><a href="#endnotes-numbering"><b>Endnotes referencing style</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#endnote-marker-style">Endnote marker style</a> &ndash; by numbers in the text, or by line number
+    <ul style="margin-left: -.5em;">
+      <li><a href="#endnote-linenumber-gap">Spacing between line-numbered endnotes and the endnote text</a></li>
+      <li><a href="#endnote-linenumber-brackets">Brackets around endnote line numbers</a></li>
+      <li><a href="#endnote-linenumber-separator">Separator after endnote line numbers instead of brackets</a></li>
+    </ul></li>
+    <li><a href="#endnote-number-control">Endnote numbering control macros and defaults</a></li>
+    <li><a href="#endnote-number-alignment">Endnote numbering alignment</a></li>
+  </ul></li>
 </ol>
+</div>
 
-<a name="ENDNOTES_GENERAL"><h4><u>1. General endnotes page style control</u></h4></a>
+<h4 id="endnotes-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. General endnotes page style control</h4>
 
-<a name="ENDNOTE_STYLE"><h5>*<u>Endnote family/font/quad</u></h5></a>
+<h5 id="endnote-style" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Base family/font/quad</h5>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .ENDNOTE_FAMILY    default = prevailing document family; default is Times Roman
 .ENDNOTE_FONT      default = roman
 .ENDNOTE_QUAD*     default = justified
 
-*Note: ENDNOTE_QUAD must be set to either L or J
-</pre>
+*Note: ENDNOTE_QUAD must be set to either L (LEFT) or J (JUSTIFIED);
+ R (RIGHT) and C (CENTER) will not work.
+</span>
+</div>
 
 <!-- -ENDNOTE_PT_SIZE- -->
 
-<a name="ENDNOTE_PT_SIZE"><h5>*<u>Endnote point size</u></h5></a>
+<h5 id="endnote-pt-size" class="docs" style="margin-top: -1.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Base point size</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_PT_SIZE</strong> <kbd>&lt;base type size of endnotes&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_PT_SIZE</b> <kbd class="macro-args">&lt;base type size of endnotes&gt;</kbd>
+</div>
 
 <p>
 Unlike most other control macros that deal with size of document
-elements, <strong>ENDNOTE_PT_SIZE</strong> takes as its argument
-an absolute value, relative to nothing.  Therefore, the argument
-represents the size of endnote type in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
+elements, ENDNOTE_PT_SIZE takes as its argument an absolute value,
+relative to nothing.  Therefore, the argument represents the size of
+endnote type in
+<a href="definitions.html#picaspoints">points</a>,
 unless you append an alternative
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 For example,
-
-<pre>
-    .ENDNOTE_PT_SIZE 12
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_PT_SIZE 12
+</span>
 sets the base point size of type on the endnotes page to 12
 points, whereas
-
-<pre>
-    .ENDNOTE_PT_SIZE .6i
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_PT_SIZE .6i
+</span>
 sets the base point size of type on the endnotes page to 1/6 of an
 inch.
 </p>
 
 <p>
-The type size set with <strong>ENDNOTE_PT_SIZE</strong> is the size
-of type used for the text of the endnotes, and forms the basis from
-which the point size of other endnote page elements is calculated.
+The type size set with ENDNOTE_PT_SIZE is the size of type used for
+the text of the endnotes, and forms the basis from which the point
+size of other endnote page elements is calculated.
 </p>
 
 <p>
 The default for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>
 is 12.5 points (the same default size used in the body of the
 document).
 </p>
 
 <!-- -ENDNOTE_LEAD- -->
 
-<a name="ENDNOTE_LEAD"><h5>*<u>Endnote lead</u></h5></a>
+<h5 id="endnote-lead" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Leading</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_LEAD</strong> <kbd>&lt;base leading of endnotes&gt; [ ADJUST ] </kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_LEAD</b> <kbd class="macro-args">&lt;base leading of endnotes&gt; [ ADJUST ] </kbd>
+</div>
 
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>; points is assumed</em>
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>; points is assumed
 </p>
 
 <p>
 Unlike most other control macros that deal with leading of document
-elements, <strong>ENDNOTE_LEAD</strong> takes as its argument an
-absolute value, relative to nothing.  Therefore, the argument
-represents the
-<a href="definitions.html#TERMS_LEADING">leading</a>
+elements, ENDNOTE_LEAD takes as its argument an absolute value,
+relative to nothing.  Therefore, the argument represents the
+<a href="definitions.html#leading">leading</a>
 of endnotes in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+<a href="definitions.html#picaspoints">points</a>
 unless you append an alternative
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 For example,
-
-<pre>
-    .ENDNOTE_LEAD 14
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_LEAD 14
+</span>
 sets the base leading of type on the endnotes page to 14
 points, whereas
-
-<pre>
-    .ENDNOTE_LEAD .5i
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_LEAD .5i
+</span>
 sets the base leading of type on the endnotes page to 1/2 inch.
 </p>
 
 <p>
 If you want the leading of endnotes adjusted to fill the page, pass
-<strong>ENDNOTE_LEAD</strong> the optional argument
+ENDNOTE_LEAD the optional argument
 <kbd>ADJUST</kbd>.  (See
-<a href="docprocessing.html#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a>
+<a href="docprocessing.html#doc-lead-adjust">DOC_LEAD_ADJUST</a>
 for an explanation of leading adjustment.)
 </p>
 
 <p>
 The default for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-is 14 points, adjusted.
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>
+is the prevailing document leading (16 by default), adjusted.
 </p>
 
-<p>
-<strong>NOTE:</strong> Even if you give <strong>mom</strong>
-a <nobr><kbd>.DOC_LEAD_ADJUST OFF</kbd></nobr> command, she
-will still, by default, adjust endnote leading.  You MUST enter
-<nobr><kbd>.ENDNOTE_LEAD &lt;lead&gt;</kbd></nobr> with no
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Even if you give mom a <kbd>.DOC_LEAD_ADJUST&nbsp;OFF</kbd> command, she
+will still, by default, adjust endnote leading.  You <i>must</i>
+enter <kbd>.ENDNOTE_LEAD&nbsp;&lt;lead&gt;</kbd> with no
 <kbd>ADJUST</kbd> argument to disable this default behaviour.
 </p>
+</div>
 
-<!-- -SINGLESPACE_ENDNOTES- -->
+<!-- -ENDNOTE_SPACING- -->
 
-<a name="SINGLESPACE_ENDNOTES"><h5>*<u>Singlespace endnotes (TYPEWRITE only)</u></h5></a>
+<h5 id="endnote-spacing" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Spacing between endnotes</h5>
+
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_SPACING</b> <kbd class="macro-args">&lt;space to insert between endnotes&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
+
+<p>
+If you'd like some whitespace between endnotes, just invoke
+ENDNOTE_SPACING with the amount of space you want, e.g.
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_SPACING 6p
+</span>
+which inserts 6 points of lead between endnotes.  Be aware, though,
+that inserting space between endnotes means that the bottoms of
+endnotes pages will most likely not align.
+</p>
 
 <p>
-<nobr>Macro: <strong>SINGLESPACE_ENDNOTES</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
+Mom&#8217;s default is not to insert any whitespace between endnotes.
 </p>
 
+<!-- -SINGLESPACE_ENDNOTES- -->
+
+<h5 id="singlespace-endnotes" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Singlespace endnotes (TYPEWRITE only)</h5>
+
+<div class="box-macro-args">
+Macro: <b>SINGLESPACE_ENDNOTES</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
+
 <p>
 If your 
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a>
-is <strong>TYPEWRITE</strong> and you use TYPEWRITE's default
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+is <kbd>TYPEWRITE</kbd> and you use TYPEWRITE&#8217;s default
 double-spacing, endnotes are double-spaced.  If your document is
 single-spaced, endnotes are single-spaced.
 </p>
 
 <p>
-If, for some reason, you'd prefer that endnotes be single-spaced
-in an otherwise double-spaced document (including double-spaced
-<a href="rectoverso.html#COLLATE">collated</a>
-documents), invoke <kbd>.SINGLESPACE_ENDNOTES</kbd> with no
-argument.  And if, god help you, you want to change endnote
+If, for some reason, you&#8217;d prefer that endnotes be
+single-spaced in an otherwise double-spaced document (including
+double-spaced
+<a href="rectoverso.html#collate">collated</a>
+documents), invoke
+<br/>
+<span class="pre-in-pp">
+  .SINGLESPACE_ENDNOTES
+</span>
+with no argument.  And if, god help you, you want to change endnote
 single-spacing back to double-spacing for different spacing of
 endnotes output at the ends of separate documents in a collated
 document, invoke <kbd>.SINGLESPACE_ENDNOTES</kbd> with any argument
-(<strong>OFF, QUIT, Q, X</strong>...).
+(<kbd>OFF, QUIT, Q, X</kbd>...).
 </p>
 
 <!-- -ENDNOTE_PARA_INDENT- -->
 
-<a name="ENDNOTE_PARA_INDENT"><h5>*<u>Endnote paragraph indenting</u></h5></a>
+<h5 id="endnote-para-indent" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Paragraph indenting</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_PARA_INDENT</strong> <kbd>&lt;amount to indent first line of paragraphs in endnotes&gt;</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_PARA_INDENT</b> <kbd class="macro-args">&lt;amount to indent first line of paragraphs in endnotes&gt;</kbd>
+</div>
 
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>ENDNOTE_PARA_INDENT</strong> works exactly the same way as
-<a href="#PARA_INDENT">PARA_INDENT</a>,
+ENDNOTE_PARA_INDENT works exactly the same way as
+<a href="#para-indent">PARA_INDENT</a>,
 except that the indent given is the amount by which to indent the
 first lines of endnote paragraphs, not document body paragraphs.
 </p>
 
 <p>
 The default is 1.5
-<a href="definitions.html#TERMS_EM">ems</a>
+<a href="definitions.html#em">ems</a>
 for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>;
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>;
 1/2 inch for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>.
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>.
 </p>
 
-<p>
-<strong>NOTE:</strong> The first line of the first paragraph of
-endnotes (the one attached immediately to the identifying endnote
-number) is never indented.  Only subsequent paragraphs are affected
-by <strong>ENDNOTE_PARA_INDENT</strong>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The first line of the first paragraph of endnotes (the one attached
+immediately to the identifying endnote number) is never indented.
+Only subsequent paragraphs are affected by ENDNOTE_PARA_INDENT.
 </p>
+</div>
 
 <!-- -ENDNOTE_PARA_SPACE- -->
 
-<a name="ENDNOTE_PARA_SPACE"><h5>*<u>Endnote paragraph spacing</u></h5></a>
+<h5 id="endnote-para-space" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Paragraph spacing</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_PARA_SPACE</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_PARA_SPACE</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
-<strong>ENDNOTE_PARA_SPACE</strong> works exactly the same way as
-<a href="#PP_SPACE">PARA_SPACE</a>,
+ENDNOTE_PARA_SPACE works exactly the same way as
+<a href="#pp-space">PARA_SPACE</a>,
 except that it inserts a blank line between endnote paragraphs, not
 document body paragraphs.
 </p>
@@ -4855,121 +5083,118 @@
 endnotes.
 </p>
 
-<p>
-<strong>NOTE:</strong> Each endnote itself is always
-separated from any previous endnote by a line space.
-<strong>ENDNOTE_PARA_SPACE</strong> refers only to paragraphs that
-appear within each discrete endnote.
-</p>
-
 <!-- -ENDNOTES_NO_COLUMNS- -->
 
-<a name="ENDNOTES_NO_COLUMNS"><h5>*<u>Turning off column mode during endnotes output</u></h5></a>
+<h5 id="endnotes-no-columns" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Turning off column mode during endnotes output</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTES_NO_COLUMNS</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTES_NO_COLUMNS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
-By default, if your document is
-<a href="docprocessing.html#COLUMNS">set in columns</a>,
-<strong>mom</strong> sets the endnotes in columns, too.  However,
-if your document is set in columns and you'd like the endnotes not
-to be, just invoke <kbd>.ENDNOTES_NO_COLUMNS</kbd> with no argument.
+By default, if your document is set in
+<a href="docprocessing.html#columns">columns</a>,
+mom sets the endnotes in columns, too.  However, if your document
+is set in columns and you&#8217;d like the endnotes not to be,
+just invoke <kbd>.ENDNOTES_NO_COLUMNS</kbd> with no argument.
 The endnotes pages will be set to the full page measure of your
 document.
 </p>
 
 <p>
 If you output endnotes at the end of each document in a
-<a href="rectoverso.html#COLLATE">collated</a>
-document set in columns, column mode will automatically
-be reinstated for each document, even with
-<strong>ENDNOTES_NO_COLUMNS</strong> turned on.  In such
-circumstances, you must re-enable it for each collated document.
+<a href="rectoverso.html#collate">collated</a>
+document set in columns, column mode will automatically be
+reinstated for each document, even with ENDNOTES_NO_COLUMNS turned
+on.  In such circumstances, you must re-enable ENDNOTES_NO_COLUMNS
+for each separate collated document.
 </p>
 
-<a name="ENDNOTES_PAGINATION"><h5>*<u>Pagination of endnotes</u></h5></a>
+<h4 id="endnotes-pagination" class="docs" style="margin-bottom: .5em;">2. Pagination of endnotes</h4>
 
 <!-- -ENDNOTES_PAGENUM_STYLE- -->
 
-<a name="ENDNOTES_PAGENUM_STYLE"><h6><u>Endnotes-pages page numbering style</u></h6></a>
+<h5 id="endnotes-pagenum-style" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Page numbering style</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTES_PAGENUM_STYLE</strong> <kbd>DIGIT | ROMAN | roman | ALPHA | alpha</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTES_PAGENUM_STYLE</b> <kbd class="macro-args">DIGIT | ROMAN | roman | ALPHA | alpha</kbd>
+</div>
 
 <p>
 Use this macro to set the page numbering style of endnotes pages.
 The arguments are identical to those for
-<a href="headfootpage.html#PAGENUM_STYLE">PAGENUM_STYLE</a>.
+<a href="headfootpage.html#pagenum-style">PAGENUM_STYLE</a>.
 The default is <kbd>digit</kbd>.  You may want to change it to, say,
 <kbd>alpha</kbd>, which you would do with
-
-<pre>
-    .ENDNOTES_PAGENUM_STYLE alpha
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTES_PAGENUM_STYLE alpha
+</span>
 </p>
 
 <!-- -ENDNOTES_FIRST_PAGENUMBER- -->
 
-<a name="ENDNOTES_FIRST_PAGENUMBER"><h6><u>Setting the first page number of endnotes pages</u></h6></a>
+<h5 id="endnotes-first-pagenumber" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Setting the first page number of endnotes</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTES_FIRST_PAGENUMBER</strong> <kbd>&lt;page # that appears on page 1 of endnotes&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTES_FIRST_PAGENUMBER</b> <kbd class="macro-args">&lt;page # that appears on page 1 of endnotes&gt;</kbd>
+</div>
 
 <p>
 Use this macro with caution.  If all endnotes for several
-<a href="rectoverso.html#COLLATE">collated</a>
+<a href="rectoverso.html#collate">collated</a>
 documents are to be output at once, i.e. not at the end of each
-separate doc, <strong>ENDNOTES_FIRST_PAGENUMBER</strong> tells
-<strong>mom</strong> what page number to put on the first page of
-the endnotes.
+separate doc, ENDNOTES_FIRST_PAGENUMBER tells mom what page number
+to put on the first page of the endnotes.
 </p>
 
 <p>
-If you set <strong>ENDNOTES_FIRST_PAGENUMBER</strong> in collated
-documents where the endnotes are output after each separate doc,
-you have to reset every separate document's first page number after
-<a href="rectoverso.html#COLLATE">COLLATE</a>
+However, if you set ENDNOTES_FIRST_PAGENUMBER in collated documents
+in which the endnotes are output after each section (chapter,
+article, etc), you have to reset every section&#8217;s first page
+number after
+<a href="rectoverso.html#collate">COLLATE</a>
 and before
-<a href="docprocessing.html#START">START</a>.
+<a href="docprocessing.html#start">START</a>
+with
+<a href="headfootpage.html#pagenumber">PAGENUMBER</a>.
 </p>
 
 <!-- -ENDNOTES_NO_FIRST_PAGENUN- -->
 
-<a name="ENDNOTES_NO_FIRST_PAGENUM"><h6><u>Omitting a page number on the first page of endnotes</u></h6></a>
+<h5 id="endnotes-no-first-pagenum" class="docs" style="margin-top: -.25em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Omitting a page number on the first page of endnotes</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTES_NO_FIRST_PAGENUM</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTES_NO_FIRST_PAGENUM</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
-This macro is for use only if <strong>FOOTERS</strong> are on.  It
-tells
-<a href="#ENDNOTES">ENDNOTES</a>
-not to print a page number on the first endnotes page.
-<strong>Mom</strong>'s default is to print the page number.
+This macro is for use only if
+<a href="headfootpage.html#footers">FOOTERS</a>
+are on.  It tells
+<a href="#endnotes">ENDNOTES</a>
+not to print a page number on the first endnotes page.  Mom&#8217;s
+default is to print the page number.
 </p>
 
 <!-- -SUSPEND_PAGINATION- -->
 
-<a name="SUSPEND_PAGINATION"><h6><u>Suspending pagination of endnotes pages</u></h6></a>
+<h5 id="suspend-pagination" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Suspending pagination during endnotes output</h5>
 
-<p>
-Macro: <strong>SUSPEND_PAGINATION</strong>
-<br/>
+<div class="box-macro-args" style="margin-bottom: 1em;">
+Macro: <b>SUSPEND_PAGINATION</b>
+</div>
 
-Macro: <strong>RESTORE_PAGINATION</strong>
-</p>
+<div class="box-macro-args">
+Macro: <b>RESTORE_PAGINATION</b>
+</div>
 
 <p>
-<strong>SUSPEND_PAGINATION</strong> doesn't take an argument.
-Invoked immediately prior to
-<a href="#ENDNOTES">ENDNOTES</a>,
-it turns off endnotes pages pagination.  <strong>Mom</strong>
-continues, however to increment page numbers silently.
+SUSPEND_PAGINATION doesn&#8217;t take an argument.  Invoked
+immediately prior to
+<a href="#endnotes">ENDNOTES</a>,
+it turns off endnotes pages pagination.  Mom continues, however to
+increment page numbers silently.
 </p>
 
 <p>
@@ -4978,784 +5203,891 @@
 after <kbd>.ENDNOTES</kbd>.
 </p>
 
-<a name="ENDNOTES_HEADER_CONTROL"><h4><u>2. Endnotes-page header/footer control</u></h4></a>
+<h4 id="endnotes-header-control" class="docs" style="margin-bottom: .5em;">3. Header/footer control</h4>
+
+<h5 id="endnotes-modify-hdrftr" class="docs" style="margin-top: 0; margin-bottom: -.75em; margin-left: .5em;">&bull;&nbsp;Modifying what goes in the endnotes header/footer</h5>
 
 <p>
-<a name="ENDNOTES_MODIFY_HDRFTR"></a>
 If you wish to modify what appears in the header/footer that appears
 on endnotes page(s), make the changes before you invoke
-<a href="#ENDNOTES"><kbd>.ENDNOTES</kbd></a>,
+<a href="#endnotes"><kbd>.ENDNOTES</kbd></a>,
 not afterwards.
 </p>
 
 <p>
 Except in the case of
-<a href="docprocessing.html#DOCTYPE">DOCTYPE CHAPTER</a>,
-<strong>mom</strong> prints the same header or footer used
-throughout the document on the endnotes page(s).  Chapters get
-treated differently in that, by default, <strong>mom</strong> does
-not print the header/footer centre string (normally the chapter
-number or chapter title.)  In most cases, this is what you want.
-However, should you <em>not</em> want <strong>mom</strong> to remove
+<a href="docprocessing.html#doctype">DOCTYPE <kbd>CHAPTER</kbd></a>,
+mom prints the same header or footer used throughout the document
+on the endnotes page(s).  Chapters get treated differently in that,
+by default, mom does not print the header/footer centre string
+(normally the chapter number or chapter title.)  In most cases, this
+is what you want.  However, should you not want mom to remove
 the centre string from the endnotes page(s) headers/footers, invoke
-<a href="#ENDNOTES_HDRFTR_CENTER"><kbd>.ENDNOTES_HEADER_CENTER</kbd></a>
+<kbd><a href="#endnotes-hdrftr-center">.ENDNOTES_HEADER_CENTER</a></kbd>
 with no argument. 
 </p>
 
 <p>
 An important change you may want to make is to put the word
-&quot;Endnotes&quot; in the header/footer centre position.
-To do so, do
-
-<pre>
-    .HEADER_CENTER "Endnotes"
-               or
-    .FOOTER_CENTER "Endnotes"
-</pre>
-
-prior to invoking <kbd>.ENDNOTES</kbd>.  If your
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>
-is <strong>CHAPTER</strong>, you must also invoke
-<a href="#ENDNOTES_HDRFTR_CENTER">ENDNOTES_HEADER_CENTER</a>
-for the <strong>HEADER_CENTER</strong> to appear.
+&#8220;Endnotes&#8221; in the header/footer centre position.  To do
+so, invoke
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .HEADER_CENTER "Endnotes"
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .FOOTER_CENTER "Endnotes"
+</span>
+prior to invoking <kbd>.ENDNOTES</kbd>.
 </p>
 
-<a name="ENDNOTES_HDRFTR_CENTER"><h5>*<u>Endnotes page(s) header/footer centre string</u></h5></a>
-
-<p>
-<nobr>Macro: <strong>ENDNOTES_HEADER_CENTER</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your
+<a href="docprocessing.html#doctype">DOCTYPE</a>
+is <kbd>CHAPTER</kbd>, you must also invoke
+<a href="#endnotes-hdrftr-center">ENDNOTES_HEADER_CENTER</a>
+for the ENDNOTES_HEADER_CENTER to appear.
+</p>
+</div>
+
+<h5 id="endnotes-hdrftr-center" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Header/footer centre string when doctype is CHAPTER</h5>
+
+<div class="box-macro-args">
+Macro: <b>ENDNOTES_HEADER_CENTER</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 If your
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>
-is <strong>CHAPTER</strong> and you want <strong>mom</strong>
-to include a centre string in the headers/footers that appear
-on endnotes pages, invoke <kbd>.ENDNOTES_HEADER_CENTER</kbd>
-(or <kbd>.ENDNOTES_FOOTER_CENTER</kbd>) with no argument.
-<strong>Mom</strong>'s default is NOT to print the centre string.
+<a href="docprocessing.html#doctype">DOCTYPE</a>
+is <kbd>CHAPTER</kbd> and you want mom to include a centre
+string in the headers/footers that appear on endnotes
+pages, invoke <kbd>.ENDNOTES_HEADER_CENTER</kbd> (or
+<kbd>.ENDNOTES_FOOTER_CENTER</kbd>) with no argument.  Mom&#8217;s
+default is not to print the centre string.
 </p>
 
 <p>
 If, for some reason, having enabled the header/footer centre string
 on endnotes pages, you wish to disable it, invoke the same macro
-with any argument (<strong>OFF, QUIT, Q, X</strong>...).
-</p>
-
-<a name="ENDNOTES_ALLOWS_HEADERS"><h5>*<u>Allow headers on endnotes-pages</u></h5></a>
-
-<p>
-<nobr>Macro: <strong>ENDNOTES_ALLOWS_HEADERS</strong> <kbd>&lt;none&gt; | ALL</kbd></nobr>
+with any argument (<kbd>OFF, QUIT, Q, X</kbd>...).
 </p>
 
-<p>
-By default, if <strong>HEADERS</strong> are on, <strong>mom</strong>
-prints page headers on all endnotes pages except the first.  If you
-don't want her to print headers on endnotes pages, do
+<h5 id="endnotes-allows-headers" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Allow headers on endnotes pages</h5>
 
-<pre>
-    .ENDNOTES_ALLOWS_HEADERS OFF
-</pre>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTES_ALLOWS_HEADERS</b> <kbd class="macro-args">&lt;none&gt; | ALL</kbd>
+</div>
 
 <p>
-If you want headers on every page <em>including the first</em>, do
-
-<pre>
-    .ENDNOTES_ALLOWS_HEADERS ALL
-</pre>
+By default, if HEADERS are on, mom prints page headers on all
+endnotes pages except the first.  If you don&#8217;t want her to
+print headers on endnotes pages, do
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTES_ALLOWS_HEADERS OFF
+</span>
+If you want headers on every page including the first, do
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTES_ALLOWS_HEADERS ALL
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> If <strong>FOOTERS</strong> are on,
-<strong>mom</strong> prints footers on every endnotes page.  This is
-a style convention.  In <strong>mom</strong>, there is no such beast
-as <strong>ENDNOTES_ALLOWS_FOOTERS OFF</strong>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If FOOTERS are on, mom prints footers on every endnotes page.
+This is a style convention.  In mom, there is no such beast as
+ENDNOTES_ALLOWS_FOOTERS OFF.
 </p>
+</div>
 
-<a name="ENDNOTES_MAIN_TITLE"><h4><u>3. Endnotes first page header (title) control</u></h4></a>
+<h4 id="endnotes-main-title" class="docs">4. Endnotes' first-page title control</h4>
 
 <!-- -ENDNOTE_STRING- -->
 
-<a name="ENDNOTE_STRING"><h5>*<u>Endnotes first page header (title) string</u></h5></a>
+<h5 id="endnote-string" class="docs" style="margin-top: 1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_STRING</strong> <kbd>&quot;&lt;head to print at the top of endnotes&gt;&quot;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_STRING</b> <kbd class="macro-args">&quot;&lt;head to print at the top of endnotes&gt;&quot;</kbd>
+</div>
 
 <p>
-By default, <strong>mom</strong> prints the word
-&quot;ENDNOTES&quot; as a head at the top of the first page
-of endnotes.  If you want her to print something else, invoke
-<kbd>.ENDNOTE_STRING</kbd> with the endnotes-page head you want,
-surrounded by double-quotes.  If you don't want a head at the top
-of the first endnotes-page, invoke <kbd>.ENDNOTE_STRING</kbd> with
-a blank argument (either two double-quotes side by side &mdash;
-<kbd>&quot;&quot;</kbd> &mdash; or no argument at all).
+By default, mom prints the word &#8220;ENDNOTES&#8221; as a head
+at the top of the first page of endnotes.  If you want her to
+print something else, invoke <kbd>.ENDNOTE_STRING</kbd> with the
+endnotes-page head you want, surrounded by double-quotes.  If you
+don&#8217;t want a head at the top of the first endnotes-page,
+invoke <kbd>.ENDNOTE_STRING</kbd> with a blank argument (either two
+double-quotes side by side&mdash;<kbd>&quot;&quot;</kbd>&mdash;or no
+argument at all).
 </p>
 
 <!-- -ENDNOTE_STRING_CONTROL- -->
 
-<a name="ENDNOTE_STRING_CONTROL"><h5>*<u>Endnotes first page header (title) control</u></h5></a>
+<h5 id="endnote-string-control" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title control macros and defaults</h5>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
-.ENDNOTE_STRING_FAMILY    default = prevailing document family; default is Times Roman
-.ENDNOTE_STRING_FONT      default = bold
-.ENDNOTE_STRING_SIZE*     default = +1
-.ENDNOTE_STRING_QUAD      default = centred
+<span class="pre defaults">
+.ENDNOTE_STRING_FAMILY  default = prevailing document family; default is Times Roman
+.ENDNOTE_STRING_FONT    default = bold
+.ENDNOTE_STRING_SIZE*   default = +1
+.ENDNOTE_STRING_QUAD    default = centred
 
 *Relative to the size of the endnotes text (set with ENDNOTE_PT_SIZE)
-</pre>
+</span>
+</div>
 
 <!-- -ENDNOTE_STRING_ADVANCE- -->
 
-<a name="ENDNOTE_STRING_ADVANCE"><h5>*<u>Endnotes first page header (title) placement</u></h5></a>
+<h5 id="endnote-string-placement" class="docs" style="margin-top: -1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string placement</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_STRING_ADVANCE</strong> <kbd>&lt;distance from top of page&gt;</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_STRING_ADVANCE</b> <kbd class="macro-args">&lt;distance from top of page&gt;</kbd>
+</div>
 
-<em>*Argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measusure</a></em>
+<p class="requires">
+&bull;&nbsp;Argument requires a <a href="definitions.html#unitofmeasure">unit of measusure</a>
 </p>
 
 <p>
-By default, <strong>mom</strong> places the title (the docheader, as
-it were) of endnotes pages (typically "ENDNOTES") on the same
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+By default, mom places the title (the docheader, as it were) of
+endnotes pages (typically "ENDNOTES") on the same
+<a href="definitions.html#baseline">baseline</a>
 that is used for the start of
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-If you'd prefer another location, higher or lower on the page
+<a href="definitions.html#running">running text</a>.
+If you&#8217;d prefer another location, higher or lower on the page
 (thereby also raising or lowering the starting position of the
-endnotes themselves), invoke <kbd>.ENDNOTE_STRING_ADVANCE</kbd>
-with an argument stating the distance <em>from the top edge of the
-page</em> at which you'd like the title placed.
+endnotes themselves), invoke <kbd>.ENDNOTE_STRING_ADVANCE</kbd> with
+an argument stating the distance from the top edge of the page at
+which you&#8217;d like the title placed.
 </p>
 
 <p>
-The argument requires a unit of measure, so if you'd like the title
-to appear 1-1/2 inches from the top edge of the page, you'd tell
-<strong>mom</strong> about it like this:
-
-<pre>
-    .ENDNOTE_STRING_ADVANCE 1.5i
-</pre>
+The argument requires a unit of measure, so if you&#8217;d like the title
+to appear 1-1/2 inches from the top edge of the page, you&#8217;d tell
+mom about it like this:
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_STRING_ADVANCE 1.5i
+</span>
 </p>
 
 <!-- -ENDNOTE_STRING_UNDERLINE- -->
 
-<a name="ENDNOTE_STRING_UNDERLINE"><h5>*<u>Endnotes first page header (title) underlining</u></h5></a>
+<h5 id="endnote-string-underline" class="docs" style="margin-top: -1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string underscoring</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_STRING_UNDERLINE</strong> <kbd>[DOUBLE] [&lt;underline weight&gt; [&lt;underline gap&gt; [&lt;distance between double rules]]] | &lt;none&gt; | &lt;anything&gt;</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_STRING_UNDERSCORE</b> <kbd class="macro-args">[DOUBLE] [&lt;underscore weight&gt; [&lt;underscore gap&gt; [&lt;distance between double rules]]] | &lt;none&gt; | &lt;anything&gt;</kbd>
+</div>
 
-Alias: <strong>ENDNOTE_STRING_UNDERSCORE</strong>
-<br/>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>ENDNOTE_STRING_UNDERLINE</b>
+</p>
 
-<em>*The argument</em> <kbd>&lt;underline weight&gt;</kbd> <em>must</em> NOT <em>have the</em> <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>, <kbd>p</kbd>, <em>appended to it</em>
+<p class="requires">
+&bull;&nbsp;The argument
+<span style="font-style: normal"><kbd>&lt;underscore weight&gt;</kbd></span>
+must not have the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+<span style="font-style: normal;"><kbd>p</kbd></span>,
+appended to it; all other arguments require a unit of measure
 </p>
 
 <p>
-Invoked without an argument, <kbd>.ENDNOTE_STRING_UNDERLINE</kbd>
-will place a single rule underneath the endnotes-page head.  Invoked
-with the argument <kbd>DOUBLE</kbd>,
-<strong>ENDNOTE_STRING_UNDERLINE</strong> will double-underline
-the head.  Invoked with any other non-numeric argument, (e.g.
-<strong>OFF</strong>, <strong>NO</strong>, <strong>X</strong>, etc.)
-the macro disables underlining of the head.
+Invoked without an argument, <kbd>.ENDNOTE_STRING_UNDERSCORE</kbd>
+will place a single rule underneath the endnotes page title.  Invoked
+with the argument, <kbd>DOUBLE</kbd>, ENDNOTE_STRING_UNDERSCORE will
+double-underscore the title.  Invoked with any other non-numeric
+argument, (e.g. <kbd>OFF, NO, X</kbd>, etc.) the macro disables
+underscoring of the title.
 </p>
 
 <p>
-In addition, you can use <strong>ENDNOTE_STRING_UNDERLINE</strong>
-to control the weight of the underline rule(s), the gap between the
-head and the underline, and, in the case of double-underlines, the
-distance between the two rules.
+In addition, you can use ENDNOTE_STRING_UNDERSCORE to control the
+weight of the underscore rule(s), the gap between the title and the
+underscore, and, in the case of double-underscores, the distance
+between the two rules.
 </p>
 
 <p>
 Some examples:
-
-<pre>
-    .ENDNOTE_STRING_UNDERLINE 1
-        - turn underlining on; set the rule weight to 1 point
-
-    .ENDNOTE_STRING_UNDERLINE 1 3p
-        - turn underlining on; set the rule weight to 1 point; set
-          the gap between the string and the underline to 3 points
-    
-    .ENDNOTE_STRING_UNDERLINE DOUBLE .75 3p
-        - turn double-underlining on; set the rule weight to 3/4 of
-          a point; set the gap between the string and the upper
-          underline to 3 points; leave the gap between the upper
-          and the lower underline at the default
-    
-    .ENDNOTE_STRING_UNDERLINE DOUBLE 1.5 1.5p 1.5p
-        - turn double-underlining on; set the rule weight to 1-1/2
-          points; set the gap between the string and the upper
-          underline to 1-1/2 points; set the gap between the upper
-          and the lower underline to 1-1/2 points
-</pre>
-
-Note, from the above, that in all instances, underlining (single or
-double) is enabled whenever <strong>ENDNOTE_STRING_UNDERLINE</strong>
-is used in this way.
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_STRING_UNDERSCORE 1
+      - turn underscoring on; set the rule weight to 1 point
+
+  .ENDNOTE_STRING_UNDERSCORE 1 3p
+      - turn underscoring on; set the rule weight to 1 point; set
+        the gap between the title and the underscore to 3 points
+  
+  .ENDNOTE_STRING_UNDERSCORE DOUBLE .75 3p
+      - turn double-underscoring on; set the rule weight to 3/4 of
+        a point; set the gap between the title and the upper
+        underscore to 3 points; leave the gap between the upper
+        and the lower underunderscore at the default
+  
+  .ENDNOTE_STRING_UNDERSCORE DOUBLE 1.5 1.5p 1.5p
+      - turn double-underscoring on; set the rule weight to 1-1/2
+        points; set the gap between the title and the upper
+        underscore to 1-1/2 points; set the gap between the upper
+        and the lower underscore to 1-1/2 points
+</span>
+Note, from the above, that in all instances, underscoring (single
+or double) is enabled whenever ENDNOTE_STRING_UNDERSCORE is used in
+this way.
 </p>
 
 <p>
-<strong>Mom</strong>'s default is to double-underline the head
-with 1/2-point rules placed 2 points apart and 2 points below the
-baseline of the head.
+Mom&#8217;s default is to double-underscore the title with 1/2-point
+rules placed 2 points apart and 2 points below the baseline of the
+title.
 </p>
 
 <!-- -ENDNOTE_STRING_CAPS- -->
 
-<a name="ENDNOTE_STRING_CAPS"><h5>*<u>Endnotes first page header (title) automatic capitalization</u></h5></a>
+<h5 id="endnote-string-caps" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string capitalization</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_STRING_CAPS</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_STRING_CAPS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 Invoked by itself, <kbd>.ENDNOTE_STRING_CAPS</kbd> will
-automatically capitalize the endnotes-page head.  Invoked with any
+automatically capitalize the endnotes-page title.  Invoked with any
 other argument, the macro disables automatic capitalization of the
-head.
+title.
 </p>
 
 <p>
-If you're generating a table of contents, you may want the
-endnotes-pages head string in caps, but the toc entry in caps/lower
+If you&#8217;re generating a table of contents, you may want the
+endnotes pages title to be in caps, but the toc entry in caps/lower
 case.  If the argument to
-<a href="#ENDNOTE_STRING">ENDNOTE_STRING</a>
-is in caps/lower case and <strong>ENDNOTE_STRING_CAPS</strong> is
-on, this is exactly what will happen.
+<kbd><a href="#endnote-string">ENDNOTE_STRING</a></kbd>
+is in caps/lower case and ENDNOTE_STRING_CAPS is on, this is exactly
+what will happen.
 </p>
 
 <p>
-<strong>Mom</strong>'s default is to capitalize the endnotes-pages
-head string.
+Mom&#8217;s default is to capitalize the endnotes pages title string.
 </p>
 
 <!-- -ENDNOTE_TITLE- -->
 
-<a name="ENDNOTES_DOC_TITLE"><h4><u>4. Endnote document-identification title</u></h4></a>
+<h4 id="endnotes-doc-title" class="docs" style="margin-top: -.25em;">5. Endnotes document-identification title control</h4>
 
-<a name="ENDNOTE_TITLE"><h5>*<u>Endnote document-identification title string</u></h5></a>
+<h5 id="endnote-title" class="docs" style="margin-top: 1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Document-identification title string(s)</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_TITLE</strong> <kbd>&quot;&lt;title to identify a document in endnotes&gt;&quot;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_TITLE</b> <kbd class="macro-args">&quot;&lt;title to identify a document in endnotes&gt;&quot;</kbd>
+</div>
 
 <p>
-By default, <strong>mom</strong> identifies the document(s) to which
-endnotes belong by the document title(s) given to the
-<a href="docprocessing.html#TITLE">TITLE</a>
-macro.  If you'd like her to identify the document(s) another way,
-just invoke <kbd>.ENDNOTE_TITLE</kbd> with the identifying title you
-want, surrounded by double-quotes.
+By default, mom identifies the document(s) to which endnotes belong
+by the document title(s) given to the
+<a href="docprocessing.html#title">TITLE</a>
+macro.  If you&#8217;d like her to identify the document(s) another
+way, simply invoke <kbd>.ENDNOTE_TITLE</kbd> prior to
+<a href="docprocessing.html#start">START</a>
+with the identifying title you want, surrounded by double-quotes.
 </p>
 
 <p>
-If you don't want any identifying title, invoke
-<kbd>.ENDNOTE_TITLE</kbd> with a blank argument (either two
-double-quotes side by side &mdash; <kbd>&quot;&quot;</kbd> &mdash;
-or no argument at all).  This is particularly useful if you have a
-single (i.e. non-collated) document and find having the document's
-title included in the endnotes redundant.
+If you don&#8217;t want any identifying title, invoke
+<kbd>.ENDNOTE_TITLE</kbd> with a blank argument, either two
+double-quotes side by side (<kbd>&quot;&quot;</kbd>) or no argument
+at all.  This is particularly useful if you have a single (i.e.
+non-collated) document and find having the document&#8217;s title
+included in the endnotes redundant.
 </p>
 
 <!-- -ENDNOTE_TITLE_CONTROL- -->
 
-<a name="ENDNOTE_TITLE_CONTROL"><h5>*<u>Endnote document-identification title control</u></h5></a>
+<h5 id="endnote-title-control" class="docs" style="margin-top: .75em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Document-identification string control macros and defaults</h5>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
-.ENDNOTE_TITLE_FAMILY    default = prevailing document family; default is Times Roman
-.ENDNOTE_TITLE_FONT      default = bold
-.ENDNOTE_TITLE_SIZE*     default = 0
-.ENDNOTE_TITLE_QUAD      default = left
+<span class="pre defaults">
+.ENDNOTE_TITLE_FAMILY  default = prevailing document family; default is Times Roman
+.ENDNOTE_TITLE_FONT    default = bold
+.ENDNOTE_TITLE_SIZE*   default = 0
+.ENDNOTE_TITLE_QUAD    default = left
 
 *Relative to the size of the endnotes text (set with ENDNOTE_PT_SIZE)
-</pre>
+</span>
+</div>
 
 <!-- -ENDNOTE_TITLE_UNDERLINE- -->
 
-<a name="ENDNOTE_TITLE_UNDERLINE"><h5>*<u>Endnotes-page head (title) underlining</u></h5></a>
+<h5 id="endnote-title-underscore" class="docs" style="margin-top: -1.25em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Endnotes document-identification underscoring</h5>
 
-<p>
-<nobr>Macro: <strong>ENDNOTE_TITLE_UNDERLINE</strong> <kbd>[DOUBLE] [&lt;underline weight&gt; [&lt;underline gap&gt; [&lt;distance between double rules]]] | &lt;none&gt; | &lt;anything&gt;</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_TITLE_UNDERSCORE</b> <kbd class="macro-args">[DOUBLE] [&lt;underline weight&gt; [&lt;underline gap&gt; [&lt;distance between double rules]]] | &lt;none&gt; | &lt;anything&gt;</kbd>
+</div>
 
-Alias: <strong>ENDNOTE_TITLE_UNDERSCORE</strong>
-<br/>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>ENDNOTE_TITLE_UNDERLINE</b>
+</p>
 
-<em>*The argument</em> <kbd>&lt;underline weight&gt;</kbd> <em>must</em> NOT <em>have the</em> <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>, <kbd>p</kbd>, <em>appended to it</em>
+<p class="requires">
+&bull;&nbsp;The argument
+<span style="font-style: normal"><kbd>&lt;underscore weight&gt;</kbd></span>
+must not have the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+<span style="font-style: normal;"><kbd>p</kbd></span>,
+appended to it; all other arguments require a unit of measure
 </p>
 
 <p>
-Invoked without an argument, <kbd>.ENDNOTE_TITLE_UNDERLINE</kbd>
+Invoked without an argument, <kbd>.ENDNOTE_TITLE_UNDERSCORE</kbd>
 will place a single rule underneath the document identification
-title.  Invoked with the argument <kbd>DOUBLE</kbd>,
-<strong>ENDNOTE_TITLE_UNDERLINE</strong> will double-underline
-the title.  Invoked with any other non-numeric argument, (e.g.
-<strong>OFF</strong>, <strong>NO</strong>, <strong>X</strong>, etc.)
-the macro disables underlining of the title.
+string.  Invoked with the argument <kbd>DOUBLE</kbd>,
+ENDNOTE_TITLE_UNDERSCORE will double-underscore the string.  Invoked
+with any other non-numeric argument, (e.g. <kbd>OFF, NO, X</kbd>,
+etc.) the macro disables underscoring of the string.
 </p>
 
 <p>
-In addition, you can use <strong>ENDNOTE_TITLE_UNDERLINE</strong>
-to control the weight of the underline rule(s), the gap between the
-title and the underline, and, in the case of double-underlines, the
-distance between the two rules.
+In addition, you can use ENDNOTE_TITLE_UNDERSCORE to control the
+weight of the underscore rule(s), the gap between the title and the
+underscore, and, in the case of double-underscores, the distance
+between the two rules.
 </p>
 
 <p>
 Some examples:
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_TITLE_UNDERSCORE 1
+      - turn underscoring on; set the rule weight to 1 point
+
+  .ENDNOTE_TITLE_UNDERSCORE 1 3p
+      - turn underscoring on; set the rule weight to 1 point; set
+        the gap between the string and the underscore to 3 points
+  
+  .ENDNOTE_TITLE_UNDERSCORE DOUBLE .75 3p
+      - turn double-underscoring on; set the rule weight to 3 points
+  
+  .ENDNOTE_TITLE_UNDERSCORE DOUBLE 1.5 1.5p 1.5p
+      - turn double-underscoring on; set the rule weight to 1-1/2
+        points; set the gap between the string and the upper
+        underscore to 1-1/2 points; set the gap between the upper
+        and the lower underscore to 1-1/2 points
+</span>
+</p>
 
-<pre>
-    .ENDNOTE_TITLE_UNDERLINE 1
-        - turn underlining on; set the rule weight to 1 point
-
-    .ENDNOTE_TITLE_UNDERLINE 1 3p
-        - turn underlining on; set the rule weight to 1 point; set
-          the gap between the title and the underline to 3 points
-    
-    .ENDNOTE_TITLE_UNDERLINE DOUBLE .75 3p
-        - turn double-underlining on; set the rule weight to 3 points
-    
-    .ENDNOTE_TITLE_UNDERLINE DOUBLE 1.5 1.5p 1.5p
-        - turn double-underlining on; set the rule weight to 1-1/2
-          points; set the gap between the title and the upper
-          underline to 1-1/2 points; set the gap between the upper
-          and the lower underline to 1-1/2 points
-</pre>
-
-Note, from the above, that in all instances, underlining (single or
-double) is enabled whenever <strong>ENDNOTE_TITLE_UNDERSCORE</strong>
-is used in this way.
+<p>
+Note, from the above, that in all instances, underscoring (single or
+double) is enabled whenever ENDNOTE_TITLE_UNDERSCORE is used in this
+way.
 </p>
 
 <p>
-<strong>Mom</strong>'s default is to single-underline the title
-with a 1/2-point rule place 2 points below its baseline.
+Mom&#8217;s default is to single-underscore the string with a
+1/2-point rule placed 2 points below its baseline.
 </p>
 
 <!-- -ENDNOTE_NUMBERING- -->
 
-<a name="ENDNOTES_NUMBERING"><h4><u>5. Endnotes-pages endnote numbering style</u></h4></a>
+<h4 id="endnotes-numbering" class="docs" style="margin-top: -.25em;">6. Endnotes referencing style</h4>
 
-<a name="ENDNOTE_MARKER_STYLE"><h5>*<u>Endnote marker style</u></h5></a>
+<h5 id="endnote-marker-style" class="docs" style="margin-top: 1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Endnote marker style</h5>
 
-<p>
-The macro to control how endnotes are referenced is
-<strong>ENDNOTE_MARKER_STYLE</strong>.
-</p>
-
-<p>
-By default, <strong>mom</strong> places superscript numbers in
-<a href="definitions.html#RUNNING">running text</a>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_MARKER_STYLE</b> <kbd class="macro-args"><a href="#line">LINE</a> | <a href="#number">NUMBER</a> | <a href="#superscript">SUPERSCRIPT</a></kbd>
+</div>
+
+<p id="line">
+<span style="display: block; margin-bottom: .25em;">&bull;&nbsp;<i>Argument:</i> <kbd>LINE</kbd></span>
+By default, mom places superscript numbers in
+<a href="definitions.html#running">running text</a>
 to identify endnotes.  However, if you have
-<a href="#NUMBER_LINES">line-numbering</a>
-turned on, you may instruct <strong>mom</strong> not to put
-superscript numbers in the running text, but rather to reference
-endnotes by line number.  The command to do this is
-
-<pre>
-    .ENDNOTE_MARKER_STYLE LINE
-</pre>
+<a href="#number-lines">linenumbering</a>
+turned on, you may instruct mom not to put superscript numbers in
+the running text, but rather to reference endnotes by line number.
+The command to do this is
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_MARKER_STYLE LINE
+</span>
+With ENDNOTE_MARKER_STYLE <kbd>LINE</kbd>, mom will identify
+endnotes either by single line numbers or by line ranges.  If
+what you want is a single line number, you need only invoke
+<kbd>.ENDNOTE</kbd> at the appropriate place in running
+text <i>without the terminating</i> <kbd>\c</kbd>.  Input lines
+after the endnote has been terminated (e.g. with <kbd>.ENDNOTE
+OFF</kbd>) must begin at the left margin.
 </p>
 
 <p>
-With <strong>ENDNOTE_MARKER_STYLE LINE</strong>,
-<strong>mom</strong> will identify endnotes either by single
-line numbers, or line ranges.  If what you want is a single line
-number, you need only invoke <kbd>.ENDNOTE</kbd>, <em>without
-terminating the text line before it with</em> <kbd>\c</kbd>,
-at the appropriate place in running text.  (Should you wish to
-revert to <strong>mom</strong>'s default behaviour of placing
-a superscript number in the text to identify an endnote, you
-can invoke <kbd>.ENDNOTE_MARKER_STYLE</kbd> with the argument,
+(Should you wish to revert to mom&#8217;s default behaviour of
+placing a superscript number in the text to identify an endnote,
+you can invoke <kbd>.ENDNOTE_MARKER_STYLE</kbd> with the argument,
 <kbd>NUMBER</kbd>.  It is not advisable to switch marker styles
 within a single document, for aesthetic reasons, but there is
 nothing to prevent you from doing so.)
 </p>
 
-<a name="EN-MARK"></a>
-
-<p>
+<p id="en-mark">
 If you want a range of line numbers (e.g.&nbsp;[5-11]&nbsp;),
 insert, directly into the first line of the range you want, the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<kbd>\*[EN-MARK]</kbd>.  For the terminating line number of
-the range, you need only invoke <kbd>.ENDNOTE</kbd>, (again,
-without attaching <kbd>\c</kbd> to the text line before it).
-<strong>Mom</strong> is smart enough to figure out that where
-<kbd>.ENDNOTE</kbd> is invoked represents the terminating line
+<a href="definitions.html#inlines">inline escape</a>,
+<kbd>\*[EN-MARK]</kbd>.  For the terminating line number of the
+range, you need only invoke <kbd>.ENDNOTE</kbd> (again, without the
+terminating <kbd>\c</kbd>).  Mom is smart enough to figure out that
+where <kbd>.ENDNOTE</kbd> is invoked represents the terminating line
 number.
 </p>
 
-<a name="ENDNOTE_LINENUMBER_GAP"><h5>*<u>Spacing between line-numbered endnotes and the endnote text</u></h5></a>
+<div id="endnote-linenumbers-note" class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+By default, mom reserves a fixed amount of space, equal to 8
+placeholders, for the linenumbers of linenumbered endnotes.  Within
+that space, the numbers are flush right with each other.  The
+reserved space is enough to print a range of linenumbers of the form
+<kbd>[nnnn-nnnn]</kbd>, but may be more than you need.
+</p>
 
 <p>
-Given the impossibility of knowing, in advance, the "string length"
-of all the line numbers or ranges of line numbers that will be used
-in endnotes (the string length of 12 is two; the string length
-of 12-15 is 5), <strong>mom</strong> cannot "hang" line numbers
-and guarantee that they, and the endnote text, will align in a
-visually pleasing manner.  Consequently, <strong>mom</strong> sets
-the entirety of line-numbered endnotes completely flush left,
-<strong>including the line numbers themselves</strong>.  The line
-numbers (by default, enclosed in square brackets) are separated from
-the beginning of each endnote by a gap, so that a line-numbered
-endnote looks approximately like this:
+The goal with linenumbered endnotes is to ensure that the longest
+linenumber or range of lines is flush with the left margin of the
+page.  Adjusting the reserved space is done with the macro
+<a href="docelement.html#endnote-numbers-align">ENDNOTE_NUMBERS_ALIGN</a>,
+and the rules for getting it right are simple.
+</p>
+
+<p class="tip-bottom">
+If your document runs to less than 100 lines, invoke
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 0
+</span>
+If your document has between 100 and 999 lines
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 1
+</span>
+If your document has between 1000 and 9999 lines
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 2
+</span>
+etc.
+</p>
+</div>
+
+<p id="number" style="margin-top: -.5em;">
+<span style="display: block; margin-bottom: .25em;">&bull;&nbsp;<i>Argument:</i> <kbd>NUMBER</kbd></span>
+With the argument <kbd>NUMBER</kbd>, mom places superscript numbers
+in running text, but identifies endnotes in the endnotes section
+of your document with normal-sized, base-aligned numbers.
+</p>
+
+<p id="superscript" style="margin-top: -.5em;">
+<span style="display: block; margin-bottom: .25em;">&bull;&nbsp;<i>Argument:</i> <kbd>SUPERSCRIPT</kbd></span>
+With the argument <kbd>SUPERSCRIPT</kbd>, mom places superscript
+numbers in running text, and identifies endnotes in the endnotes
+section of your document with superscript numbers as well.  This is
+mom&#8217;s default.
+</p>
+
+<div id="endnote-superscript-note" class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+By default, mom reserves a fixed amount of space, equal to 2
+placeholders, for the superscript numbers identifying endnotes in
+the endnotes section of your document.  Within that space, the
+numbers are flush right with each other.
+</p>
+
+<p class="tip-bottom">
+If you need less space (the total number of endnotes is less than 10) or
+more (the total number of endnotes is greater than 99), use the
+macro,
+<a href="docelement.html#endnote-numbers-align">ENDNOTE_NUMBERS_ALIGN</a>,
+to set the desired amount of reserved space, e.g.
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 1
+</span>
+or
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 3
+</span>
+</p>
+</div>
+
+<h5 id="endnote-linenumber-gap" class="docs" style="margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Spacing between line-numbered endnotes and the endnote text</h5>
+
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_LINENUMBER_GAP</b> <kbd class="macro-args">&lt;size of gap&gt;</kbd>
+</div>
 
-<pre>
-    [1-2]   Notwithstanding, Frye later asserts that Christianity
-    is "a ghost with the chains of a foul historical record of
-    cruelty clanking behind it."
-</pre>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-You can change the size of the gap with the macro,
-<strong>ENDNOTE_LINENUMBER_GAP</strong>, which takes as its single
-argument the size of the gap.  The argument requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
-So, for example, to change the gap to 2
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>,
-you'd do
-
-<pre>
-    .ENDNOTE_LINENUMBER_GAP 2P
-</pre>
+When your
+<a href="#endnote-marker-style">ENDNOTE_MARKER_STYLE</a>
+is <kbd>LINE</kbd>, mom, by default, inserts a space equal to
+1/2-<a href="definitions.html#em">en</a>
+between the linenumber and the text of an endnote.  For aesthetic reasons, you may want 
+to change the size of the gap, which is done with the macro,
+ENDNOTE_LINENUMBER_GAP.
 </p>
 
 <p>
-The default gap for both
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-and
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>
-is 1.5
-<a href="definitions.html#TERMS_EM">ems</a>.
+ENDNOTE_LINENUMBER_GAP takes as its single argument the size
+of the gap.  The argument requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+so, for example, to change the gap to 2
+<a href="definitions.html#picaspoints">picas</a>,
+you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_LINENUMBER_GAP 2P
+</span>
 </p>
 
-<a name="ENDNOTE_LINENUMBER_BRACKETS"><h5>*<u>Brackets around endnotes line-numbers</u></h5></a>
+<h5 id="endnote-linenumber-brackets" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Brackets around endnote line numbers</h5>
+
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_LINENUMBER_BRACKETS</b> <kbd class="macro-args">PARENS | SQUARE | BRACES | ( | [ | {</kbd>
+</div>
 
 <p>
-By default, <strong>mom</strong> puts endnote line numbers inside
-square brackets.  The style of the brackets may be changed with the
-macro, <strong>ENDNOTE_LINENUMBER_BRACKETS</strong>, which takes one
-of three possible arguments: <kbd>PARENS</kbd> (&quot;round&quot;
-brackets), <kbd>SQUARE</kbd> (the default) or <kbd>BRACES</kbd>
-(curly braces).  If you prefer a shortform, the arguments,
-<kbd>(</kbd>, <kbd>[</kbd> or <kbd>{</kbd> may be used instead.
+By default, mom puts endnote line numbers inside square brackets.
+The style of the brackets may be changed with the macro,
+ENDNOTE_LINENUMBER_BRACKETS, which takes one of three possible
+arguments: <kbd>PARENS</kbd> (&#8220;round&#8221; brackets),
+<kbd>SQUARE</kbd> (the default) or <kbd>BRACES</kbd> (curly braces).
+If you prefer a shortform, the arguments, <kbd>(</kbd>, <kbd>[</kbd>
+or <kbd>{</kbd> may be used instead.
 </p>
 
-<a name="ENDNOTE_LINENUMBER_SEPARATOR"><h5>*<u>A separator after endnotes line-numbers instead of brackets</u></h5></a>
+<h5 id="endnote-linenumber-separator" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Separator after endnote line numbers instead of brackets</h5>
+
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_LINENUMBER_SEPARATOR</b> <kbd class="macro-args">&lt;character&gt;</kbd>
+</div>
 
 <p>
-If you don't want the numbers enclosed in brackets, you may tell
-<strong>mom</strong> to use a "separator" instead.  A common
-separator would be the colon, but it can be anything you like.  The
-macro to do this is <strong>ENDNOTE_LINENUMBER_SEPARATOR</strong>,
-which takes, as its single argument, the separator you want.
-(If the argument contains spaces, don't forget to enclose the
-argument in double-quotes.)  The separator can be composed of
-any valid groff character, or any combination of characters.
-For example, to get a colon separator after the line number in
-line-numbered endnotes, you'd do
+If you don&#8217;t want the numbers enclosed in brackets, you may tell
+mom to use a separator instead.  A common
+separator would be the colon, but it can be anything you like.
+</p>
 
-<pre>
-    .ENDNOTE_LINENUMBER_SEPARATOR :
-</pre>
+<p>
+ENDNOTE_LINENUMBER_SEPARATOR takes as its single argument the
+separator you want.  (If the argument contains spaces, don&#8217;t
+forget to enclose the argument in double-quotes.)  The separator
+can be composed of any valid groff character, or any combination of
+characters.  For example, to get a colon separator after the line
+number in line-numbered endnotes, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_LINENUMBER_SEPARATOR :
+</span>
 </p>
 
-<a name="ENDNOTE_NUMBER_CONTROL"><h5>*<u>Endnote numbering style control</u></h5></a>
+<h5 id="endnote-number-control" class="docs" style="margin-top: -1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Endnote numbering style control</h5>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
 
-<p>
+<p class="defaults">
 Please note that the control macros for endnote numbering affect only
 the numbers that appear on the endnotes pages themselves, not the
-endnote numbers that appear in the body of the document(s).
+endnote numbers that appear in the body of a document.
 </p>
-
-<pre>
-.ENDNOTE_NUMBER_FAMILY    default = prevailing document family; default is Times Roman
-.ENDNOTE_NUMBER_FONT      default = bold
-.ENDNOTE_NUMBER_SIZE*     default = 0
+<span class="pre defaults">
+Numbered endnotes
+.ENDNOTE_NUMBER_FAMILY default = prevailing document family; default Times Roman
+.ENDNOTE_NUMBER_FONT   default = bold
+.ENDNOTE_NUMBER_SIZE*  default = 0
+Linenumbered endnotes
+.ENDNOTE_LINENUMBER_FAMILY default = prevailing document family; default Times Roman
+.ENDNOTE_LINENUMBER_FONT   default = bold
+.ENDNOTE_LINENUMBER_SIZE*  default = 0
 
 *Relative to the size of the endnotes text (set with ENDNOTE_PT_SIZE)
-</pre>
+</span>
+</div>
 
-<a name="ENDNOTE_NUMBER_ALIGNMENT"><h5>*<u>Endnote numbering alignment</u></h5></a>
+<h5 id="endnote-number-alignment" class="docs" style="margin-top: -1.25em; margin-bottom: -.5em; margin-left: .5em;">&bull;&nbsp;Endnote numbering alignment</h5>
 
-<p>
-By default, <strong>mom</strong> hangs the numbers on endnotes pages,
+<p style="margin-top: .75em;">
+By default, when your
+<a href="#endnote-marker-style">ENDNOTE_MARKER_STYLE</a>
+is <kbd>NUMBER</kbd>, mom hangs the numbers on endnotes pages,
 aligned right to two placeholders, producing this:
+<br/>
+<span id="endnote-numbering-alignment-example" class="pre-in-pp">
+   9. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+      sed diam nonumy eirmod tempor invidunt ut labore et
+      dolore magna aliquyam erat, sed diam voluptua.
 
-<a name="ENDNOTE_NUMBERING_ALIGNMENT_EXAMPLE"></a>
-
-<pre>
-     9. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-        sed diam nonumy eirmod tempor invidunt ut labore et
-        dolore magna aliquyam erat, sed diam voluptua.
-
-    10. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-        sed diam nonumy eirmod tempor invidunt ut labore et
-        dolore magna aliquyam erat, sed diam voluptua.
-</pre>
-</p>
-
-<p>
-The macros to alter this behaviour are
-
-<ul>
-    <li><a href="#ENDNOTE_NUMBERS_ALIGN_RIGHT"><strong>ENDNOTE_NUMBERS_ALIGN_RIGHT</strong></a></li>
-    <li><a href="#ENDNOTE_NUMBERS_ALIGN_LEFT"><strong>ENDNOTE_NUMBERS_ALIGN_LEFT</strong></a></li>
-</ul>
+  10. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+      sed diam nonumy eirmod tempor invidunt ut labore et
+      dolore magna aliquyam erat, sed diam voluptua.
+</span>
+If you wish to change either the alignment or the number of
+placeholders, the macro to use is ENDNOTE_NUMBERS_ALIGN.
 </p>
 
-<hr width="33%" align="left"/>
+<!-- -ENDNOTE_NUMBERS_ALIGN- -->
 
-<!-- -ENDNOTE_NUMBERS_ALIGN_RIGHT- -->
-
-<a name="ENDNOTE_NUMBERS_ALIGN_RIGHT"></a>
+<div id="endnote-numbers-align" class="box-macro-args">
+Macro: <b>ENDNOTE_NUMBERS_ALIGN</b> <kbd class="macro-args">LEFT | RIGHT &lt;number of placeholders&gt;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>ENDNOTE_NUMBERS_ALIGN_RIGHT</strong> &lt;number of placeholders&gt;</nobr>
-</p>
-
-<p>
-<strong>ENDNOTE_NUMBERS_ALIGN_RIGHT</strong> takes one
-(non-optional) argument: the number of placeholders to reserve for
-right alignment of endnote numbers.
+ENDNOTE_NUMBERS_ALIGN determines how endnote numbers are aligned.  If you invoke
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 2
+</span>
+the periods (dots) after the numbers will align, like this
+<span class="pre-in-pp">
+   9. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+      sed diam nonumy eirmod tempor invidunt ut labore et
+      dolore magna aliquyam erat, sed diam voluptua.
+
+  10. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+      sed diam nonumy eirmod tempor invidunt ut labore et
+      dolore magna aliquyam erat, sed diam voluptua.
+</span>
+If you invoke
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN LEFT 2
+</span>
+the first digits of the numbers will line up flush left, like this
+<span class="pre-in-pp">
+  9.  Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+      sed diam nonumy eirmod tempor invidunt ut labore et
+      dolore magna aliquyam erat, sed diam voluptua.
+
+  10. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
+      sed diam nonumy eirmod tempor invidunt ut labore et
+      dolore magna aliquyam erat, sed diam voluptua.
+</span>
+The argument <kbd>&lt;number of placeholders&gt;</kbd> represents
+the maximum size of the numbers, expressed as the number of
+digits in the largest number.  Numbers in the range 0-9 require
+1 placeholder; in the range 10-99, 2 placeholders; in the range
+100-999 3 placeholders, and so on.
 </p>
 
 <p>
-For example, if you have fewer than ten endnotes, you might want to do
-
-<pre>
-    .ENDNOTE_NUMBERS_ALIGN_RIGHT 1
-</pre>
-
-which would ensure that the endnote numbers hang, but are all flush
-with the page's left margin.  If, god help you, you have over a hundred
-endnotes, you'd want to do
-
-<pre>
-    .ENDNOTE_NUMBERS_ALIGN_RIGHT 3
-</pre>
-
-to ensure that the numbers hang and are properly right-aligned.
+Therefore, if you have fewer than ten endnotes,
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_NUMBERS_ALIGN RIGHT 1
+</span>
+would ensure proper right alignment of endnote numbers.
 </p>
 
-<hr width="33%" align="left"/>
-
-<!-- -ENDNOTE_NUMBERS_ALIGN_LEFT- -->
-
-<a name="ENDNOTE_NUMBERS_ALIGN_LEFT"></a>
-
 <p>
-Macro: <strong>ENDNOTE_NUMBERS_ALIGN_LEFT</strong>
+Mom&#8217;s default for endnote number alignment is to align the
+numbers right to two placeholders.
 </p>
 
-<p>
-If you don't want the endnote numbers to hang and right-align,
-invoke <kbd>.ENDNOTE_NUMBERS_ALIGN_LEFT</kbd>, which doesn't require
-any argument.  This disables hanging and right-alignment of endnote
-numbers, so that the example
-<a href="#ENDNOTE_NUMBERING_ALIGNMENT_EXAMPLE">above</a>
-comes out like this:
-
-<pre>
-    9. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore et
-    dolore magna aliquyam erat, sed diam voluptua.
-
-    10. Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
-    sed diam nonumy eirmod tempor invidunt ut labore et
-    dolore magna aliquyam erat, sed diam voluptua.
-</pre>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+ENDNOTE_NUMBERS_ALIGN can also be used to establish the alignment
+and number of placeholders when your
+<a href="#endnote-marker-style">ENDNOTE_MARKER_STYLE</a>
+is <kbd>SUPERSCRIPT</kbd>.  Furthermore, it can be used to establish
+the number of placeholders to reserve when your ENDNOTE_MARKER_STYLE
+is <kbd>LINE</kbd>, even though, in such an instance, the numbers
+themselves are always aligned right.  See
+<a href="#endnote-linenumbers-note">here</a>
+for examples.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="MARGIN_NOTES_INTRO"><h2><u>Margin notes</u></h2></a>
+<h2 id="margin-notes-intro" class="macro-group">Margin notes</h2>
 
-<ul>
-    <li><a href="#MARGIN_NOTES_BEHAVIOUR">Margin notes behaviour</a></li>
-    <ul>
-        <li><a href="#MARGIN_NOTES_VERTICAL">Adjusting the vertical position of margin notes</a></li>
-    </ul>
-    <li><a href="#MN_INIT">Macro: MN_INIT</a> &mdash; initialize margin notes</li>
-    <li><a href="#MN">Tag: MN</a></li>
+<ul style="margin-left: -.5em;">
+  <li><a href="#margin-notes-behaviour">Margin notes behaviour</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#margin-notes-vertical">Adjusting the vertical position of margin notes</a></li>
+  </ul></li>
+  <li><a href="#mn-init">Macro: <b>MN_INIT</b></a>&mdash;initialize margin notes</li>
+  <li><a href="#mn">Tag: MN</a></li>
 </ul>
 
 <p>
 Margin notes are short annotations that appear in either the left
 or right margin of a document.  Sometimes they comment on the text.
-Sometimes they assist in following the &quot;flow&quot; of a
+Sometimes they assist in following the &#8220;flow&#8221; of a
 document by summarizing the subject of a portion of text.  Sometimes
-they're comments to yourself in a draft copy.
+they&#8217;re comments to yourself in a draft copy.
 </p>
 
 <p>
-The margin notes macros and routines in om.tmac
-(<strong>mom</strong>) are &quot;mommified&quot; versions of the
-margin notes macros and routines written by Werner Lemberg and
-patched by Gaius Mulley.
+The margin notes macros and routines in om.tmac (mom) are
+&#8220;mommified&#8221; versions of the margin notes macros and
+routines written by Werner Lemberg and patched by Gaius Mulley.
 </p>
 
-<a name="MARGIN_NOTES_BEHAVIOUR"><h3><u>Margin notes behaviour</u></h3></a>
+<h3 id="margin-notes-behaviour" class="docs">Margin notes behaviour</h3>
 
 <p>
 First things first: before you enter your first margin note, you
-must &quot;initialize&quot; margin notes with
-<a href="#MN_INIT">MN_INIT</a>.
-<strong>MN_INIT</strong> sets up the style parameters for margin
-notes, including things like
-<a href="definitions.html#TERMS_FONT">font</a>,
-<a href="definitions.html#TERMS_FAMILY">family</a>
+must &#8220;initialize&#8221; margin notes with
+<a href="#mn-init">MN_INIT</a>.
+MN_INIT sets up the style parameters for margin notes, including
+things like
+<a href="definitions.html#font">font</a>,
+<a href="definitions.html#family">family</a>
 and
-<a href="definitions.html#TERMS_LEADING">leading</a>.
+<a href="definitions.html#leading">leading</a>.
 </p>
 
 <p>
 After initializing margin notes, you create margin notes with the
-<a href="#MN">MN</a>
-macro.  Based on the argument you pass <strong>MN</strong>, your
-margin note will go in either the left or the right margin.
+<a href="#mn">MN</a>
+macro.  Based on the argument you pass MN, your margin note will go
+in either the left or the right margin.
 </p>
 
 <p>
 Margin notes are tricky from a typographic standpoint with respect
-to vertical placement.  Since the leading of margin notes may
-differ from that of
-<a href="definitions.html#TERMS_RUNNING">running text</a>,
-it's impossible for <strong>mom</strong> to guess whether to align
+to vertical placement.  Since the leading of margin notes may differ
+from that of
+<a href="definitions.html#running">running text</a>,
+it&#8217;s impossible for mom to guess whether to align
 the first lines of margin notes with a document
-<a href="definitions.html#TERMS_BASELINE">baseline</a>,
+<a href="definitions.html#baseline">baseline</a>,
 whether to align the last lines of margin notes with a document
 baseline, or whether to center them, vertically, so that neither
 first nor last line aligns with anything!
 </p>
 
 <p>
-Given this difficulty, <strong>mom</strong> always aligns the first
-line of any margin note with a document baseline.  If you want a
-different behaviour, you must adjust the position(s) of margin
-notes yourself, on a note by note basis.  (See
-<a href="#MARGIN_NOTES_VERTICAL">Adjusting the vertical position of margin notes</a>.)
+Given this difficulty, mom always aligns the first line of any
+margin note with a document baseline.  If you want a different
+behaviour, you must adjust the position(s) of margin notes yourself,
+on a note by note basis.  (See
+<a href="#margin-notes-vertical">Adjusting the vertical position of margin notes</a>.)
 </p>
 
 <p>
-Generally speaking, <strong>mom</strong> tries to place margin
-notes at the point where you invoke the tag,
-<a href="#MN"><kbd>.MN</kbd></a>.
-However, in the event that a margin note runs deep, she may not
-be able to place a subsequent margin note exactly where you want.
-In such an instance, <strong>mom</strong> will &quot;shift&quot; the
-margin note down on the page, placing it one (margin note) linespace
-beneath the previous margin note (plus whatever vertical space
-is required to get the first line to line up with a baseline of
-running text).  A warning will be issued, letting you know this has
-happened, and where.
+Generally speaking, mom tries to place margin notes at the point
+where you invoke
+<a href="#mn">MN</a>.
+However, in the event that a margin note runs deep, she may not be
+able to place a subsequent margin note exactly where you want.  In
+such an instance, mom will &#8220;shift&#8221; the margin note down
+on the page, placing it one (margin note) linespace beneath the
+previous margin note (plus whatever vertical space is required to
+get the first line to line up with a baseline of running text).  A
+warning will be issued, letting you know this has happened, and
+where.
 </p>
 
 <p>
 Sometimes, if a margin note has to be shifted down, there simply
-isn't enough room to start the margin note on the page on which
-<kbd>.MN</kbd> is invoked.  In that case, <strong>mom</strong>
-ignores the margin note entirely and issues a warning, letting you
-know what she's done, and where.
-</p>
+isn&#8217;t enough room to start the margin note on the page on
+which <kbd>.MN</kbd> is invoked.  In that case, mom ignores the
+margin note entirely and issues a warning, letting you know what
+she&#8217;s done, and where. </p>
 
 <p>
 In the event that a margin note, sucessfully begun on a page, runs
 past your bottom margin (or the last line before footnotes begin),
-the margin note will &quot;flow&quot; onto the next page.  If it is
-a &quot;left&quot; margin note, it will continue in the left margin.
-If it is a &quot;right&quot; margin note, it will continue in the
-right margin.
+the margin note will &#8220;flow&#8221; onto the next page.  If
+it is a &#8220;left&#8221; margin note, it will continue in the
+left margin.  If it is a &#8220;right&#8221; margin note, it will
+continue in the right margin.
 </p>
 
 <p>
-If your document is being set in two columns, <strong>mom</strong>
-will sensibly and automatically set all margin notes pertaining
-to the left column in the left margin, and all margin notes
-pertaining to the right column in the right margin, regardless of
-the &quot;direction&quot; argument you give the <strong>MN</strong>
-tag.  If you try to use <strong>MN</strong> in documents of more
-than two columns, <strong>mom</strong> will ignore all margin notes,
-and issue warning for each.
+If your document is being set in two columns, mom will sensibly and
+automatically set all margin notes pertaining to the left column in
+the left margin, and all margin notes pertaining to the right column
+in the right margin, regardless of the &#8220;direction&#8221;
+argument you give the MN tag.  If you try to use MN in documents of
+more than two columns, mom will ignore all margin notes, and issue
+a warning for each.
 </p>
 
-<a name="MARGIN_NOTES_VERTICAL"><h4><u>Adjusting the vertical position of margin notes</u></h4></a>
+<h3 id="margin-notes-vertical" class="docs">Adjusting the vertical position of margin notes</h3>
 
 <p>
 When the
-<a href="definitions.html#TERM_LEADING">leading</a>
+<a href="definitions.html#term-leading">leading</a>
 of margin notes differs from the leading used throughout a document,
 you may want to adjust the vertical position of individual margin
 notes.  This is most often going to be the case with margin notes
-that end near the bottom of the page, where you want the last line of
-the margin note to line up with the last line of text on the page.
+that end near the bottom of the page, where you want the last line
+of the margin note to line up with the last line of text on the
+page.
 </p>
 
 <p>
 Adjustments to the vertical position of margin notes must be done
 inside the margin note (i.e. after <kbd>.MN</kbd>), at the top,
 before entering text.  The commands to use are
+<kbd>\!<a href="typesetting.html#ald">.ALD</a></kbd>
+(to lower the margin note) and
+<kbd>\!<a href="typesetting.html#rld">.RLD</a></kbd>
+(to raise it).
 
-<pre>
-    \!<a href="typesetting.html#ALD">.ALD</a> (to lower the margin note)a
-        and
-    \!<a href="typesetting.html#RLD">.RLD</a> (to raise it)
-</pre>
-
-The <kbd>\!</kbd> <em>must</em> precede the macros, or they won't
-have any effect.
+The <kbd>\!</kbd> <i>must</i> precede the macros, or they
+won&#8217;t have any effect.
 </p>
 
-<hr width="66%" align="left"/>
-
 <!-- -MN_INIT- -->
 
-<a name="MN_INIT"></a>
-
-<p>
-Macro: <strong>MN_INIT</strong>
-<br/>
-
-<em>Macro arguments:</em>
-<br/>
-
-<kbd><nobr>[ RAGGED | SYMMETRIC ]</nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="mn-init" class="macro-id">MN_INIT</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>MN_INIT</b> <kbd class="macro-args">&lt;arguments (see list)&gt;</kbd>
+</div>
+
+<h4 style="margin-top: .75em; margin-left: .5em; font-style: normal; font-weight: bold: font-size: 105%; color: #6f614a;">Argument list:</h4>
+
+<span class="pre" style="margin-top: -1.5em; margin-left: .5em;">
+[ RAGGED | SYMMETRIC ]
+&lt;left-width&gt;
+&lt;right-width&gt;
+&lt;gutter&gt;
+&lt;family+font&gt;
+&lt;point-size&gt;
+&lt;lead&gt;
+&lt;colour&gt;
+&lt;hyphenation-flags&gt;
+</span>
 
-<nobr>&lt; left-width right-width gutter family+font point-size lead colour hyphenation-flags &gt;</nobr></kbd>
-</p>
-
-<p>
+<p style="margin-top: 1.25em;">
 Before you enter your first margin note, you must initialize
-all the parameters associated with margin notes with
-<strong>MN_INIT</strong>.  If you forget to do so,
-<strong>mom</strong> will issue a warning and abort.
+<i>all</i> the parameters associated with margin notes with MN_INIT.
+If you forget to do so, mom will issue a warning and abort.
 </p>
 
 <p>
@@ -5766,129 +6098,130 @@
 explanations below.
 </p>
 
-<h4><kbd>[ RAGGED | SYMMETRIC ]</kbd></h4>
+<h4 class="docs arg-list">Argument 1:&nbsp;&nbsp;<kbd style="color: #302419;">[ RAGGED | SYMMETRIC ]</kbd></h4>
 
 <p>
 If the first argument is <kbd>RAGGED</kbd>, both left and
 right margin notes will be flush left.  If the first argument
 is <kbd>SYMMETRIC</kbd> left margin notes will be set flush
-<em>right</em>, and right margin notes will be set flush
-<em>left</em>.  The effect is something like this:
-
-<pre>
+<i>right</i>, and right margin notes will be set flush
+<i>left</i>.  The effect is something like this:
+<br/>
+<span class="pre-in-pp">
          A left    This is a meaningless batch        A right
     margin note    of text whose sole purpose is      margin note
       with just    to demonstrate how the sym-        with just
     a few words    metric argument to MN sets left    a few words
          in it.    and right margin notes.            in it.
-</pre>
+</span>
 </p>
 
 <p>
-If the argument is omitted, or given as &quot;&quot;, both left and
-right margin notes will be set justified.  (Justified is usually not
-a good idea, since the narrow measure of margin notes makes pleasing
-justification a near impossibility.)
+If the argument is omitted, or given as <kbd>&quot;&quot;</kbd>,
+both left and right margin notes will be set justified.  (Justified
+is usually not a good idea, since the narrow measure of margin notes
+makes pleasing justification a near impossibility.)
 </p>
 
-<h4><kbd>&lt;left-width&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 2:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;left-width&gt;</kbd></h4>
 
 <p>
 The width of left margin notes.  A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 must be appended directly onto the argument.  The default is to set
 left margin notes right out to the edge of the page, which is almost
 certainly not what you want, so you should give a value for this
 argument if using left margin notes.
 </p>
 
-<h4><kbd>&lt;right-width&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 3:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;right-width&gt;</kbd></h4>
 
 <p>
 The width of right margin notes.  A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 must be appended directly onto the argument.  The default is to
 set right margin notes right out to the edge of the page, which is
 almost certainly not what you want, so you should give a value for
 this argument if using right margin notes.
 </p>
 
-<h4><kbd>&lt;gutter&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 4:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;gutter&gt;</kbd></h4>
 
 <p>
 The
-<a href="definitions.html#TERMS_GUTTER">gutter</a>
+<a href="definitions.html#gutter">gutter</a>
 between margin notes and
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
+<a href="definitions.html#running">running text</a>.
 A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 must be appended directly onto the argument.  The gutter applies to
 both left and right margin notes. The default is 1
-<a href="definitions.html#TERMS_EM">em</a>.
+<a href="definitions.html#em">em</a>.
 </p>
 
-<h4><kbd>&lt;font&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 5:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;font&gt;</kbd></h4>
 
 <p>
-The family+font for margin notes.  Yes, that's right: the family
-PLUS font combo.  For example, if you want Times Roman Medium,
-the argument must be TR.  If you want Palatino Medium Italic, the
-argument must be PI.  The default is the same family+font combo used
-for a document's paragraph text.
+The family+font for margin notes.  Yes, that&#8217;s right: the
+family <i>plus</i> font combo.  For example, if you want Times
+Roman Medium, the argument must be TR.  If you want Palatino
+Medium Italic, the argument must be PI.  The default is the same
+family+font combo used for a document&#8217;s paragraph text.
 </p>
 
-<h4><kbd>&lt;point size&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 6:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;point size&gt;</kbd></h4>
 
 <p>
 The point size of type for margin notes.  There is no need to append a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 to the argument;
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-is assumed (although there's nothing preventing you from appending an
-alternative unit of measure directly to the argument).  The default
-is for margin notes to use the same point size of type as is used
-in document paragraphs.
+<a href="definitions.html#picaspoints">points</a>
+is assumed (although there&#8217;s nothing preventing you from
+appending an alternative unit of measure directly to the argument).
+The default is for margin notes to use the same point size of type
+as is used in document paragraphs.
 </p>
 
-<h4><kbd>&lt;lead&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 7:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;lead&gt;</kbd></h4>
 
 <p>
 The
-<a href="definitions.html#TERMS_LEADING">leading</a>
-of margin notes.  <strong>lead</strong> uses
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-as its unit of measure, so don't tack a unit of measure onto the
-end of the argument.  The default lead is the same leading as
-is used for paragraph text (i.e. the document's base leading).
-For convenience and clarity, you may, instead, give the word,
-<strong>DOC</strong>, to this argument, which indicates that the
-leading should be the same as the document's base leading.
+<a href="definitions.html#leading">leading</a>
+of margin notes.  <kbd>&lt;lead&gt;</kbd> uses
+<a href="definitions.html#picaspoints">points</a>
+as its unit of measure, so don&#8217;t tack a unit of measure onto
+the end of the argument.  The default lead is the same leading
+as is used for paragraph text (i.e. the document&#8217;s base
+leading).  If you want the default, you may, for convenience
+and clarity, give the word, <kbd>DOC</kbd>, to this argument,
+instead of <kbd>&quot;&quot;</kbd> (two double-quotes).  Like the
+double-quotes, it indicates that the leading should be the same as
+the document&#8217;s base leading.
 </p>
 
-<h4><kbd>&lt;colour&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 8:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;colour&gt;</kbd></h4>
 
 <p>
 The colour of margin notes.  The colour must be pre-initialized
 with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
+<a href="color.html#newcolor">NEWCOLOR</a>
 or
-<a href="color.html#XCOLOR">XCOLOR</a>.
+<a href="color.html#xcolor">XCOLOR</a>.
 The default is black.
 </p>
 
-<h4><kbd>&lt;hyphenation-flags&gt;</kbd></h4>
+<h4 class="docs arg-list">Argument 9:&nbsp;&nbsp;<kbd style="color: #302419;">&lt;hyphenation-flags&gt;</kbd></h4>
 
 <p>
-A number telling <strong>groff</strong> how you want margin notes
+A number telling groff how you want margin notes
 hyphenated.
-
-<pre>
-    1 = hyphenate without restrictions
-    2 = do not hyphenate the last word on the page
-    4 = do not hyphenate the last two characters of a word
-    8 = do not hyphenate the first two characters of a word
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  1 = hyphenate without restrictions
+  2 = do not hyphenate the last word on the page
+  4 = do not hyphenate the last two characters of a word
+  8 = do not hyphenate the first two characters of a word
+</span>
 The values can be added together, so, for example, if you want
 neither the first two nor the last two characters of words
 hyphenated, the hyphenation-flag would be 12.  The default value is
@@ -5897,1059 +6230,190 @@
 
 <!-- -MN- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="mn" class="macro-id">MN</h3>
+</div>
 
-<a name="MN"></a>
-
-<p>
-<nobr>Macro: <strong>MN</strong> <kbd>LEFT | RIGHT</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>MN</b> <kbd class="macro-args">LEFT | RIGHT</kbd>
+</div>
 
 <p>
-Once you've initialized margin notes with
-<a href="#MN_INIT"><kbd>.MN_INIT</kbd></a>,
-you can enter margin notes any time you like with
-<kbd>.MN</kbd>.  An argument of <kbd>LEFT</kbd> will set
-a left margin note.  An argument of <kbd>RIGHT</kbd> will set
-a right margin note.
+Once you&#8217;ve initialized margin notes with
+<kbd><a href="#mn-init">.MN_INIT</a></kbd>,
+you can enter margin notes any time you like with <kbd>.MN</kbd>.
+An argument of <kbd>LEFT</kbd> will set a left margin note.  An
+argument of <kbd>RIGHT</kbd> will set a right margin note.
 </p>
 
 <p>
-Any argument, such as <kbd>OFF</kbd> (or
-<strong>QUIT</strong>, <strong>END</strong>, <strong>X</strong>,
+Any argument, such as <kbd>OFF</kbd> (or <kbd>QUIT, END, X</kbd>,
 etc) exits the current margin note.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<!-- -BLANK_PAGE- -->
-
-<a name="BLANK_PAGE_TITLE"><h2><u>Inserting a blank page into the document</u></h2></a>
-
-<a name="BLANK_PAGE"></a>
-<p>
-<nobr>Macro: <strong>BLANKPAGE</strong> <kbd>&lt;# of blank pages to insert&gt; | NULL</kbd></nobr>
-</p>
-
-<p>
-This one does exactly what you'd expect &mdash; inserts a blank
-page into the document.  Unless you give the optional argument,
-<kbd>NULL</kbd>, <strong>mom</strong> silently increments the page
-number of every blank page and keeps track of
-<a href="rectoverso.html#RECTO_VERSO">recto/verso</a>
-stuff, but otherwise, does nothing.  It's up to you, the user,
-to figure out what to do with this feature.  However, it's worth
-noting that without it, inserting completely blank pages, to use
-a vernacular Québécois phrase, &quot;c'est pas évident&quot;
-(somewhere between &quot;isn't easy&quot;, &quot;isn't obvious&quot;
-and &quot;isn't fun&quot;).
-</p>
-
-<p>
-The required argument to <strong>BLANK_PAGE</strong> is the
-number of blank pages to insert.  The argument is not optional,
-hence even if you only want one blank page, you have to tell
-<strong>mom</strong>:
-
-<pre>
-    .BLANKPAGE 1
-</pre>
-</p>
-
-<p>
-The optional argument, <kbd>MULL</kbd>, allows you to output the
-specified number of pages without <strong>mom</strong> incrementing
-the page number for each blank page.  She will, however, continue
-to keep track of which pages are recto/verso if recto/verso
-printing has been enabled.
-</p>
-
-<hr/>
-
 <!-- -FINIS- -->
 
-<a name="FINIS_INTRO"><h2><u>Document termination string</u></h2></a>
+<h2 id="finis-intro" class="macro-group">Document termination string</h2>
 
-<ul>
-    <li><a href="#FINIS">Tag: FINIS</a></li>
-    <ul>
-        <li><a href="#FINIS_STRING">Changing the FINIS string</a></li>
-        <li><a href="#FINIS_STRING_CAPS">Automatic capitalization of the FINIS string</a></li>
-        <li><a href="#FINIS_COLOR">Changing the FINIS color</a></li>
-    </ul>
+<ul style="margin-left: -.5em;">
+  <li><a href="#finis">Tag: FINIS</a></li>
+  <li>FINIS control macros
+  <ul style="margin-left: -1.25em;">
+    <li><a href="#finis-string">Changing the FINIS string</a></li>
+    <li><a href="#finis-string-caps">Automatic capitalization of the FINIS string</a></li>
+    <li><a href="#finis-color">Changing the FINIS color</a></li>
+  </ul></li>
 </ul>
 
 <p>
-The use of <strong>FINIS</strong> is optional.  If you invoke it
-(at the end of a document before
-<a href="#TOC">TOC</a>
+The use of FINIS is optional.  If you invoke it (at the end of a
+document before
+<kbd><a href="tables-of-contents.html#toc">.TOC</a></kbd>
 or
-<a href="#ENDNOTES">ENDNOTES</a>),
-<strong>mom</strong>
-deposits the word, END, centred after a blank line, beneath the last
-line of the document.  END is enclosed between
-<a href="definitions.html#TERMS_EM">em-dashes</a>.
-</p>
-
-<p>
-<strong>Please note</strong> that in versions of
-<strong>mom</strong> prior to 1.1.9, <strong>FINIS</strong> used to
-turn off
-<a href="definitions.html#TERMS_FOOTER">footers</a>
-(if they were on) and page numbering (if page numbers were at the
-bottom of the page).  Damned if I can recall why I thought anyone
-would want this behaviour; it has been removed.
+<kbd><a href="#endnotes">.ENDNOTES</a></kbd>),
+mom deposits the word, <b>END</b>, centred after a blank line,
+beneath the last line of the document. <b>END</b> is enclosed
+between
+<a href="definitions.html#em">em-dashes</a>,
+like this:
+<br/>
+<span class="pre-in-pp">
+  ...and they all lived happily ever after.
+                  &mdash; END &mdash;
+</span>
 </p>
 
 <p>
-If you're writing in a language other than English, you can
-change what <strong>mom</strong> prints for END with
-the control macro <strong>FINIS_STRING</strong>.
+If you&#8217;re writing in a language other than English, you can
+change what mom prints for END with the control macro,
+<a href="#finis-string">FINIS_STRING</a>.
 </p>
 
-<hr width="66%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="finis" class="macro-id">FINIS</h3>
+</div>
 
-<a name="FINIS"></a>
+<div class="box-macro-args">
+Macro: <b>FINIS</b>
+</div>
 
 <p>
-Macro: <strong>FINIS</strong>
-</p>
-
-<p>
-The use of <strong>FINIS</strong> is optional, but if you use
-it, it should be the last macro you invoke in a document (before
-<a href="#ENDNOTES">ENDNOTES</a>
+The use of FINIS is optional, but if you use it, it should be the
+last macro you invoke in a document (before
+<kbd><a href="#endnotes">.ENDNOTES</a></kbd>
 or
-<a href="#TOC">TOC</a>).
+<kbd><a href="tables-of-contents.html#toc">.TOC</a></kbd>).
 See
-<a href="#FINIS_INTRO">above</a>
-for a description of how <strong>FINIS</strong> behaves.
+<a href="#finis-intro">above</a>
+for a description of how FINIS behaves.
 </p>
 
-<p>
-<strong>NOTE:</strong> If you don't use <strong>FINIS</strong>,
-and you don't want
-<a href="definitions.html#TERMS_FOOTER">footers</a>
-(if they're on) or a page number at the bottom of the last page of
-a document, you have to turn them off manually, as the last two
-lines of your document file, like this:
-
-<pre>
-    .FOOTERS OFF
-    .PAGINATE OFF
-</pre>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you don&#8217;t use FINIS, and you don&#8217;t want
+<a href="definitions.html#footer">footers</a>
+(if they&#8217;re on) or a page number at the bottom of the last
+page of a document, you have to turn them off manually, as the last
+two lines of your document file, like this:
+<br/>
+<span class="pre-in-pp">
+  .FOOTERS OFF
+  .PAGINATE OFF
+</span>
 </p>
+</div>
 
 <!-- -FINIS STRING- -->
 
-<hr width="33%" align="left"/>
-
-<a name="FINIS_STRING"><h3><u>Changing the FINIS string</u></h3></a>
+<h3 id="finis-string" class="docs">Changing the FINIS string</h3>
 
 <p>
-By default, <strong>FINIS</strong> prints the word, END, between
-<a href="definitions.html#TERMS_EM">em-dashes</a>.
-If you'd like <strong>mom</strong> to print something else
-between the dashes, use the <strong>FINIS_STRING</strong> macro
-(anywhere in the document prior to <strong>FINIS</strong>).
+By default, FINIS prints the word, END, between
+<a href="definitions.html#em">em-dashes</a>.
+If you&#8217;d like mom to print something else between the dashes,
+use the FINIS_STRING macro (anywhere in the document prior to
+FINIS).
 </p>
 
 <p>
-For example, if your document's in French, you'd do
-
-<pre>
+For example, if your document&#8217;s in French, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
     .FINIS_STRING "FIN"
-</pre>
-
-Double-quotes must enclose the macro's argument.
+</span>
+Double-quotes must enclose the macro&#8217;s argument.
 </p>
 
-<p>
-<strong>NOTE:</strong> If you pass <strong>FINIS_STRING</strong>
-a blank string, i.e.
-
-<pre>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you pass FINIS_STRING a blank string, i.e.
+<br/>
+<span class="pre-in-pp">
     .FINIS_STRING ""
-</pre>
-
-<strong>mom</strong> will still print the em-dashes if you invoke
+</span>
+mom will still print the em-dashes when you invoke
 <kbd>.FINIS</kbd>.  This, in effect, produces a short, centred
 horizontal rule that terminates the document.  (In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-it's a short, dashed line composed of four hyphens.)
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
+it&#8217;s a short, dashed line composed of four hyphens.)
 </p>
+</div>
 
 <!-- -FINIS STRING CAPS- -->
 
-<hr width="33%" align="left"/>
-
-<a name="FINIS_STRING_CAPS"><h3><u>Automatic capitalization of the FINIS string</u></h3></a>
+<h3 id="finis-string-caps" class="docs">Automatic capitalization of the FINIS string</h3>
 
 <p>
-By default, <strong>mom</strong> sets the string you pass to
-<strong>FINIS</strong> all-caps.  If you'd prefer that she not
-do so, but rather respect the FINIS string exactly as you enter
-it, invoke the macro, <kbd>.FINIS_STRING_CAPS</kbd> with the
-<kbd>OFF</kbd> argument, like this:
-
-<pre>
+By default, mom sets the string you pass to FINIS all-caps.
+If you&#8217;d prefer that she not do so, but rather respect
+the FINIS string exactly as you enter it, invoke the macro,
+<kbd>.FINIS_STRING_CAPS</kbd> with the <kbd>OFF</kbd> argument, like
+this:
+<br/>
+<span class="pre-in-pp">
     .FINIS_STRING_CAPS OFF
-</pre>
-
-<kbd>OFF</kbd>, above, could be anything, e.g. <strong>NO</strong>
-or <strong>X</strong>.
+</span>
+<kbd>OFF</kbd>, above, could be anything, e.g. <kbd>NO</kbd> or
+<kbd>X</kbd>.
 </p>
 
 <!-- -FINIS COLOR- -->
 
-<hr width="33%" align="left"/>
-
-<a name="FINIS_COLOR"><h3><u>Changing the FINIS colour</u></h3></a>
+<h3 id="finis-color" class="docs">Changing the FINIS colour</h3>
 
 <p>
-Invoking the control macro, <strong>FINIS_COLOR</strong>, with a
-pre-defined (or &quot;initalized&quot;) color changes the colour of
-both the FINIS string and the em-dashes that surround it.  If you
+Invoking the control macro, <kbd>.FINIS_COLOR</kbd>, with a
+pre-defined (or &#8220;initalized&#8221;) color changes the colour
+of both the FINIS string and the em-dashes that surround it.  If you
 use the
-<a href="definitions.html#TERMS_INLINE">inline escape</a>,
-<a href="color.html#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a>,
-in the argument passed to <strong>FINIS</strong>, only the text
-will be in the new colour; the em-dashes will be in the default
-document colour (usually black).
-</p>
-
-<hr/>
-
-<!-- ==================================================================== -->
-
-<a name="TOC_INTRO"><h2><u>Tables of contents</u></h2></a>
-
-<ul>
-    <li><a href="#TOC_BEHAVIOUR">TOC behaviour</a>
-    <ul>
-         <li><a href="#PSSELECT">Using psselect to put the table of contents where you want</a></li>
-    </ul></li>
-    <li><a href="#TOC">Macro: TOC</a> &mdash; tell <strong>mom</strong> to output a table of contents</li>
-    <li><a href="#TOC_CONTROL">TOC control macros</a></li>
-</ul>
-
-<p>
-Want a table of contents for your document?  Easy.  Just enter
-
-<pre>
-    .TOC
-</pre>
-
-as the very last macro of your document file. <strong>Mom</strong>
-will have picked up all document titles (in
-<a href="rectoverso.html#COLLATE">collated</a>
-documents), all heads, subheads, and paragraph heads, as well as any
-endnotes pages that have been output, and assigned them the
-appropriate page number (and page numbering style).  Talk about a
-no-brainer!
-</p>
-
-<p>
-That said, tables of contents (tocs) have even more control macros
-than endnotes.  As always, the reason for so many control macros is
-so that if you want to change just about any aspect of the toc's
-typographic appearance, you can.  <strong>Mom</strong> is all about
-simplicity AND flexibility.
-</p>
-
-<a name="TOC_BEHAVIOUR"><h3><u>TOC behaviour</u></h3></a>
-
-<p>
-When you output a toc (with
-<a href="#TOC">TOC</a>),
-<strong>mom</strong> finishes processing the last page of your document,
-then breaks to a new page for printing the toc.
-</p>
-
-<p>
-<strong>Mom</strong> follows standard typesetting conventions for
-tables of contents.  To this end, if
-<a href="headfootpage.html#HEADERS">HEADERS</a>
-are on for the document, the first page of the toc has no page
-header, but does have a first page (roman numeral) number, always
-&quot;1&quot;, in the bottom margin.  If
-<a href="headfootpage.html#FOOTERS">FOOTERS</a>
-are on for the document, the first page has neither a footer, nor a
-page number in the top margin.  (If you absolutely must have a page
-footer on the first page of the toc, simply invoke
-<a href="headfootpage.html#FOOTER_ON_FIRST_PAGE"><kbd>.FOOTER_ON_FIRST_PAGE</kbd></a>
-immediately before <strong>TOC</strong>.)  Subsequent toc pages have
-both page headers or footers and a page number.
-</p>
-
-<p>
-Entries in the toc are hierarchically indented, as you would
-expect.  By default, each type of entry (e.g. a head or a subhead)
-is set in a different font as well.  If any of heads, subheads or
-paragraph heads are numbered in the body of the document, they are
-also numbered in the toc.  Head numbering in the toc is NOT
-concatenated as it is in the body of the document, which would be
-visually redundant in a toc.
-</p>
-
-<p>
-Tocs are never set in columns, regardless of whether the rest of
-the document is.  Lastly, if
-<a href="rectoverso.html#RECTO_VERSO">recto/verso</a>
-printing is enabled, the toc respects it.  This sometimes leads to
-tocs that begin with the wrong margins, but the margins can be
-corrected either by outputting a
-<a href="#BLANK_PAGE">BLANKPAGE</a>
-or by using the toc control macro
-<a href="#TOC_RV_SWITCH">TOC_RV_SWITCH</a>.
-</p>
-
-<p>
-The overall toc
-<a href="definitions.html#TERMS_FAMILY">family</a>,
-<a href="definitions.html#TERMS_PS">point size</a>
-and
-<a href="definitions.html#TERMS_LEADING">lead</a>
-can be altered with the toc 
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>,
-as can the family,
-<a href="definitions.html#TERMS_FONT">font</a>,
-point size and indent of each type of toc entry (i.e. title, head,
-subhead, paragraph head).  Furthermore, the page numbering style
-can be changed, as can the amount of visual space reserved for toc
-entry page numbers.
-</p>
-
-<a name="PSSELECT"><h4><u>Using psselect to put the table of contents where you want</u></h4></a>
-
-<p>
-<strong>Mom</strong> always outputs tables of contents as the last
-pages of any document.  While this is desirable for some language
-conventions &mdash; French, for example &mdash; it is not desirable
-for others.
-</p>
-
-<p>
-If you'd like your tables of contents to be placed somewhere else,
-you have two options: re-arrange the pages by hand (okay for one or
-two hard copies of your document), or use the <strong>psselect</strong>
-programme provided by the <strong>psutils</strong> suite of tools
-(which you may have to install as a package from your distribution
-if it is not already on your system).
-</p>
-
-<p>
-The procedure for using <strong>psselect</strong> begins by you
-determining how many pages comprise the table of contents.  You
-can do this by previewing the document with a PostScript viewer,
-say, <strong>gv</strong>.  Once you know the number of pages in the
-table of contents, use <strong>psselect</strong> to re-arrange them
-appropriately.
-</p>
-
-<p>
-Say, for example, the table of contents runs to just one page.  The
-command to place the one-page table of contents at the start of the
-document is:
-
-<pre>
-     psselect -p _1,1-_2 &lt;PostScript file&gt; &gt; &lt;new PostScript file&gt;
-</pre>
-</p>
-
-<p>
-The <kbd>-p</kbd> option instructs <strong>psselect</strong> that
-what follows is a comma-separated list of the order in which
-to re-arrange pages.  The underscore character means "counting
-backwards from the end of the document".  Thus, the above says
-"put the last page first (i.e. the table of contents), followed by
-all pages from the original first page up to the second to last."
-<strong>psselect</strong> outputs to stdout, so you have to redirect
-the output to a new file.
-</p>
-
-<p>
-If your table of contents runs to two pages, the command would look
-like this:
-
-<pre>
-     psselect -p _1-_2,1-_3 &lt;PostScript file&gt; &gt; &lt;new PostScript file&gt;
-</pre>
-</p>
-
-<p>
-If your table of contents runs to two pages and you have a cover
-page that you would like to appear before the toc, the command would look
-like this:
-
-<pre>
-     psselect -p 1,_1-_2,2-_3 &lt;PostScript file&gt; &gt; &lt;new PostScript file&gt;
-</pre>
-</p>
-
-<!-- -TOC- -->
-
-<hr width="33%" align="left"/>
-
-<a name="TOC"></a>
-
-<p>
-<a name="TOC">Macro: <strong>TOC</strong></a>
-</p>
-
-<p>
-If you want a toc, just put <strong>TOC</strong> as the last macro
-in a document.  <strong>Mom</strong> takes care of the rest.
-</p>
-
-<hr width="66%" align="left"/>
-
-<a name="TOC_CONTROL"><h3><u>TOC control macros</u></h3></a>
-
-<p>
-TOC control macros must be placed prior to invoking
-<a href="docprocessing.html#START"><kbd>.START</kbd></a>.
-</p>
-
-<p>
-<strong>ERRATUM:</strong> In versions of <strong>mom</strong> prior to
-1.3-e_3, the documentation stated that TOC control macros could go
-anywhere in a <strong>mom</strong> file prior to invoking
-<kbd>.TOC</kbd>.
-That convenience has been removed for Very Good Reasons.
-</p>
-
-<ol>
-    <li><a href="#TOC_GENERAL"><strong>General toc page style control</strong></a></li>
-        <ul>
-            <li><a href="#TOC_FAMILY">Base family for toc pages</a></li>
-            <li><a href="#TOC_PT_SIZE">Base point size for toc pages</a></li>
-            <li><a href="#TOC_LEAD">Leading of toc pages</a></li>
-        </ul>
-    <li><a href="#TOC_PAGENUMBERING"><strong>Toc page numbering</strong></a></li>
-        <ul>
-            <li><a href="#PAGINATE_TOC">Turn toc pagination on or off</a></li>
-
-            <li><a href="#TOC_PAGENUM_STYLE">Toc page numbering style</a></li>
-        </ul>
-    <li><a href="#TOC_HEADER"><strong>Changing the toc header (title), string and style</strong></a></li>
-        <ul>
-            <li><a href="#TOC_HEADER_STRING">Changing the string (title)</a></li>
-            <li><a href="#TOC_HEADER_STYLE">Changing the string (title) style</a></li>
-        </ul>
-    <li><a href="#TOC_STYLE"><strong>Changing the style for toc entries</strong></a></li>
-        <ul>
-            <li><a href="#TOC_INDENT">The toc _INDENT control macros</a></li>
-            <li><a href="#TOC_TITLE">Changing the style for toc title entries</a></li>
-            <li><a href="#TOC_HEAD">Changing the style for toc head entries</a></li>
-            <li><a href="#TOC_SUBHEAD">Changing the style for toc subhead entries</a></li>
-            <li><a href="#TOC_PARAHEAD">Changing the style for toc paragraph head entries</a></li>
-            <li><a href="#TOC_PN">Changing the style for toc page number listings</a></li>
-        </ul>
-    <li><a href="#TOC_ADDITIONAL"><strong>Additional toc control macros</strong></a></li>
-        <ul>
-            <li><a href="#TOC_TITLE_ENTRY">Change the wording of a toc title entry</a></li>
-            <li><a href="#TOC_APPENDS_AUTHOR">Append author(s) to toc title entries</a></li>
-            <li><a href="#TOC_RV_SWITCH">TOC_RV_SWITCH</a></li>
-            <li><a href="#TOC_PADDING">TOC_PADDING</a></li>
-        </ul>
-</ol>
-
-<hr width="66%" align="left"/>
-
-<a name="TOC_GENERAL"><h4><u>1. General toc page style control</u></h4></a>
-
-<a name="TOC_FAMILY"><h5>*<u>Toc family</u></h5></a>
-
-<p>
-See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
-</p>
-
-<p>
-Set the family of toc pages with <strong>TOC_FAMILY</strong>, which
-establishes the default family for every element of a toc page,
-including the toc title (&quot;Contents&quot;) and the page number
-in the top or bottom margin.  The default is the prevailing document
-family.
-</p>
-
-<p>
-All elements on a toc page also have their own _FAMILY
-control macros, which override the default set by
-<strong>TOC_FAMILY</strong>.
-</p>
-
-<!-- -TOC_PT_SIZE- -->
-
-<a name="TOC_PT_SIZE"><h5>*<u>Toc point size</u></h5></a>
-
-<p>
-<nobr>Macro: <strong>TOC_PT_SIZE</strong> <kbd>&lt;base type size of the toc&gt;</kbd></nobr>
-</p>
-
-<p>
-Unlike most other control macros that deal with size of document
-elements, <strong>TOC_PT_SIZE</strong> takes as its argument an
-absolute value, relative to nothing.  Therefore, the argument
-represents the size of toc type in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
-unless you append an alternative
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
-For example,
-
-<pre>
-    .TOC_PT_SIZE 12
-</pre>
-
-sets the base point size of type for the toc to 12 points, whereas
-
-<pre>
-    .TOC_PT_SIZE .6i
-</pre>
-
-sets the base point size of type for the toc to 1/6 of an inch.
-</p>
-
-<p>
-The type size set with <strong>TOC_PT_SIZE</strong> forms the basis
-from which the point size of other toc page elements are calculated.
-</p>
-
-<p>
-The default for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-is 12.5 points (the same default size used in the body of the
-document).
-</p>
-
-<!-- -TOC_LEAD- -->
-
-<a name="TOC_LEAD"><h5>*<u>Toc lead</u></h5></a>
-
-<p>
-<nobr>Macro: <strong>TOC_LEAD</strong> <kbd>&lt;leading of the toc&gt; [ ADJUST ]</kbd></nobr>
-<br/>
-
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>; points is assumed</em>
-</p>
-
-<p>
-Unlike most other control macros that deal with leading of document
-elements, <strong>TOC_LEAD</strong> takes as its argument an
-absolute value, relative to nothing.  Therefore, the argument
-represents the
-<a href="definitions.html#TERMS_LEADING">leading</a>
-of tocs in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-unless you append an alternative
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
-For example,
-
-<pre>
-    .TOC_LEAD 14
-</pre>
-
-sets the base leading of type on the endnotes page to 14
-points, whereas
-
-<pre>
-    .TOC_LEAD .5i
-</pre>
-
-sets the base leading of type on the endnotes page to 1/2 inch.
-</p>
-
-<p>
-If you want the leading of toc pages adjusted to fill the
-page, pass <strong>TOC_LEAD</strong> the optional argument
-<kbd>ADJUST</kbd>.  (See
-<a href="docprocessing.html#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a>
-for an explanation of leading adjustment.)
-</p>
-
-<p>
-The default for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-is the prevailing document lead (16 by default), adjusted.
-</p>
-
-<p>
-<strong>NOTE:</strong> Even if you give <strong>mom</strong>
-a <nobr><kbd>.DOC_LEAD_ADJUST OFF</kbd></nobr> command, she
-will still, by default, adjust toc leading.  You MUST enter
-<nobr><kbd>TOC_LEAD &lt;lead&gt;</kbd></nobr> with no
-<kbd>ADJUST</kbd> argument to disable this default behaviour.
-</p>
-
-<p>
-<strong>ADDITIONAL NOTE:</strong> Tocs are always double-spaced in
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-regardless of whether the body of the document is single-spaced.
-</p>
-
-<hr width="66%" align="left"/>
-
-<a name="TOC_PAGENUMBERING"><h4><u>2. Toc page numbering</u></h4></a>
-
-<p>
-The page numbering of toc pages is controlled by the same macros
-that control
-<a href="headfootpage.html#PAGINATION">document page numbering</a>,
-except
-<a href="headfootpage.html#PAGENUM">PAGENUM</a>
-(tocs always start on page 1).  The defaults are the same as for the
-rest of the document.
-</p>
-
-<p>
-If you wish to change some aspect of toc pagination, use
-the document pagination control macros immediately prior to
-<kbd>.TOC</kbd>.
-</p>
-
-<p>
-A special macro,
-<a href="#TOC_PAGENUM_STYLE">TOC_PAGENUM_STYLE</a>
-controls the style of toc pages page numbers.
-</p>
-
-<!-- -PAGINATE_TOC- -->
-
-<hr width="33%" align="left"/>
-
-<a name="PAGINATE_TOC"></a>
-
-<p>
-<nobr>Macro: <strong>PAGINATE_TOC</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
-
-<p>
-By default, <strong>mom</strong> paginates the toc.  If you'd like
-her not to, do 
-
-<pre>
-    .PAGINATE_TOC OFF
-</pre>
-</p>
-
-<p>
-<strong>NOTE:</strong> Simply invoking
-<nobr><kbd>.PAGINATION OFF</kbd></nobr>
-or
-<nobr><kbd>.PAGINATE OFF</kbd></nobr>
-disables toc pagination <em>for the first toc page only.</em> You
-MUST use <kbd>.PAGINATE_TOC OFF</kbd> to disable toc pagination,
-even if pagination is turned off elsewhere in your document.
-</p>
-
-<!-- -TOC_PAGENUM_STYLE- -->
+<a href="definitions.html#inline">inline escape</a>,
+<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>,
+in the argument passed to FINIS, only the text will be in the
+new colour; the em-dashes will be in the default document colour
+(usually black).
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="images.html#top">Next: Inserting images</a></td>
+</tr>
+</table>
 
-<hr width="33%" align="left"/>
+</div>
 
-<a name="TOC_PAGENUM_STYLE"></a>
-
-<p>
-<nobr>Macro: <strong>TOC_PAGENUM_STYLE</strong> <kbd>&lt;DIGIT | ROMAN | roman | ALPHA | alpha&gt;</kbd></nobr>
-</p>
-
-<p>
-By default, <strong>mom</strong> uses roman numerals to number toc
-pages.  Use <strong>TOC_PAGENUM_STYLE</strong> if you'd prefer
-something else.  For example, to have standard digits instead of
-roman numerals, do the following:
-
-<pre>
-    .TOC_PAGENUM_STYLE DIGIT
-</pre>
-</p>
-
-<hr width="66%" align="left"/>
-
-<a name="TOC_HEADER"><h4><u>3. Changing the toc header (title) string and style</u></h4></a>
-
-<p>
-The toc header string is the title that appears at to top of the
-toc.  By default, it's &quot;Contents&quot;.  If you'd like
-something else, say, &quot;Table of Contents&quot;, do
-</p>
-
-<p>
-<a name="TOC_HEADER_STRING"></a>
-<pre>
-    .TOC_HEADER_STRING "Table of Contents"
-</pre>
-
-<a name="TOC_HEADER_STYLE"></a>
-The style of the toc header (title) is managed by the usual control
-macros (see
-<a href="#CONTROL_MACRO_ARGS">arguments to the control macros</a>).
-</p>
-
-<p>
-<pre>
-    .TOC_HEADER_FAMILY  default = prevailing doc family (Times Roman in TYPEWRITE)
-    .TOC_HEADER_FONT    default = bold
-    .TOC_HEADER_SIZE    default = +4
-    .TOC_HEADER_QUAD    default = left
-</pre>
-
-<hr width="66%" align="left"/>
-
-<a name="TOC_STYLE"><h4><u>4. Changing the style for toc entries</u></h4></a>
-</p>
-
-<p>
-&quot;Toc entries&quot; refers to titles, heads, subheads and
-paragraph heads as they appear in the toc.  Their style is managed
-by the usual
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>,
-starting with TOC_
-</p>
-
-<a name="TOC_INDENT"><h5>*<u>The table of contents _INDENT control macros</u></h5></a>
-
-<p>
-The toc control macros that end in _INDENT all take a single
-argument that requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
-The argument is the distance to indent the entry, always measured
-from the left margin.  For example,
-
-<pre>
-    .TOC_HEAD_INDENT 2P
-</pre>
-
-indents head entries 2
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>
-from the left margin.
-</p>
-
-<a name="TOC_TITLE"><h5>*<u>Changing the style for toc title entries</u></h5></a>
-
-<p>
-(See
-<a href="#CONTROL_MACRO_ARGS">arguments to the control macros</a>).
-</p>
-
-<p>
-Toc title entries are the titles of documents that have been
-<a href="rectoverso.html#COLLATE">collated</a>
-together.
-</p>
-
-<pre>
-    .TOC_TITLE_FAMILY  default = prevailing doc family (Times Roman in TYPEWRITE)
-    .TOC_TITLE_FONT    default = bold italic
-    .TOC_TITLE_SIZE    default = +0
-    .TOC_TITLE_INDENT  default = 0 for TYPESET and TYPEWRITE
-</pre>
-
-<a name="TOC_HEAD"><h5>*<u>Changing the style for toc head entries</u></h5></a>
-
-<p>
-(See
-<a href="#CONTROL_MACRO_ARGS">arguments to the control macros</a>).
-</p>
-
-<p>
-Toc head entries are main heads that appear in the body of a
-document.
-</p>
-
-<pre>
-    .TOC_HEAD_FAMILY  default = prevailing doc family (Times Roman in TYPEWRITE)
-    .TOC_HEAD_FONT    default = bold
-    .TOC_HEAD_SIZE    default = +.5
-    .TOC_HEAD_INDENT  default = 18p for TYPESET; 2m for TYPEWRITE
-</pre>
-
-<a name="TOC_SUBHEAD"><h5>*<u>Changing the style for toc subhead entries</u></h5></a>
-
-<p>
-(See
-<a href="#CONTROL_MACRO_ARGS">arguments to the control macros</a>).
-</p>
-
-<p>
-Toc subhead entries are subheads that appear in the body of a
-document.
-</p>
-
-<pre>
-    .TOC_SUBHEAD_FAMILY  default = prevailing doc family (Times Roman in TYPEWRITE)
-    .TOC_SUBHEAD_FONT    default = roman
-    .TOC_SUBHEAD_SIZE    default = +0
-    .TOC_SUBHEAD_INDENT  default = 30p for TYPESET; 4m for TYPEWRITE
-</pre>
-
-<a name="TOC_PARAHEAD"><h5>*<u>Changing the style for toc paragraph head entries</u></h5></a>
-
-<p>
-(See
-<a href="#CONTROL_MACRO_ARGS">arguments to the control macros</a>).
-</p>
-
-<p>
-Toc paragraph head entries are paragraph heads that appear in the
-body of a document.
-</p>
-
-<pre>
-    .TOC_PARAHEAD_FAMILY  default = prevailing doc family (Times Roman in TYPEWRITE)
-    .TOC_PARAHEAD_FONT    default = italic
-    .TOC_PARAHEAD_SIZE    default = +0
-    .TOC_PARAHEAD_INDENT  default = 42p for TYPESET; 6m for TYPEWRITE
-</pre>
-
-<a name="TOC_PN"><h5>*<u>Changing the style for toc paragraph page number listings</u></h5></a>
-
-<p>
-(See
-<a href="#CONTROL_MACRO_ARGS">arguments to the control macros</a>).
-</p>
-
-<p>
-Toc paragraph head entries are paragraph heads that appear in the
-body of a document.
-</p>
-
-<pre>
-    .TOC_PN_FAMILY  default = prevailing doc family (Times Roman in TYPEWRITE)
-    .TOC_PN_FONT    default = roman
-    .TOC_PN_SIZE    default = +0
-</pre>
-
-<hr width="66%" align="left"/>
-
-<a name="TOC_ADDITIONAL"><h4><u>5. Additional toc macros</u></h4></a>
-
-<p>
-The following macros allow you to switch page margins should
-they be incorrect for recto/verso printing, to establish how
-many placeholders to leave for page listings, and to have
-<strong>mom</strong> append author(s) to toc title entries.
-</p>
-
-<!-- -TOC_RV_SWITCH- -->
-
-<hr width="33%" align="left"/>
-
-<a name="TOC_RV_SWITCH"></a>
-
-<p>
-Macro: <strong>TOC_RV_SWITCH</strong>
-</p>
-
-<p>
-<strong>TOC_RV_SWITCH</strong> doesn't take an argument.  It simply
-instructs <strong>mom</strong> to switch the left and right margins
-of
-<a href="rectoverso.html#RECTO_VERSO">recto/verso</a>
-documents should the toc happen to begin on an even page when you
-want an odd, or vice versa.
-</p>
-
-<p>
-The same result can be accomplished by outputting a
-<a href="#BLANK_PAGE">BLANKPAGE</a>.
-</p>
-
-<!-- -TOC_TITLE_ENTRY- -->
-
-<hr width="33%" align="left"/>
-
-<a name="TOC_TITLE_ENTRY"></a>
-
-<p>
-<nobr>Macro: <strong>TOC_TITLE_ENTRY</strong> <kbd>&lt;&quot;alternate wording for a title entry in the toc&quot;&gt;</kbd></nobr>
-</p>
-
-<p>
-In 
-<a href="rectoverso.html#COLLATE">collated</a>
-documents, the title of each separate document appears in the table
-of contents.  It may sometimes happen that you don't want the title
-as it appears in the toc to be the same as what appears in
-the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>.
-You might, for example, want to shorten it.  Or, in the case of
-chapters where the docheader contains both a chapter number and a
-chapter title, like this
-
-<pre>
-               Chapter 6
-    Burning Bush &mdash; Maybe God Was Right
-</pre>
-
-you might want only the chapter title, not the chapter number, to
-show up in the toc.  (By default, <strong>TOC</strong> generates
-both.)
-</p>
-
-<p>
-If you want to change the wording of a title entry in the toc,
-simply invoke <kbd>.TOC_TITLE_ENTRY</kbd> with the desired
-wording, enclosed in double-quotes.  Using the example, above,
-
-<pre>
-    .CHAPTER 6
-    .CHAPTER_TITLE "Burning Bush &mdash; Maybe God Was Right"
-    .TOC_TITLE_ENTRY "Burning Bush"
-    .DOCTYPE CHAPTER
-</pre>
-
-would identify chapter 6 in the toc simply as &quot;Burning
-Bush&quot;.
-</p>
-
-<!-- -TOC_APPENDS_AUTHOR- -->
-
-<hr width="33%" align="left"/>
-
-<a name="TOC_APPENDS_AUTHOR"></a>
-
-<p>
-<nobr>Macro: <strong>TOC_APPENDS_AUTHOR</strong> <kbd>&lt;none&gt; | &lt;&quot;name(s) of authors&quot;&gt;</kbd></nobr>
-</p>
-
-<p>
-In certain kinds of collated documents, different authors are
-responsible for the articles or stories contained within them.  In
-such documents, you may wish to have the author or authors
-appended to the toc's title entry for each story or article.
-</p>
-
-<p>
-If you invoke <kbd>.TOC_APPENDS_AUTHOR</kbd> with no argument,
-<strong>mom</strong> appends the first argument you passed to
-<a href="docprocessing.html#AUTHOR">AUTHOR</a>
-to toc title entries, separated by a front-slash.
-</p>
-
-<p>
-If you invoke <kbd>.TOC_APPENDS_AUTHOR</kbd> with an argument
-(surrounded by double-quotes), <strong>mom</strong> will append it
-to the toc title entries instead.  This is useful if you have
-multiple authors you wish to identify by last name only.  For
-example, if three authors &mdash; Joe Blough, Jane Doe, and John
-Deere &mdash; are responsible for a single article
-
-<pre>
-    .TOC_APPENDS_AUTHOR "Blough et al."
-</pre>
-
-would be a good way to identify them in the toc.
-</p>
-
-<!-- -TOC_PADDING- -->
-
-<hr width="33%" align="left"/>
-
-<a name="TOC_PADDING"></a>
-
-<p>
-<nobr>Macro: <strong>TOC_PADDING</strong> <kbd>&lt;number of placeholders to allow for page number listings&gt;</kbd></nobr>
-</p>
-
-<p>
-By default, <strong>mom</strong> allows room for 3 digits in the
-page number listings of tocs.  If you'd like some other number of
-placeholders, say 2, do
-
-<pre>
-    .TOC_PADDING 2
-</pre>
-</p>
-
-<hr/>
-
-<!-- -PSPIC- -->
-
-<h2><u>Inserting images into a document &mdash; the PSPIC macro</u></h2>
-
-<a name="PSPIC"></a>
-
-<p>
-<nobr>Macro: <strong>PSPIC</strong> <kbd>[ -L | -R | -I &lt;n&gt; ] &lt;file&gt; [ width [ height ] ]</kbd></nobr>
-</p>
-
-<p>
-You can insert images into a document by using the
-<strong>PSPIC</strong> macro. <strong>PSPIC</strong> isn't
-actually part of <strong>mom</strong>; it comes packaged with
-<strong>groff</strong> itself.  Use it whenever you want to insert
-images into a <strong>mom</strong> document.  The image must be
-in PostScript format, either straight .ps or .eps (Encapsulated
-PostScript).  There have been reports of trouble with PostScript
-level 2 images, so don't save your images in this format.
-</p>
-
-<p>
-<kbd>man groff_tmac</kbd> contains the documentation for
-<strong>PSPIC</strong>, but I'll repeat it here with a few
-modifications.
-</p>
-
-<p>
----<em>From man groff_tmac</em>---
-<br/><br/>
-<strong><kbd>&lt;file&gt;</kbd></strong> is the name of the file
-containing the illustration; width and height give the desired width
-and height of the graphic.  The width and height arguments may have
-<a href="definitions.html#TERMS_UNITOFMEASURE">units of measure</a>
-attached; the default unit of measure is
-<strong><kbd>i</kbd></strong>.  This macro will scale the graphic
-uniformly in the x and y directions so that it is no more than
-width wide and height high.  By default, the graphic will be
-horizontally centered.  The <strong><kbd>-L</kbd></strong>
-and <strong><kbd>-R</kbd></strong> options cause the graphic
-to be left-aligned and right-aligned, respectively.  The
-<strong><kbd>-I</kbd></strong> option causes the graphic to be
-indented by <kbd>&lt;n&gt;</kbd> (default unit of measure is
-&quot;m&quot;).
-<br/><br/>
--------------------------
-</p>
-
-<p>
-Unless you're a PostScript whiz and have futzed around with
-bounding boxes and whatnot, it's unlikely that your image will
-occupy an easily predictable and precise amount of space on the
-page.  This is particularly significant when it comes to the amount
-of vertical space occupied by the image.  A certain amount of
-manual tweaking of the vertical placement of the image will
-probably be required, via the
-<a href="typesetting.html#ALD">ALD</a>
-and
-<a href="typesetting.html#RLD">RLD</a>
-macros.
-</p>
-
-<p>
-Additionally, images inserted into
-<a href="definitions.html#TERMS_RUNNING">running text</a>
-will almost certainly disrupt the baseline placement of running
-text.  In order to get <strong>mom</strong> back on track after
-invoking <kbd>.PSPIC</kbd>, I strongly recommend using the
-<a href="docprocessing.html#SHIM">SHIM</a>
-macro so that the bottom margin of running text falls where it
-should.
-</p>
-
-<hr/>
-
-<p>
-<a href="headfootpage.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="docprocessing.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/docprocessing.html groff-1.21/contrib/mom/momdoc/docprocessing.html
--- groff-1.20.1/contrib/mom/momdoc/docprocessing.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/docprocessing.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2010, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,328 +16,226 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Document Processing, Introduction and Setup</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Document Processing, Introduction and Setup</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
-
-<a name="TOP"></a>
-
-<p>
-<a href="typemacdoc.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="color.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
-
-<a name="DOCPROCESSING"><h1 align="center"><u>Document processing with mom</u></h1></a>
 
-<p>
-<a href="#INTRO_MACROS_DOCPROCESSING">Introduction to document processing</a>
-<br/>
-
-<a href="#DEFAULTS">Some document defaults</a>
-<br/>
+<body style="background-color: #f5faff;">
 
-<a href="#LEADING_NOTE">***IMPORTANT NOTE on leading/spacing and bottom margins***</a>
-<br/>
-
-<a href="#SHIM">The SHIM macro</a>
-</p>
+<!-- ==================================================================== -->
 
-<h2><u>Table of Contents for document processing</u></h2>
+<div id="top" class="page">
 
-<ul>
-    <li><a href="#SETUP"><strong>DOCUMENT SETUP</strong></a>
-        <br/>
-        <a href="#DOCPROCESSING_TUT">Tutorial &mdash; setting up a mom document</a>
-    </li>
-    <ul>
-        <li><a href="#REFERENCE_MACROS"><strong>The Reference Macros</strong></a></li>
-        <ul>
-            <li><a href="#TITLE">TITLE</a></li>
-            <li><a href="#DOC_TITLE">DOCTITLE</a></li>
-            <li><a href="#SUBTITLE">SUBTITLE</a></li>
-            <li><a href="#AUTHOR">AUTHOR</a></li>
-            <li><a href="#CHAPTER">CHAPTER</a></li>
-            <li><a href="#CHAPTER_TITLE">CHAPTER_TITLE</a></li>
-            <li><a href="#DRAFT">DRAFT</a></li>
-            <li><a href="#REVISION">REVISION</a></li>
-            <li><a href="#COPYRIGHT">COPYRIGHT</a></li>
-            <li><a href="#MISC">MISC</a></li>
-        </ul>
-        <li><a href="#DOCSTYLE_MACROS"><strong>The Docstyle Macros</strong></a></li>
-        <ul>
-            <li><a href="#DOCTYPE">DOCTYPE</a></li>
-            <li><a href="#PRINTSTYLE">PRINTSTYLE</a></li>
-            <li><a href="#COPYSTYLE">COPYSTYLE</a></li>
-        </ul>
-        <li><a href="#START_MACRO"><strong>Initiate document processing</strong></a></li>
-        <ul>
-            <li><a href="#START">START</a></li>
-        </ul>
-        <li><a href="#STYLE_BEFORE_START"><strong>Changing global typesetting and formatting parameters before START</strong></a></li>
-        <ul>
-            <li><a href="#TYPE_BEFORE_START">Using the typesetting macros before START</a></li>
-            <ul>
-                <li><a href="docprocessing.html#INCLUDE">Including (sourcing) style sheets and files</a></li>
-                <li><a href="#COLOR">Initializing colours</a></li>
-            </ul>
-            <li><a href="#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST &mdash; adjust a document's leading to fill pages</a></li>
-            <li><a href="#DOCHEADER">Managing the document header</a></li>
-            <ul>
-                <li><a href="#DOCHEADER">DOCHEADER &mdash; turning docheaders off</a></li>
-                <li><a href="#DOCHEADER_CONTROL">Docheader control</a></li>
-            </ul>
-        </ul>
-        <li><a href="#COLUMNS_INTRO"><strong>Setting documents in columns</strong></a></li>
-        <ul>
-            <li><a href="#COLUMNS">COLUMNS</a></li>
-            <li><a href="#BREAKING_COLUMNS">Breaking columns manually</a></li>
-            <ul>
-                <li><a href="#COL_NEXT">COL_NEXT</a></li>
-                <li><a href="#COL_BREAK">COL_BREAK</a></li>
-            </ul>
-        </ul>
-        <li><a href="#DOC_PARAM_MACROS"><strong>Changing global style parameters after START</strong></a></li>
-        <ul>
-            <li><a href="#DOC_LEFT_MARGIN">DOC_LEFT_MARGIN</a></li>
-            <li><a href="#DOC_RIGHT_MARGIN">DOC_RIGHT_MARGIN</a></li>
-            <li><a href="#DOC_LINE_LENGTH">DOC_LINE_LENGTH</a></li>
-            <li><a href="#DOC_FAMILY">DOC_FAMILY</a></li>
-            <li><a href="#DOC_PT_SIZE">DOC_PT_SIZE</a></li>
-            <li><a href="#DOC_LEAD">DOC_LEAD</a></li>
-            <li><a href="#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a></li>
-            <li><a href="#DOC_QUAD">DOC_QUAD</a></li>
-        </ul>
-        <li><a href="typemacdoc.html#TYPESETTING"><strong>Using the typesetting macros during document processing</strong></a></li>
-        <li><a href="docelement.html#DOCELEMENT"><strong>THE DOCUMENT ELEMENT TAGS</strong></a></li>
-        <ul>
-            <li><a href="docelement.html#DOCELEMENT_INTRO">Introduction to the document element tags</a></li>
-            <ul>
-                <li><a href="docelement.html#DOCELEMENT_CONTROL">Document element (tag) control macros</a></li>
-                <li><a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a></li>
-            </ul>
-            <li><a href="docelement.html#EPIGRAPH_INTRO"><strong>Epigraphs</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#EPIGRAPH">EPIGRAPH</a></li>
-                <li><a href="docelement.html#EPIGRAPH_CONTROL">Epigrah control</a></li>
-            </ul>
-            <li><a href="docelement.html#PP_INTRO"><strong>Paragraphs</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#PP">PP</a></li>
-                <li><a href="docelement.html#PP_CONTROL">Paragraph control</a></li>
-            </ul>
-            <li><a href="docelement.html#HEAD_INTRO"><strong>Main heads</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#HEAD">HEAD</a></li>
-                <li><a href="docelement.html#HEAD_CONTROL">Head control</a></li>
-            </ul>
-            <li><a href="docelement.html#SUBHEAD_INTRO"><strong>Subheads</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#SUBHEAD">SUBHEAD</a></li>
-                <li><a href="docelement.html#SUBHEAD_CONTROL">Subhead control</a></li>
-            </ul>
-            <li><a href="docelement.html#PARAHEAD_INTRO"><strong>Paragraph heads</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#PARAHEAD">PARAHEAD</a></li>
-                <li><a href="docelement.html#PARAHEAD_CONTROL">Parahead control</a></li>
-            </ul>
-            <li><a href="docelement.html#LINEBREAK_INTRO"><strong>Linebreaks (author linebreaks, also called section breaks)</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#LINEBREAK">LINEBREAK</a></li>
-                <li><a href="docelement.html#LINEBREAK_CONTROL">Linebreak control</a></li>
-            </ul>
-            <li><a href="docelement.html#QUOTE_INTRO"><strong>Quotes (line for line poetic quotes or code snippets)</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#QUOTE">QUOTE</a></li>
-                <li><a href="docelement.html#QUOTE_CONTROL">Quote control</a></li>
-            </ul>
-            <li><a href="docelement.html#BLOCKQUOTE_INTRO"><strong>Blockquotes (cited material)</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#BLOCKQUOTE">BLOCKQUOTE</a></li>
-                <li><a href="docelement.html#BLOCKQUOTE_CONTROL">Blockquote control</a></li>
-            </ul>
-            <li><a href="docelement.html#FOOTNOTE_INTRO"><strong>Footnotes</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#FOOTNOTE">FOOTNOTE</a></li>
-                <li><a href="docelement.html#FOOTNOTE_CONTROL">Footnote control</a></li>
-            </ul>
-            <li><a href="docelement.html#ENDNOTE_INTRO"><strong>Endnotes</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#ENDNOTE">ENDNOTE</a></li>
-                <li><a href="docelement.html#ENDNOTE_CONTROL">Endnote control</a></li>
-            </ul>
-            <li><a href="docelement.html#FINIS_INTRO"><strong>Document termination string</strong></a></li>
-            <ul>
-                <li><a href="docelement.html#FINIS">FINIS</a></li>
-                <li><a href="docelement.html#FINIS_CONTROL">Finis control</a></li>
-            </ul>
-        </ul>
-        <li><a href="headfootpage.html#HEADFOOTPAGE"><strong>HEADERS and FOOTERS</strong></a></li>
-        <ul>
-            <li><a href="headfootpage.html#HEADFOOTPAGE_INTRO">Introduction to headers/footers</a></li>
-            <li><a href="headfootpage.html#HEADFOOT_MANAGEMENT">Managing headers/footers</a></li>
-            <ul>
-                <li><a href="headfootpage.html#HEADERS">HEADERS</a> &mdash; on or off</li>
-                <li><a href="headfootpage.html#FOOTERS">FOOTERS</a> &mdash; on or off</li>
-                <li><a href="headfootpage.html#FOOTER_ON_FIRST_PAGE">FOOTER_ON_FIRST_PAGE</a></li>
-            </ul>
-            <li><a href="headfootpage.html#HEADFOOT_CONTROL">Header/footer control</a></li>
-            <ul>
-                <li><a href="headfootpage.html#HDRFTR_STRINGS">Header/footer strings</a></li>
-                <li><a href="headfootpage.html#HDRFTR_STYLE">Header/footer style</a> &mdash; global and part-by-part</li>
-                <li><a href="headfootpage.html#HDRFTR_VERTICAL">Header/footer placement and spacing</a></li>
-                <li><a href="headfootpage.html#HDRFTR_SEPARATOR">The header/footer separator rule</a></li>
-            </ul>
-        </ul>
-        <li><a href="headfootpage.html#PAGINATION"><strong>PAGINATION</strong></a></li>
-        <ul>
-            <li><a href="headfootpage.html#PAGINATE">PAGINATE</a> &mdash; on or off</li>
-            <li><a href="headfootpage.html#PAGENUMBER">PAGENUMBER</a> &mdash; user supplied page number</li>
-            <li><a href="headfootpage.html#PAGENUM_STYLE">PAGENUM_STYLE</a> &mdash; digits, roman numerals, etc.</li>
-            <li><a href="headfootpage.html#DRAFT_WITH_PAGENUMBER">DRAFT_WITH_PAGENUMBER</a> &mdash; attach draft/revision information to page numbers</li>
-            <li><a href="headfootpage.html#PAGINATE_CONTROL">Pagination control</a></li>
-        </ul>
-        <li><a href="rectoverso.html#RECTOVERSO"><strong>RECTO_VERSO PRINTING and COLLATING</strong></a></li>
-        <ul>
-            <li><a href="rectoverso.html#RECTOVERSO_INTRO">Introduction to recto/verso</a></li>
-            <ul>
-                <li><a href="rectoverso.html#RECTO_VERSO">RECTO_VERSO</a></li>
-                <li><a href="rectoverso.html#SWITCH_HDRFTR">SWITCH_HEADERS</a> (also FOOTERS)</li>
-            </ul>
-            <li><a href="rectoverso.html#COLLATE_INTRO">Introduction to collating</a></li>
-            <ul>
-                <li><a href="rectoverso.html#COLLATE">COLLATE</a></li>
-            </ul>
-        </ul>
-        <li><a href="cover.html#TOP"><strong>CREATING A COVER PAGE</strong></a></li>
-        <li><a href="letters.html#LETTERS"><strong>WRITING LETTERS</strong></a></li>
-        <ul>
-            <li><a href="letters.html#LETTERS_INTRO">Introduction to writing letters</a></li>
-            <li><a href="letters.html#TUTORIAL">Tutorial on writing letters</a></li>
-            <li><a href="letters.html#LETTERS_DEFAULTS">Default style for letters</a></li>
-            <li><a href="letters.html#LETTERS_MACROS">The letter macros</a></li>
-        </ul>
-    </ul>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="docelement.html#top">Next: The document element tags</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Document processing with mom</h1>
+
+<div style="text-align: center;">
+<ul class="no-enumerator" style="margin-left: -2.5em;">
+  <li><a href="#defaults">Document defaults</a></li>
+  <li><a href="#leading-note">Important note on leading/spacing and bottom margins</a></li>
+  <li><a href="#shim">The SHIM macro</a></li>
+</ul>
+</div>
+
+<div class="rule-medium"><hr/></div>
+
+<h2 id="toc-doc-processing" class="docs" style="text-align: center;">Table of contents</h2>
+
+<div id="docprocessing-mini-toc" style="font-size: 90%; line-height: 150%; margin-top: .5em;">
+<div class="mini-toc-col-1" style="margin-left: 0;">
+<h3 class="toc toc-docproc-header" style="margin-top: 1em;"><a class="header-link" href="#docprocessing-intro">Introduction</a></h3>
+<h3 class="toc toc-docproc-header" style="margin-top: .5em;"><a class="header-link" href="#setup">Document setup</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#docprocessing-tut"><b>Tutorial &ndash; Setting up a mom document</b></a></li>
+  <li><a href="#reference-macros"><b>The reference macros</b></a>
+  <ul class="toc-docproc">
+    <li><a href="#title">TITLE</a></li>
+    <li><a href="#doc-title">DOCTITLE</a></li>
+    <li><a href="#subtitle">SUBTITLE</a></li>
+    <li><a href="#author">AUTHOR</a></li>
+    <li><a href="#chapter">CHAPTER</a></li>
+    <li><a href="#chapter-title">CHAPTER_TITLE</a></li>
+    <li><a href="#draft">DRAFT</a></li>
+    <li><a href="#revision">REVISION</a></li>
+    <li><a href="#copyright">COPYRIGHT</a></li>
+    <li><a href="#misc">MISC</a></li>
+    <li><a href="#covertitle">COVERTITLE</a></li>
+    <li><a href="#doc-covertitle">DOC_COVERTITLE</a></li>
+  </ul></li>
+  <li><a href="#docstyle-macros"><b>The docstyle macros</b></a>
+  <ul class="toc-docproc">
+    <li><a href="#doctype">DOCTYPE</a></li>
+    <li><a href="#printstyle">PRINTSTYLE</a></li>
+    <li><a href="#copystyle">COPYSTYLE</a></li>
+  </ul></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#start-macro">Initiate document processing</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#start"><b>The START macro</b></a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#style-before-start">Establishing type and formatting<br/><span style="display: block; margin-top: -.3em;">parameters before START</span></a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#type-before-start"><b>Behaviour of the typesetting macros before START</b></a>
+  <ul class="toc-docproc">
+    <li><a href="docprocessing.html#include">Including (sourcing) style sheets and files</a></li>
+    <li><a href="#color">Initializing colours</a></li>
+  </ul></li>
+</ul>
+</div>
+<div class="mini-toc-col-2" style="margin-top: -.5em;">
+<br/>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#doc-lead-adjust"><b>Adjust linespacing to fill pages</b></a>
+  <ul class="toc-docproc">
+    <li><a href="#doc-lead-adjust">DOC_LEAD_ADJUST</a></li>
+    <li><a href="#shim">SHIM</a> &ndash; the macro to get document leading back on track</li>
+  </ul></li>
+  <li><a href="#docheader"><b>Managing the document header</b></a>
+  <ul class="toc-docproc">
+    <li><a href="#docheader">DOCHEADER</a></li>
+    <li><a href="#docheader-control">Docheader control</a>
+    <ul class="toc-docproc">
+      <li><a href="#docheader-desc">Docheader description</a></li>
+      <li><a href="#index-docheader-control">Macro list</a></li>
+    </ul></li>
+  </ul></li>
+  <li><a href="#columns-intro"><b>Setting documents in columns</b></a>
+  <ul class="toc-docproc">
+    <li><a href="#columns">COLUMNS</a></li>
+    <li><a href="#breaking-columns">Breaking columns manually</a>
+    <ul class="toc-docproc">
+      <li><a href="#col-next">COL_NEXT</a></li>
+      <li><a href="#col-break">COL_BREAK</a></li>
+    </ul></li>
+  </ul></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#style-after-start">Changing basic type and formatting<br/><span style="display: block; margin-top: -.3em;">parameters after START</span></a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#behaviour"><b>Behaviour of the typesetting macros during document processing</b></a></li>
+  <li><a href="docprocessing.html#index-doc-param"><b>Post-START global style change macros</b></a>
+  <ul class="toc-docproc">
+    <li><a href="#doc-left-margin">DOC_LEFT_MARGIN</a></li>
+    <li><a href="#doc-right-margin">DOC_RIGHT_MARGIN</a></li>
+    <li><a href="#doc-line-length">DOC_LINE_LENGTH</a></li>
+    <li><a href="#doc-family">DOC_FAMILY</a></li>
+    <li><a href="#doc-pt-size">DOC_PT_SIZE</a></li>
+    <li><a href="#doc-lead">DOC_LEAD</a></li>
+    <li><a href="#doc-lead-adjust">DOC_LEAD_ADJUST</a></li>
+    <li><a href="#doc-quad">DOC_QUAD</a></li>
+  </ul></li>
 </ul>
+</div>
+</div>
 
-<hr/>
+<div class="rule-medium" style="clear: both;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<h2><a name="INTRO_MACROS_DOCPROCESSING"><u>Introduction to document processing</u></a></h2>
+<h2 id="docprocessing-intro" class="docs">Introduction to document processing</h2>
 
 <p>
-As explained in
-<a href="intro.html#INTRO_DOCPROCESSING">Document processing with mom</a>,
-document processing uses markup tags to identify document elements
-such as heads, paragraphs, and so on.  The tags are, of course, macros,
-but with sensible, readable names that make them easy to grasp and
-easy to remember.  (And don't forget: if you don't like the
-&quot;official&quot; name of a tag &mdash; too long, cumbersome
-to type in, not &quot;intuitive&quot; enough &mdash; you can change it
-with the
-<a href="goodies.html#ALIAS">ALIAS</a>
+Document processing with mom uses markup tags to identify document elements
+such as heads, paragraphs, and so on.  The tags are, of course,
+macros, but with sensible, readable names that make them easy
+to grasp and easy to remember.  (And don&#8217;t forget: if you
+don&#8217;t like the &#8220;official&#8221; name of a tag &mdash;
+too long, cumbersome to type in, not &#8220;intuitive&#8221; enough
+&mdash; you can change it with the
+<a href="goodies.html#alias">ALIAS</a>
 macro.)
 </p>
 
 <p>
-In addition to the tags themselves, <strong>mom</strong> has an
-extensive array of macros that control how they look and behave.
+In addition to the tags themselves, mom has an extensive array of
+macros that control how they look and behave.
 </p>
 
 <p>
-Setting up a <strong>mom</strong> doc is a simple, four-part procedure.
-You begin by entering information about the document itself (title,
-subtitle, author, etc.).  Next, you tell <strong>mom</strong> what
-kind of document you're creating (e.g. chapter, letter, abstract,
-etc...) and what kind of output you want (typeset, typewritten,
-draft-style, etc).  Thirdly, you make as many or as few changes to
-<strong>mom</strong>'s default behaviour as you wish.  Lastly, you
-invoke the
-<a href="#START">START</a>
-macro.  Voilà!  You're ready to write.
+Setting up a mom doc is a simple, four-part procedure.  You
+begin by entering information about the document itself (title,
+subtitle, author, etc.).  Next, you tell mom what kind of document
+you&#8217;re creating (e.g. chapter, letter, abstract, etc...) and
+what kind of output you want (typeset, typewritten, draft-style,
+etc).  Thirdly, you make as many or as few changes to mom&#8217;s
+default behaviour as you wish.  Lastly, you invoke the
+<kbd><a href="#start">START</a></kbd>
+macro.  Voilà!  You&#8217;re ready to write.
 </p>
 
 <!-- ==================================================================== -->
 
-<hr align="left" width="66%"/>
-
-<h2><a name="DEFAULTS"><u>Some document defaults</u></a></h2>
+<h2 id="defaults" class="docs">Document defaults</h2>
 
 <p>
-As is to be expected, <strong>mom</strong> has defaults for
-everything.  If you want to know a particular default, read about it
-in the description of the pertinent tag.
+As is to be expected, mom has defaults for everything.  If you want
+to know a particular default, read about it in the description of
+the pertinent tag.
 </p>
 
 <p>
 I fear the following may not be adequately covered in the
-documentation.  Just in case, here they are.
-
-<ul>
-    <li>the paper size is 8.5x11 inches</li>
-    <li>the left and right margins are 1-inch</li>
-    <li>the top and bottom margins for document text are plus/minus
-        visually 1-inch
-    </li>
-    <li>pages are numbered; the number appears centred, at the
-        bottom, surrounded by hyphens <nobr>( e.g. -6- )</nobr>
-    </li>
-    <li>the first page of a document begins with a
-        <a href="definitions.html#TERMS_DOCHEADER">document header</a>
-    </li>
-    <li>subsequent pages have
-        <a href="definitions.html#TERMS_HEADER">page headers</a>
-        with a rule underneath
-    </li>
-</ul>
-</p>
-
-<p>
-Another way to check up on document processing defaults is to have
-a look at the macro file (om.tmac).  Each macro is preceded by a
-description that (generally) says what its default is (if it has
-one).
+documentation, so just in case:
 </p>
+<ul style="margin-top: -.5em; margin-bottom: .5em;">
+  <li>the paper size is 8.5x11 inches</li>
+  <li>the left and right margins are 1-inch</li>
+  <li>the top and bottom margins for document text are plus/minus
+      visually 1-inch
+  </li>
+  <li>pages are numbered; the number appears centred, at the
+      bottom, surrounded by hyphens ( e.g. -6- )
+  </li>
+  <li>the first page of a document begins with a
+      <a href="definitions.html#docheader">document header</a>
+  </li>
+  <li>subsequent pages have
+      <a href="definitions.html#header">page headers</a>
+      with a rule underneath
+  </li>
+</ul>
 
 <!-- ==================================================================== -->
 
-<hr align="left" width="66%"/>
-
-<a name="LEADING_NOTE"><h2><u>IMPORTANT NOTE on leading/spacing and bottom margins</u></h2></a>
+<h2 id="leading-note" class="docs">Important note on leading/spacing and bottom margins</h2>
 
 <p>
-<strong>Mom</strong> takes evenly-aligned bottom margins in
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+Mom takes evenly-aligned bottom margins in
+<a href="definitions.html#running">running text</a>
 very seriously.  Only under a very few (exceptional) circumstances
-will she allow a bottom margin to &quot;hang&quot; (i.e. to fall
+will she allow a bottom margin to &#8220;hang&#8221; (i.e. to fall
 short).
 </p>
 
 <p>
-In order to ensure even bottom margins, <strong>mom</strong>
-uses the &quot;base&quot; document
-<a href="definitions.html#TERMS_LEADING">leading</a>
-in effect <em>at the start of running text on each page</em> (i.e.
+In order to ensure even bottom margins, mom uses the
+&#8220;base&#8221; document
+<a href="definitions.html#leading">leading</a>
+in effect <i>at the start of running text on each page</i> (i.e.
 the leading used in paragraphs) to calculate the spacing of every
 document element.  Prior to invoking
-<a href="#START">START</a>,
+<a href="#start">START</a>,
 this is set with the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macro</a>
-<a href="typesetting.html#LEADING">LS</a>,
+<a href="typesetting.html#macros-typesetting">typesetting macro</a>
+<a href="typesetting.html#leading">LS</a>,
 afterwards with the document
-<a href="definitions.html#TERMS_CONTROLMACRO">control macro</a>
-<a href="#DOC_LEAD">DOC_LEAD</a>.
+<a href="definitions.html#controlmacro">control macro</a>
+<a href="#doc-lead">DOC_LEAD</a>.
 </p>
 
 <p>
-Because <strong>mom</strong> relies so heavily on the base document
+Because mom relies so heavily on the base document
 leading, any change to the leading or spacing on a page will almost
-certainly have undesirable consequences on that page's bottom margin
+certainly have undesirable consequences on that page&#8217;s bottom margin
 unless the change is fully compensated for elsewhere on the page.
 </p>
 
@@ -348,238 +246,243 @@
 </p>
 
 <p>
-If it's a question of adding or subtracting full line spaces between
-or within document elements, you can do so by using the &quot;v&quot;
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-with whatever spacing macro you choose &mdash;
-<a href="typesetting.html#ALD">ALD</a>,
-<a href="typesetting.html#RLD">RLD</a>,
-<a href="typesetting.html#SPACE">SPACE</a>
-&mdash; and <strong>mom</strong> won't object.  &quot;v&quot; means
-&quot;the current leading&quot;, so she isn't confused by it.  And
-since &quot;v&quot; accepts decimal fractions, you can add/subtract
-half linespaces and quarter linespaces with &quot;v&quot; as well,
-<em>provided you compensate for the fractional linespace somewhere
-else on the page</em>.
+If it&#8217;s a question of adding or subtracting full
+line spaces between or within document elements, you
+can do so by using the &#8220;<kbd>v</kbd>&#8221; <a
+href="definitions.html#unitofmeasure">unit of measure</a> with
+whatever spacing macro you choose &mdash;
+<a href="typesetting.html#ald">ALD</a>,
+<a href="typesetting.html#rld">RLD</a>,
+<a href="typesetting.html#space">SPACE</a>
+&mdash; and mom won&#8217;t object.  &#8220;<kbd>v</kbd>&#8221; means
+&#8220;the current leading&#8221;, so she isn&#8217;t confused by it.  And
+since &#8220;<kbd>v</kbd>&#8221; accepts decimal fractions, you can add/subtract
+half linespaces and quarter linespaces with &#8220;<kbd>v</kbd>&#8221; as well,
+<i>provided you compensate for the fractional linespace somewhere
+else on the page</i>.
 </p>
 
 <p>
-If all this seems like too much work, <strong>mom</strong>
-provides a special macro to get you out of trouble if you've played
-around with leading and/or spacing.  The macro is called
-<strong>SHIM</strong> (like those little pieces of wood carpenters
-use to get their work even, level and snug), and it's described
-below.
+If all this seems like too much work, mom provides a special macro
+to get you out of trouble if you&#8217;ve played around with leading
+and/or spacing.  The macro is called SHIM (like those little pieces
+of wood carpenters use to get their work even, level and snug), and
+it&#8217;s described below.
 </p>
 
 <!-- -SHIM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SHIM"></a>
+<div class="macro-id-overline">
+<h3 id="shim" class="macro-id">SHIM</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SHIM</b>
+</div>
 
 <p>
-<nobr>Macro: <strong>SHIM</strong></nobr>
-</p>
-
-<p>
-<strong>SHIM</strong> doesn't take any argument.  Use it whenever
-you've played around with the
-<a href="definitions.html#TERMS_LEADING">leading</a>
-or spacing on a page and you
-need to get <strong>mom</strong>'s document leading back on track.
+SHIM doesn&#8217;t take any argument.  Use it whenever you&#8217;ve played
+around with the
+<a href="definitions.html#leading">leading</a>
+or spacing on a page and you need to get mom&#8217;s document
+leading back on track.
 </p>
 
 <p>
 For example, say you want to insert a picture into a document with
-the special groff macro, <strong>PSPIC</strong> (see <kbd>man
-groff_tmac</kbd> for usage).
+the special groff macro, PSPIC (see <kbd>man groff-tmac</kbd> for
+usage).
 </p>
 
 <p>
-Pictures aren't usually conveniently sized in multiples of document
-leading, which means that when you insert the picture, you disrupt
-<strong>mom</strong>'s ordered placement of baselines on the page.
-This will certainly result in a bottom margin that doesn't match the
-bottom margins of your document's other pages.
+Pictures aren&#8217;t usually conveniently sized in multiples of
+document leading, which means that when you insert the picture, you
+disrupt mom&#8217;s ordered placement of baselines on the page.
+This will certainly result in a bottom margin that doesn&#8217;t
+match the bottom margins of your document&#8217;s other pages.
 </p>
 
 <p>
-The solution is to insert <strong>SHIM</strong> after the picture,
+The solution is to insert SHIM after the picture,
 like this:
-
-<pre>
-    &lt;some lines of text&gt;
-    .PSPIC &lt;full path to picture&gt;
-    .SHIM
-    &lt;more lines of text&gt;
-</pre>
+<br/>
+<span class="pre-in-pp">
+  &lt;some lines of text&gt;
+  .PSPIC &lt;full path to picture&gt;
+  .SHIM
+  &lt;more lines of text&gt;
+</span>
 </p>
 
 <p>
-<strong>SHIM</strong> instructs <strong>mom</strong> to insert as
-much or a little space after the picture as is needed to ensure that
-the baseline of the next
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>
-falls where <strong>mom</strong> would have put it had you not
-disrupted the normal flow of output lines with the picture.
+SHIM instructs mom to insert as much or a little space after the
+picture as is needed to ensure that the baseline of the next
+<a href="definitions.html#outputline">output line</a>
+falls where mom would have put it had you not disrupted the normal
+flow of output lines with the picture.
 </p>
 
 <p>
 And say, on previewing the above example, you find that the picture
-doesn't centre nicely between the lines of text, you can always do
-
-<pre>
-    &lt;some lines of text&gt;
-    .RLD 3p
-    .PSPIC &lt;full path to picture&gt;
-    .SHIM
-    &lt;more lines of text&gt;
-</pre>
-
-to raise the picture slightly
-(<strong>R</strong>everse <strong>L</strong>ea<strong>D</strong>
-3 points; see
-<a href="typesetting.html#RLD">RLD</a>),
-and still have <strong>SHIM</strong> ensure that text underneath
-falls exactly where it's supposed to.
-</p>
-
-<p>
-<strong>NOTE:</strong> For information on disabling the automatic
-shimming of quotes and blockquotes during document processing, see
-<a href="docelement.html#NO_SHIM">here</a>.
+doesn&#8217;t centre nicely between the lines of text, you can
+always do
+<br/>
+<span class="pre-in-pp">
+  &lt;some lines of text&gt;
+  .RLD 3p
+  .PSPIC &lt;full path to picture&gt;
+  .SHIM
+  &lt;more lines of text&gt;
+</span>
+to raise the picture slightly (reverse lead 3 points; see
+<a href="typesetting.html#rld">RLD</a>),
+and still have SHIM ensure that text underneath falls exactly where
+it&#8217;s supposed to.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+For information on disabling the automatic shimming of quotes and
+blockquotes during document processing, see
+<a href="docelement.html#no-shim">here</a>.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="SETUP"><h2><u>Document setup</u></h2></a>
-
-<a name="DOCPROCESSING_TUT"><h3><u>Tutorial &mdash; setting up a mom document</u></h3></a>
+<h2 id="setup" class="docs" style="margin-bottom: .5em;">Preliminary document setup</h2>
 
-<p>
-There are four &quot;parts&quot; to setting up a
-<strong>mom</strong> doc (three, actually, with one optional).
-Before we proceed, though, be reassured that something as simple as
-
-<pre>
-    .TITLE     "By the Shores of Lake Attica"
-    .AUTHOR    "Rosemary Winspeare"
-    .PRINTSTYLE TYPESET
-    .START
-</pre>
+<div class="examples-container" style="margin-bottom: 1.5em;">
+<h3 id="docprocessing-tut" class="docs">Tutorial &ndash; Setting up a mom document</h3>
 
+<p style="margin-top: 1em;">
+There are four parts to setting up a mom doc (three, actually,
+with one optional).  Before we proceed, though, be reassured that
+something as simple as
+<br/>
+<span class="pre-in-pp">
+  .TITLE     "By the Shores of Lake Attica"
+  .AUTHOR    "Rosemary Winspeare"
+  .PRINTSTYLE TYPESET
+  .START
+</span>
 produces a beautifully typeset 8.5x11 document, with a
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>
+<a href="definitions.html#docheader">docheader</a>
 at the top of page 1,
-<a href="definitions.html#TERMS_HEADER">page headers</a>
-with the title and author on subsequent
-pages, and page numbers at the bottom of each page.  In the course
-of the document, heads, subheads, citations, quotes, epigraphs,
-and so on, all come out looking neat, trim, and professional.
-</p>
-
-<p>
-For the purposes of this tutorial, we're going to set up a short
-story &mdash; <em>My Pulitzer Winner</em> by Joe Blow.  Thankfully,
-we don't have to look at story itself, just the setup.
-Joe wants the document
-
-<ul>
-    <li>to be draft 7, revision 39;</li>
-    <li>to use the &quot;default&quot; style of document formatting:</li>
-    <li>to print as draft-style output (instead of &quot;final&quot; copy output);</li>
-    <li>to be typeset, in Helvetica, 12 on 14,
-        <a href="definitions.html#TERMS_RAG">rag-right</a>;
-    </li>
-    <li>to have <a href="definitions.html#TERMS_FOOTER">footers</a>
-        instead of
-        <a href="definitions.html#TERMS_HEADER">headers</a>;
-    </li>
-    <li>to use a single asterisk for
-        <a href="definitions.html#TERMS_LINEBREAK">author linebreaks</a>.
-    </li>
-</ul>
-</p>
-
-<p>
-Joe Blow has no taste in typography.  His draft won't look pretty,
-but this is, after all, a tutorial; we're after examples, not beauty.
-</p>
-
-<h4><u>Step 1</u></h4>
-
-<p>
-The first step in setting up any document is giving <strong>mom</strong>
-some reference information.  The reference macros are:
-
-<ul>
-    <li>TITLE</li>
-    <li>DOCTITLE</li>
-    <li>COVERTITLE</li>
-    <li>SUBTITLE</li>
-    <li>AUTHOR</li>
-    <li>CHAPTER &mdash; the chapter number</li>
-    <li>DRAFT &mdash; the draft number</li>
-    <li>REVISION &mdash; the revision number</li>
-    <li>COPYRIGHT &mdash; only used on cover pages</li>
-    <li>MISC &mdash; only used on cover pages</li>
-    <li>COVER_TITLE &mdash; only on cover pages; only if needed</li>
-    <li>DOC_COVER_TITLE &mdash; only on document cover pages; only if needed</li>
+<a href="definitions.html#header">page headers</a>
+with the title and author on subsequent pages, and page numbers at
+the bottom of each page.  In the course of the document, heads,
+subheads, citations, quotes, epigraphs, and so on, all come out
+looking neat, trim, and professional.
+</p>
+
+<p>
+For the purposes of this tutorial, we&#8217;re going to set up
+a short story&mdash;<i>My Pulitzer Winner</i>&mdash;by Joe Blow.
+Thankfully, we don&#8217;t have to look at story itself, just the
+setup.  Joe wants the document
+</p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>to be draft 7, revision 39;</li>
+  <li>to use the &#8220;default&#8221; style of document formatting:</li>
+  <li>to print as draft-style output (instead of &#8220;final&#8221; copy output);</li>
+  <li>to be typeset, in Helvetica, 12 on 14,
+      <a href="definitions.html#rag">rag-right</a>;
+  </li>
+  <li>to have <a href="definitions.html#footer">footers</a>
+      instead of
+      <a href="definitions.html#header">headers</a>;
+  </li>
+  <li>to use a single asterisk for
+      <a href="definitions.html#linebreak">author linebreaks</a>.
+  </li>
+</ul>
+
+<p>
+Joe Blow has no taste in typography.  His draft won&#8217;t look
+pretty, but this is, after all, a tutorial; we&#8217;re after
+examples, not beauty.
+</p>
+
+<h4 class="docs" style="margin-top: -.5em;">Step 1</h4>
+
+<p style="margin-bottom: -.5em;">
+The first step in setting up any document is giving mom some
+reference information.  The reference macros are:
+</p>
+<div style="width: 50%; float: left;">
+<ul>
+  <li>TITLE</li>
+  <li>DOCTITLE</li>
+  <li>COVERTITLE</li>
+  <li>DOC_COVERTITLE</li>
+  <li>SUBTITLE</li>
+  <li>AUTHOR</li>
+  <li>CHAPTER &ndash; the chapter number</li>
+</ul>
+</div>
+<div>
+<ul>
+  <li>DRAFT &ndash; the draft number</li>
+  <li>REVISION &ndash; the revision number</li>
+  <li>COPYRIGHT &ndash; only used on cover pages</li>
+  <li>MISC &ndash; only used on cover pages</li>
+  <li>COVER_TITLE &ndash; only on cover pages; only if needed</li>
+  <li>DOC_COVER_TITLE &ndash; only on document cover pages; only if needed</li>
 </ul>
-</p>
+</div>
 
-<p>
+<p style="margin-top: -.5em; clear: both;">
 You can use as many or as few as you wish, although at a minimum,
-you'll probably fill in <strong>TITLE</strong> (unless the document's
-a letter) and <strong>AUTHOR</strong>.  Order doesn't matter.
-You can separate the
-<a href="definitions.html#TERMS_ARGUMENTS">arguments</a>
-from the macros by any number of spaces.  The following are
-what you'd need to start Joe Blow's story.
-
-<pre>
-    .TITLE    "My Pulitzer Winner"
-    .AUTHOR   "Joe Blow"
-    .DRAFT     7
-    .REVISION  39
-</pre>
-</p>
-
-<h4><u>Step 2</u></h4>
-
-<p>
-Once you've given <strong>mom</strong> the reference information she
-needs, you tell her how you want your document formatted.  What kind
-of document is it?  Should it be typeset or typewritten?  Is this
-a &quot;final&quot; copy (for the world to see) or just a draft?
-<strong>Mom</strong> calls the macros that answer these questions
-&quot;the docstyle macros.&quot;  They are:
-
-<ul>
-    <li>DOCTYPE &mdash; the type of document (default, chapter, user-defined, letter)</li>
-    <li>PRINTSTYLE &mdash; typeset or typewritten</li>
-    <li>COPYSTYLE  &mdash; draft or final copy</li>
+you&#8217;ll probably fill in TITLE (unless the document&#8217;s a
+letter) and AUTHOR.  Order doesn&#8217;t matter.  You can separate
+the
+<a href="definitions.html#arguments">arguments</a>
+from the macros by any number of spaces.  The following are what
+you&#8217;d need to start Joe Blow&#8217;s story.
+<br/>
+<span class="pre-in-pp">
+  .TITLE    "My Pulitzer Winner"
+  .AUTHOR   "Joe Blow"
+  .DRAFT     7
+  .REVISION  39
+</span>
+</p>
+
+<h4 class="docs" style="margin-top: -1.5em;">Step 2</h4>
+
+<p>
+Once you&#8217;ve given mom the reference information she needs, you
+tell her how you want your document formatted.  What kind of
+document is it?  Should it be typeset or typewritten?  Is this a
+final copy (for the world to see) or just a draft?  Mom calls
+the macros that answer these questions &#8220;the docstyle
+macros.&#8221; They are:
+</p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>DOCTYPE&mdash;the type of document (default, chapter, user-defined, letter)</li>
+  <li>PRINTSTYLE&mdash;typeset or typewritten</li>
+  <li>COPYSTYLE &mdash;draft or final copy</li>
 </ul>
-</p>
 
 <p>
-<strong>Mom</strong> has defaults for <strong>DOCTYPE</strong>
-and <strong>COPYSTYLE</strong>; if they're what you want, you
-don't need to include them here.  However, <strong>PRINTSTYLE</strong>
-has no default and MUST be present in every formatted document.
-If you omit it, <strong>mom</strong> won't process the document AND
-she'll complain (both to stderr and as a single printed sheet with
-a warning).  Moms &mdash; they can be so annoying sometimes. &lt;sigh&gt;
+Mom has defaults for DOCTYPE and COPYSTYLE; if they&#8217;re what
+you want, you don&#8217;t need to include them here.  However,
+PRINTSTYLE has no default and must be present in every formatted
+document.  If you omit it, mom won&#8217;t process the document
+AND she&#8217;ll complain (both to stderr and as a single printed
+sheet with a warning).  Moms&mdash;they can be so annoying
+sometimes. &lt;sigh&gt;
 </p>
 
 <p>
 Adding to what we already have, the next bit of setup for Joe
-Blow's story looks like this:
-
-<pre>
+Blow&#8217;s story looks like this:
+<br/>
+<span class="pre-in-pp">
     .TITLE    "My Pulitzer Winner"
     .AUTHOR   "Joe Blow"
     .DRAFT     7
@@ -588,316 +491,320 @@
     .DOCTYPE     DEFAULT \"Superfluous; mom uses DOCTYPE DEFAULT by default
     .PRINTSTYLE  TYPESET
     .COPYSTYLE   DRAFT
-</pre>
-</p>
-
-<p>
+</span>
 Notice the use of the
-<a href="definitions.html#TERMS_COMMENTLINES">comment line</a>
+<a href="definitions.html#commentlines">comment line</a>
 ( <kbd>\#</kbd> ), a handy way to keep groups of macros visually
 separated for easy reading in a text editor.
 </p>
 
-<h4><u>Step 3</u></h4>
+<h4 class="docs" style="margin-top: -.5em; margin-bottom: -.5em;">Step 3</h4>
 
 <p>
-This step &mdash; completely optional &mdash; is where you, the user, take
-charge.  <strong>Mom</strong> has defaults for <em>everything</em>,
-but who's ever satisfied with defaults?  Use any of the <a
-href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
-here to change <strong>mom</strong>'s document defaults (paper
-size, margins, family, point size, line space, rag, etc), or
-any of the document processing macros that set/change/control
-the appearance of document elements.  Think of this as the
-&quot;style-sheet &quot; section of a document.  And please note:
-you MUST give <strong>mom</strong> a
-<a href="#PRINTSTYLE">PRINTSTYLE</a>
-directive <strong>before</strong> making any such changes.
+This step&mdash;completely optional&mdash;is where you, the
+user, take charge.  Mom has defaults for <i>everything</i>, but
+who&#8217;s ever satisfied with defaults?  Use any of the
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>
+here to change mom&#8217;s document defaults (paper size, margins,
+family, point size, line space, rag, etc), or any of the document
+processing macros that set/change/control the appearance of document
+elements.  Think of this as the &#8220;style-sheet &#8221; section
+of a document.  And please note: you MUST give mom a
+<a href="#printstyle">PRINTSTYLE</a>
+directive <i>before</i> making any such changes.
 </p>
 
 <p>
-Joe Blow wants his story printed in Helvetica, 12 on 14, rag
-right, with
-<a href="definitions.html#TERMS_FOOTER">page footers</a>
+Joe Blow wants his story printed in Helvetica, 12 on 14, rag right,
+with
+<a href="definitions.html#footer">page footers</a>
 instead of
-<a href="definitions.html#TERMS_HEADER">page headers</a>
+<a href="definitions.html#header">page headers</a>
 and a single asterisk for the
-<a href="definitions.html#TERMS_LINEBREAK">linebreak</a>
-character.  None of these requirements conforms
-to <strong>mom</strong>'s defaults for the chosen
-<strong>PRINTSTYLE</strong> (TYPESET), so we change them here.
-The setup for Joe Blow's story now looks like this:
-
-<pre>
-    .TITLE    "My Pulitzer Winner"
-    .AUTHOR   "Joe Blow"
-    .DRAFT     7
-    .REVISION  39
-    \#
-    .DOCTYPE     DEFAULT
-    .PRINTSTYLE  TYPESET
-    .COPYSTYLE   DRAFT
-    \#
-    .FAMILY  H
-    .PT_SIZE 12
-    .LS      14
-    .QUAD    LEFT    \"i.e. rag right
-    .FOOTERS
-    .LINEBREAK_CHAR *
-</pre>
-</p>
-
-<h4><u>Step 4</u></h4>
-
-<p>
-The final step in setting up a document is telling
-<strong>mom</strong> to start document processing.  It's a
-no-brainer, just the single macro <strong>START</strong>.  Other
-than <strong>PRINTSTYLE</strong>, it's the only macro required for
-document processing (although I can't guarantee you'll like the
-results of using just the two).
-</p>
-
-<p>
-Here's the complete setup for <em>My Pulitzer Winner</em>:
-
-<pre>
-    .TITLE    "My Pulitzer Winner"
-    .AUTHOR   "Joe Blow"
-    .DRAFT     7
-    .REVISION  39
-    \#
-    .DOCTYPE     DEFAULT
-    .PRINTSTYLE  TYPESET
-    .COPYSTYLE   DRAFT
-    \#
-    .FAMILY   H
-    .PT_SIZE  12
-    .LS       14
-    .QUAD     LEFT    \"i.e. rag right
-    .FOOTERS
-    .LINEBREAK_CHAR *
-    \#
-    .START
-</pre>
+<a href="definitions.html#linebreak">linebreak</a>
+character.  None of these requirements conforms to mom&#8217;s
+defaults for the chosen PRINTSTYLE (TYPESET), so we change them
+here.  The setup for Joe Blow&#8217;s story now looks like this:
+<br/>
+<span class="pre-in-pp">
+  .TITLE    "My Pulitzer Winner"
+  .AUTHOR   "Joe Blow"
+  .DRAFT     7
+  .REVISION  39
+  \#
+  .DOCTYPE     DEFAULT
+  .PRINTSTYLE  TYPESET
+  .COPYSTYLE   DRAFT
+  \#
+  .FAMILY  H
+  .PT_SIZE 12
+  .LS      14
+  .QUAD    LEFT    \"i.e. rag right
+  .FOOTERS
+  .LINEBREAK_CHAR *
+</span>
+</p>
+
+<h4 class="docs" style="margin-top: -1.5em; margin-bottom: -.5em;">Step 4</h4>
+
+<p>
+The final step in setting up a document is telling mom to start
+document processing.  It&#8217;s a no-brainer, just the single
+macro, START.  Other than PRINTSTYLE, it&#8217;s the only macro
+required for document processing (although I can&#8217;t guarantee
+you&#8217;ll like the results of using just the two).
 </p>
 
 <p>
+Here&#8217;s the complete setup for <i>My Pulitzer Winner</i>:
+<br/>
+<span class="pre-in-pp">
+  .TITLE    "My Pulitzer Winner"
+  .AUTHOR   "Joe Blow"
+  .DRAFT     7
+  .REVISION  39
+  \#
+  .DOCTYPE     DEFAULT
+  .PRINTSTYLE  TYPESET
+  .COPYSTYLE   DRAFT
+  \#
+  .FAMILY   H
+  .PT_SIZE  12
+  .LS       14
+  .QUAD     LEFT    \"i.e. rag right
+  .FOOTERS
+  .LINEBREAK_CHAR *
+  \#
+  .START
+</span>
 As pointed out earlier, Joe Blow is no typographer.  Given that all he
 needs is a printed draft of his work, a simpler setup would have been:
-
-<pre>
-    .TITLE    "My Pulitzer Winner"
-    .AUTHOR   "Joe Blow"
-    .DRAFT     7
-    .REVISION  39
-    \#
-    .PRINTSTYLE  TYPEWRITE
-    .COPYSTYLE   DRAFT
-    \#
-    .START
-</pre>
-</p>
-
-<p>
-<kbd>.PRINTSTYLE TYPEWRITE</kbd>, above, means that Joe's work
-will come out &quot;typewritten, double-spaced&quot;, making the
-blue-pencilling he (or someone else) is sure to do much
+<br/>
+<span class="pre-in-pp">
+  .TITLE    "My Pulitzer Winner"
+  .AUTHOR   "Joe Blow"
+  .DRAFT     7
+  .REVISION  39
+  \#
+  .PRINTSTYLE  TYPEWRITE
+  .COPYSTYLE   DRAFT
+  \#
+  .START
+</span>
+<kbd>.PRINTSTYLE&nbsp;TYPEWRITE</kbd>, above, means that Joe&#8217;s
+work will come out &#8220;typewritten, double-spaced&#8221;,
+making the blue-pencilling he (or someone else) is sure to do much
 easier (which is why many publishers and agents still insist on
 typewritten, double-spaced copy).
 </p>
 
 <p>
 When J. Blow stops re-writing and decides to print off a final,
-typeset copy of his work for the world to see, he need only
-make two changes to the (simplified) setup:
-
-<pre>
-    .TITLE    "My Pulitzer Winner"
-    .AUTHOR   "Joe Blow"
-    .DRAFT     7
-    .REVISION  39
-    \#
-    .PRINTSTYLE  TYPESET  \"first change
-    .COPYSTYLE   FINAL    \"second change
-    \#
-    .START
-</pre>
+typeset copy of his work for the world to see, he need only make two
+changes to the (simplified) setup:
+<br/>
+<span class="pre-in-pp">
+  .TITLE    "My Pulitzer Winner"
+  .AUTHOR   "Joe Blow"
+  .DRAFT     7
+  .REVISION  39
+  \#
+  .PRINTSTYLE  TYPESET  \"first change
+  .COPYSTYLE   FINAL    \"second change
+  \#
+  .START
+</span>
+In the above, <kbd>.DRAFT&nbsp;7,&nbsp;.REVISION 39,</kbd> and
+<kbd>.COPYSTYLE FINAL</kbd> are actually superfluous.  The draft
+and revision numbers aren&#8217;t used when COPYSTYLE is FINAL,
+and <b>COPYSTYLE FINAL</b> is mom&#8217;s default unless you tell
+her otherwise.
 </p>
 
 <p>
-In the above, <kbd>.DRAFT 7, .REVISION 39,</kbd> and <kbd>.COPYSTYLE
-FINAL</kbd> are actually superfluous.  The draft and revision
-numbers aren't used when <strong>COPYSTYLE</strong> is
-<strong>FINAL</strong>, and <strong>COPYSTYLE FINAL</strong> is
-<strong>mom</strong>'s default unless you tell her otherwise.
-BUT...  to judge from the number of drafts already, J. Blow may very
-well decide his &quot;final&quot; version still isn't up to snuff.
-Hence, he might as well leave in the superfluous macros.  That way,
-when draft 7, rev. 62 becomes draft 8, rev. 1, he'll be ready to
-tackle his Pulitzer winner again.
+BUT... to judge from the number of drafts already,
+J. Blow may very well decide his &#8220;final&#8221; version still
+isn&#8217;t up to snuff.  Hence, he might as well leave in the
+superfluous macros.  That way, when draft 7, rev. 62 becomes draft
+8, rev. 1, he&#8217;ll be ready to tackle his Pulitzer winner again.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ======================================================================== -->
 
-<a name="REFERENCE_MACROS"><h2><u>The Reference Macros</u></h2></a>
+<h2 id="reference-macros" class="macro-group">The reference macros</h2>
 
 <p>
-The reference macros give <strong>mom</strong> the information
-she needs to generate
-<a href="definitions.html#TERMS_DOCHEADER">docheaders</a>,
-<a href="definitions.html#TERMS_HEADER">page headers</a>,
+The reference macros give mom the meta-information she needs to
+generate
+<a href="definitions.html#docheader">docheaders</a>,
+<a href="definitions.html#header">page headers</a>,
 and
-<a href="cover.html#COVER_TOP">covers</a>.
-They must go at the top of any file that uses <strong>mom</strong>'s
-document processing macros.
-</p>
-
-<a name="INDEX_REFERENCE"><h3><u>Reference macros list</u></h3></a>
-
-<ul>
-    <li><a href="#TITLE">TITLE</a></li>
-    <li><a href="#DOC_TITLE">DOCTITLE</a></li>
-    <li><a href="#SUBTITLE">SUBTITLE</a></li>
-    <li><a href="#AUTHOR">AUTHOR</a></li>
-    <li><a href="#CHAPTER">CHAPTER</a></li>
-    <li><a href="#CHAPTER_TITLE">CHAPTER_TITLE</a></li>
-    <li><a href="#DRAFT">DRAFT</a></li>
-    <li><a href="#REVISION">REVISION</a></li>
-    <li><a href="#COPYRIGHT">COPYRIGHT</a></li>
-    <li><a href="#MISC">MISC</a></li>
-    <li><a href="#COVERTITLE">COVERTITLE</a></li>
+<a href="cover.html#cover-top">covers</a>.
+They must go at the top of any file that uses mom&#8217;s document
+processing macros.
+</p>
+
+<div class="macro-list-container">
+<h3 id="index-reference" class="macro-list">Reference macros</h3>
+
+<ul class="macro-list">
+  <li><a href="#title">TITLE</a> &ndash; title of a story, article, etc</li>
+  <li><a href="#doc-title">DOCTITLE</a> &ndash; title of a book, or any collated document</li>
+  <li><a href="#subtitle">SUBTITLE</a></li>
+  <li><a href="#author">AUTHOR</a></li>
+  <li><a href="#chapter">CHAPTER</a> &ndash; the chapter number
+  <ul>
+    <li class="sublist"><a href="#chapter-string">CHAPTER_STRING</a> &ndash; &#8220;Chapter&#8221;, &#8220;CHAPTER&#8221;, &#8220;Chapître&#8221;, etc</li>
+  </ul></li>
+  <li><a href="#chapter-title">CHAPTER_TITLE</a></li>
+  <li><a href="#draft">DRAFT</a>
+  <ul>
+    <li class="sublist"><a href="#draft-string">DRAFT_STRING</a> &ndash; &#8220;Draft&#8221;, &#8220;DRAFT&#8221;, &#8220;Jet&#8221;, etc</li>
+  </ul></li>
+  <li><a href="#revision">REVISION</a>
+  <ul>
+    <li class="sublist"><a href="#revision-string">REVISION_STRING</a> &ndash; &#8220;Revision&#8221;, &#8220;Rev.&#8221;, &#8220;Révision&#8221;, etc</li>
+  </ul></li>
+  <li><a href="#copyright">COPYRIGHT</a></li>
+  <li><a href="#misc">MISC</a></li>
+  <li><a href="#covertitle">COVERTITLE</a> &ndash; frontispiece, title page, etc</li>
+  <li><a href="#doc-covertitle">DOC_COVERTITLE</a> &ndash; book cover, collated document cover, etc</li>
 </ul>
+</div>
 
 <!-- -TITLE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="TITLE"></a>
+<div class="macro-id-overline">
+<h3 id="title" class="macro-id">TITLE</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>TITLE</strong> <kbd>&quot;&lt;title string&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd></nobr> 
-<br/>
-
-<em>*Arguments must be enclosed in double-quotes</em>
+<div class="box-macro-args">
+Macro: <b>TITLE</b> <kbd>&quot;&lt;title string&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd> 
+</div>
+<p class="requires">
+&bull;&nbsp;Arguments must be enclosed in double-quotes
 </p>
 
 <p>
-The title string can be caps or caps/lower-case; it's up to you.  In
-<a href="#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
+The title string can be caps or caps/lower-case; it&#8217;s up to you.  In
+<a href="#printstyle">PRINTSTYLE TYPESET</a>,
 the title will appear in the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>
-exactly as you typed it.  However, <strong>mom</strong> converts
-the title to all caps in
-<a href="definitions.html#TERMS_HEADER">page headers</a>
+<a href="definitions.html#docheader">docheader</a>
+exactly as you typed it.  However, mom converts the title to all
+caps in
+<a href="definitions.html#header">page headers</a>
 unless you turn that feature off (see
-<a href="headfootpage.html#_CAPS">HEADER_&lt;POSITION&gt;_CAPS</a>).
+<a href="headfootpage.html#_caps">HEADER_&lt;POSITION&gt;_CAPS</a>).
 In
-<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
+<a href="#printstyle">PRINTSTYLE TYPEWRITE</a>,
 the title always gets converted to caps.
 </p>
 
 <p>
-<strong>TITLE</strong> accepts multiple arguments, each surrounded
-by double-quotes.  Each argument is printed on a separate line,
-permitting you to create multi-line titles in your docheaders.
+TITLE accepts multiple arguments, each surrounded by double-quotes.
+Each argument is printed on a separate line, permitting you to
+create multi-line titles in your docheaders.
 </p>
 
-<p>
-<strong>NOTE:</strong> If your
-<a href="#DOCTYPE">DOCTYPE</a>
-is <strong>CHAPTER</strong>, <strong>TITLE</strong> should be the
-title of the opus, not &quot;CHAPTER whatever&quot;.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your <kbd><a href="#doctype">DOCTYPE</a></kbd> is CHAPTER, TITLE
+should be the title of the opus, not &#8220;CHAPTER whatever&#8221;.
 </p>
+</div>
 
 <!-- -DOCTITLE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="DOC_TITLE"></a>
-
-<p>
-<nobr>Macro: <strong>DOCTITLE</strong> <kbd>&quot;&lt;overall document title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd></nobr> 
-<br/>
-
-<em>*Arguments must be enclosed in double-quotes</em>
-</p>
-
-<p>
-<strong>NOTE:</strong> This macro should be used only if your
-<a href="#DOCTYPE">DOCTYPE</a>
-is <strong>DEFAULT</strong> (which is <strong>mom</strong>'s
-default).  If your <strong>DOCTYPE</strong> is
-<strong>CHAPTER</strong>, use
-<a href="#TITLE">TITLE</a>
+<div class="macro-id-overline">
+<h3 id="doc-title" class="macro-id">DOCUMENT TITLE</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOCTITLE</b> <kbd class="macro-args">&quot;&lt;overall document title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd> 
+</div>
+<p class="requires">
+&bull;&nbsp;Arguments must be enclosed in double-quotes
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+This macro should be used only if your <a
+href="#doctype">DOCTYPE</a> is <kbd>DEFAULT</kbd> (which is
+mom&#8217;s default).  If your DOCTYPE is CHAPTER, use
+<a href="#title">TITLE</a>
 to set the overall document title for cover pages, document cover
 pages, and page headers or footers.
 </p>
+</div>
 
-<p>
-When you're creating a single document, say, an essay or a short
-story, you have no need of this macro.
-<a href="#TITLE">TITLE</a>
+<p style="margin-top: -.5em;">
+When you&#8217;re creating a single document, say, an essay or a
+short story, you have no need of this macro.
+<a href="#title">TITLE</a>
 takes care of all your title needs.
 </p>
 
 <p>
-However if you're 
-<a href="rectoverso.html#COLLATE">collating</a>
+However if you&#8217;re 
+<a href="rectoverso.html#collate">collating</a>
 a bunch of documents together, say, to print out a report containing
 many articles with different titles, or a book of short stories with
-different authors, you need <strong>DOCTITLE</strong>.
+different authors, you need DOCTITLE.
 </p>
 
 <p>
-<strong>DOCTITLE</strong> tells <strong>mom</strong> the title
-of the complete document (as opposed to the title of each article
-or entitled section).
+DOCTITLE tells mom the title of the complete document (as opposed to
+the title of each article or entitled section).
 </p>
 
 <p>
-The doctitle string can be caps or caps/lower-case; it's up to you.
-In
-<a href="#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
+The doctitle string can be caps or caps/lower-case; it&#8217;s up to
+you.  In
+<a href="#printstyle">PRINTSTYLE TYPESET</a>,
 by default, the doctitle appears in the rightmost position of
-<a href="definitions.html#TERMS_HEADER">page headers</a>,
+<a href="definitions.html#header">page headers</a>,
 all in caps unless you turn that feature off (see
-<a href="headfootpage.html#_CAPS">HEADER_&lt;POSITION&gt;_CAPS</a>).
+<a href="headfootpage.html#_caps">HEADER_&lt;POSITION&gt;_CAPS</a>).
 In
-<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
+<a href="#printstyle">PRINTSTYLE TYPEWRITE</a>,
 the doctitle always gets converted to caps.
 </p>
 
 <p>
-<strong>DOCTITLE</strong> accepts multiple arguments, each surrounded
+DOCTITLE accepts multiple arguments, each surrounded
 by double-quotes.  Each argument is printed on a separate line,
 permitting you to create multi-line document titles for use on
-<a href="cover.html#COVER">Covers</a>
+<a href="cover.html#cover">Covers</a>
 and/or
-<a href="cover.html#DOC_COVER">Doc covers</a>.
+<a href="cover.html#doc-cover">Doc covers</a>.
 </p>
 
-<p>
-<strong>NOTE:</strong> If your
-<a href="#DOCTYPE">DOCTYPE</a>
-is <strong>CHAPTER</strong>, you don't need
-<strong>DOCTITLE</strong>.  <strong>TITLE</strong> takes care of
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your
+<a href="#doctype">DOCTYPE</a>
+is CHAPTER, you don&#8217;t need DOCTITLE.  TITLE takes care of
 everything.
 </p>
+</div>
 
 <!-- -SUBTITLE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SUBTITLE"></a>
-
-<p>
-<nobr>Macro: <strong>SUBTITLE</strong> <kbd>[COVER | DOC_COVER] &quot;&lt;subtitle&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd></nobr> 
-<br/>
-
-<em>*String arguments must be enclosed in double-quotes</em>
+<div class="macro-id-overline">
+<h3 id="subtitle" class="macro-id">SUBTITLE</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SUBTITLE</b> <kbd class="macro-args">[COVER | DOC_COVER] &quot;&lt;subtitle&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd> 
+</div>
+<p class="requires">
+&bull;&nbsp;String arguments must be enclosed in double-quotes
 </p>
 
 <p>
@@ -906,83 +813,82 @@
 </p>
 
 <p>
-<strong>SUBTITLE</strong> accepts multiple arguments, each surrounded
+SUBTITLE accepts multiple arguments, each surrounded
 by double-quotes.  Each argument is printed on a separate line,
 permitting you to create multi-line subtitles.
 </p>
 
 <p>
 If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>,
-is given to <strong>SUBTITLE</strong>, the remaining string
+is given to SUBTITLE, the remaining string
 arguments represent the subtitle that will appear on cover or
 document cover pages (see the
-<a href="cover.html#COVER_INTRO">Introduction to cover pages</a>
-for a description of the difference between &quot;document
-covers&quot; and &quot;covers&quot;).  Thus, it is possible to have
+<a href="cover.html#cover-intro">Introduction to cover pages</a>
+for a description of the difference between &#8220;document
+covers&#8221; and &#8220;covers&#8221;).  Thus, it is possible to have
 differing subtitles appear on the document cover, the cover
-(&quot;title&quot;) page, and in the document header.  An extreme
+(&#8220;title&#8221;) page, and in the document header.  An extreme
 example would be:
-
-<pre>
-    .SUBTITLE "The Docheader Subtitle"
-    .SUBTITLE DOC_COVER "The Document Cover Subtitle"
-    .SUBTITLE COVER "The Cover Subtitle"
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SUBTITLE "The Docheader Subtitle"
+  .SUBTITLE DOC_COVER "The Document Cover Subtitle"
+  .SUBTITLE COVER "The Cover Subtitle"
+</span>
 The first invocation of <kbd>.SUBTITLE</kbd> establishes the
 subtitle that appears in the docheader at the top of the first page
 of a document.  The second invocation establishes the subtitle that
 appears on the document cover; the third establishes the subtitle
-that appears on the cover (&quot;title&quot;) page.
+that appears on the cover (&#8220;title&#8221;) page.
 </p>
 
 <p>
-If you don't require differing subtitles for doc cover and cover
+If you don&#8217;t require differing subtitles for doc cover and cover
 pages, <kbd>.SUBTITLE</kbd>, without the optional first argument, is
-sufficient, provided you give the word &quot;SUBTITLE&quot; as an
+sufficient, provided you give the word, <kbd>SUBTITLE</kbd>, as an
 argument to the macro
-<a href="cover.html#DOC_COVER">DOC_COVER</a>
+<a href="cover.html#doc-cover">DOC_COVER</a>
 or
-<a href="cover.html#COVER">COVER</a>
+<a href="cover.html#cover">COVER</a>
 </p>
 
-
 <!-- -AUTHOR- -->
 
-<hr width="33%" align="left"/>
-
-<a name="AUTHOR"></a>
-
-<p>
-<nobr>Macro: <strong>AUTHOR</strong> <kbd>[COVER | DOC_COVER] &quot;&lt;author&gt;&quot; [ &quot;&lt;author2&gt;&quot; [&quot;&lt;author3&gt;&quot; ... ] ]</kbd></nobr>
-<br/>
-
-Alias: <strong>EDITOR</strong>
-<br/>
+<div class="macro-id-overline">
+<h3 id="author" class="macro-id">AUTHOR</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>AUTHOR</b> <kbd class="macro-args">[COVER | DOC_COVER] &quot;&lt;author&gt;&quot; [ &quot;&lt;author2&gt;&quot; [&quot;&lt;author3&gt;&quot; ... ] ]</kbd>
+</div>
 
-<em>*String arguments must be enclosed in double-quotes</em>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>EDITOR</b>
 </p>
-
-<p>
-Each author string can hold as many names as you like, e.g.
-
-<pre>
-    .AUTHOR "Joe Blow"
-        or
-    .AUTHOR "Joe Blow, Jane Doe" "John Hancock"
-</pre>
+<p class="requires">
+&bull;&nbsp;String arguments must be enclosed in double-quotes
 </p>
 
 <p>
-<strong>Mom</strong> prints each string that's enclosed in
-double-quotes on a separate line in the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>,
+Each author string can hold as many names as you like, e.g.
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .AUTHOR "Joe Blow"
+</span>
+or
+<br/>
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .AUTHOR "Joe Blow, Jane Doe" "John Hancock"
+</span>
+Mom prints each string that&#8217;s enclosed in double-quotes on a
+separate line in the
+<a href="definitions.html#docheader">docheader</a>,
 however only the first string appears in
-<a href="definitions.html#TERMS_HEADER">page headers</a>.
-If you want <strong>mom</strong> to put something else in the author
-part of page headers (say, just the last names of a document's two
+<a href="definitions.html#header">page headers</a>.
+If you want mom to put something else in the author part of page
+headers (say, just the last names of a document&#8217;s two
 authors), redefine the appropriate part of the header (see
-<a href="headfootpage.html#HEADER_CONTROL">header/footer control</a>).
+<a href="headfootpage.html#header-control">header/footer control</a>).
 </p>
 
 <p>
@@ -992,287 +898,285 @@
 
 <p>
 If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>,
-is given to <strong>AUTHOR</strong>, the remaining string
-arguments represent the author(s) that will appear on cover or
-document cover pages (see the
-<a href="cover.html#COVER_INTRO">Introduction to cover pages</a>
-for a description of the difference between &quot;document
-covers&quot; and &quot;covers&quot;).  Thus, it is possible to have
-differing authors on the document cover, the cover
-(&quot;title&quot;) page, in the document first-page header and
+is given to AUTHOR, the remaining string arguments represent the
+author(s) that will appear on cover or document cover pages (see the
+<a href="cover.html#cover-intro">Introduction to cover pages</a>
+for a description of the difference between &#8220;document
+covers&#8221; and &#8220;covers&#8221;).  Thus, it is possible
+to have differing authors on the document cover, the cover
+(&#8220;title&#8221;) page, in the document first-page header and
 subsequent page headers/footers.  An example might be:
-
-<pre>
-    .AUTHOR "Joe Blow"
-    .EDITOR DOC_COVER "John Smith" "and" "Jane Doe"   \" EDITOR is an alias for AUTHOR
-    .AUTHOR COVER "Joe Blow" "(assisted by Jane Doe)"
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .AUTHOR "Joe Blow"
+  .EDITOR DOC_COVER "John Smith" "and" "Jane Doe"  \" EDITOR is an alias for AUTHOR
+  .AUTHOR COVER "Joe Blow" "(assisted by Jane Doe)"
+</span>
 The first invocation of <kbd>.AUTHOR</kbd> establishes the author
 that appears in the docheader at the top of the first page of
 a document and in subsequent page headers/footers.  The second
 invocation establishes the authors (editors, in this instance) that
 appear on the document cover; the third establishes the author(s)
-that appear(s) on the cover (&quot;title&quot;) page.
+that appear(s) on the cover (&#8220;title&#8221;) page.
 </p>
 
 <p>
-If you don't require differing authors for doc cover and cover
+If you don&#8217;t require differing authors for doc cover and cover
 pages, <kbd>.AUTHOR</kbd>, without the optional first argument, is
-sufficient, provided you give the word &quot;AUTHOR&quot; as an
+sufficient, provided you give the word, <kbd>AUTHOR</kbd> as an
 argument to the macro
-<a href="cover.html#DOC_COVER">DOC_COVER</a>
+<a href="cover.html#doc-cover">DOC_COVER</a>
 or
-<a href="cover.html#COVER">COVER</a>
+<a href="cover.html#cover">COVER</a>
 </p>
 
 <!-- -CHAPTER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="CHAPTER"></a>
+<div class="macro-id-overline">
+<h3 id="chapter" class="macro-id">CHAPTER</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>CHAPTER</strong> <kbd>&lt;chapter number&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>CHAPTER</b> <kbd class="macro-args">&lt;chapter number&gt;</kbd>
+</div>
 
 <p>
-The chapter number can be in any form you like &mdash; a digit, a roman
+The chapter number can be in any form you like&mdash;a digit, a roman
 numeral, a word.  If you choose
-<a href="#DOCTYPE">DOCTYPE CHAPTER</a>,
-<strong>mom</strong> prints whatever argument you pass
-<strong>CHAPTER</strong> beside the word &quot;Chapter&quot; as a
-single line
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>.
+<a href="#doctype">DOCTYPE CHAPTER</a>,
+mom prints whatever argument you pass CHAPTER beside the word,
+&#8220;Chapter&#8221;, as a single line
+<a href="definitions.html#docheader">docheader</a>.
 She also puts the same thing in the middle of
-<a href="definitions.html#TERMS_HEADER">page headers</a>.
+<a href="definitions.html#header">page headers</a>.
 </p>
 
 <p>
-Please note that if your argument to <strong>CHAPTER</strong> runs
-to more than one word, you must enclose the argument in
-double-quotes.
+Please note that if your argument to CHAPTER runs to more than one
+word, you must enclose the argument in double-quotes.
 </p>
 
 <p>
-If you're not using <strong>DOCTYPE CHAPTER</strong>, the macro can
-be used to identify any document as a chapter <em>for the purpose of
-prepending a chapter number to numbered head elements</em>, provided
+If you&#8217;re not using DOCTYPE CHAPTER, the macro can
+be used to identify any document as a chapter <i>for the purpose of
+prepending a chapter number to numbered head elements</i>, provided
 you pass it a
-<a href="definitions.html#TERMS_NUMERICARGUMENT">numeric argument</a>.
+<a href="definitions.html#numericargument">numeric argument</a>.
 See
-<a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a>.
+<a href="docelement.html#prefix-chapter-number">PREFIX_CHAPTER_NUMBER</a>.
 </p>
 
 <!-- -CHAPTER_STRING- -->
 
-<a name="CHAPTER_STRING"><h4><u>The chapter string</u></h4></a>
+<h3 id="chapter-string" class="docs">Chapter string</h3>
 
 <p>
-If you're not writing in English, you can ask <strong>mom</strong>
-to use the word for &quot;chapter&quot; in your own language by
-telling her what it is with the <strong>CHAPTER_STRING</strong>
-macro, like this:
-
-<pre>
-    .CHAPTER_STRING "Chapître"
-</pre>
+If you&#8217;re not writing in English, you can ask mom to use the
+word for &#8220;chapter&#8221; in your own language by telling her
+what it is with the CHAPTER_STRING macro, like this:
+<br/>
+<span class="pre">
+  .CHAPTER_STRING "Chapître"
+</span>
 </p>
 
 <p>
-You can also use <strong>CHAPTER_STRING</strong> if you want
-&quot;CHAPTER&quot; instead of &quot;Chapter&quot; in the doc-and
-page-headers.
+You can also use CHAPTER_STRING if you want
+&#8220;CHAPTER&#8221; (all caps) instead of &#8220;Chapter&#8221;
+(caps/lowercase) in the doc- and page-headers.
 </p>
 
 <!-- -CHAPTER_TITLE- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="chapter-title" class="macro-id">CHAPTER_TITLE</h3>
+</div>
 
-<a name="CHAPTER_TITLE"></a>
-
-<p>
-<nobr>Macro: <strong>CHAPTER_TITLE</strong> &quot;&lt;chapter title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</nobr> 
-<br/>
-
-<em>*Arguments must be enclosed in double-quotes</em>
+<div class="box-macro-args">
+Macro: <b>CHAPTER_TITLE</b>  <kbd class="macro-args">&quot;&lt;chapter title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd> 
+</div>
+<p class="requires">
+&bull;&nbsp;Arguments must be enclosed in double-quotes
 </p>
 
 <p>
-If, either in addition to or instead of &quot;Chapter
-&lt;n&gt;&quot; appearing at the top of chapters, you want your
-chapter to have a title, use <strong>CHAPTER_TITLE</strong>, with
-your title enclosed in double-quotes, like this:
-
-<pre>
-    .CHAPTER_TITLE "The DMCA Nazis"
-</pre>
+If, either in addition to or instead of &#8220;Chapter
+&lt;n&gt;&#8221; appearing at the top of chapters, you want your
+chapter to have a title, use CHAPTER_TITLE, with your title enclosed
+in double-quotes, like this:
+<br/>
+<span class="pre">
+  .CHAPTER_TITLE "The DMCA Nazis"
+</span>
 </p>
 
 <p>
-<strong>CHAPTER_TITLE</strong> accepts multiple arguments, each
-surrounded by double-quotes.  Each argument is printed on a separate
-line, permitting you to create multi-line chapter titles in your
+CHAPTER_TITLE accepts multiple arguments, each surrounded by
+double-quotes.  Each argument is printed on a separate line,
+permitting you to create multi-line chapter titles in your
 docheaders.
 </p>
 
 <p>
-If you've used
-<a href="#CHAPTER">CHAPTER</a>
-to give the chapter a number, both &quot;Chapter &lt;n&gt;&quot; and
-the chapter title will appear at the top of the chapter, like this:
-
-<pre>
+If you&#8217;ve used
+<a href="#chapter">CHAPTER</a>
+to give the chapter a number, both &#8220;Chapter &lt;n&gt;&#8221;
+and the chapter title will appear at the top of the chapter, like
+this:
+<br/>
+<span class="pre-in-pp">
        Chapter 1
     The DMCA Nazis
-</pre>
-</p>
-
-<p>
-In such a case, by default, only the chapter's title will appear in
+</span>
+In such a case, by default, only the chapter&#8217;s title will appear in
 the
-<a href="definitions.html#TERMS_HEADER">page headers</a>,
-not &quot;Chapter &lt;n&gt;&quot;.
+<a href="definitions.html#header">page headers</a>,
+not &#8220;Chapter &lt;n&gt;&#8221;.
 </p>
 
 <p>
-If you omit <strong>CHAPTER</strong> when setting up your reference
-macros, only the title will appear, both at the top of page one and
-in subsequent page headers.
+If you omit CHAPTER when setting up your reference macros, only the
+title will appear, both at the top of page one and in subsequent
+page headers.
 </p>
 
 <p>
 The style of the chapter title can be altered by
-<a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>,
-e.g. <strong>CHAPTER_TITLE_FAMILY</strong>,
-<strong>CHAPTER_TITLE_FONT</strong>, etc.  The default family,
-font and point size are Times Roman, Bold Italic, 4 points larger
-than
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
+<a href="docelement.html#docelement-control">control macros</a>,
+e.g. CHAPTER_TITLE_FAMILY, CHAPTER_TITLE_FONT, etc.  The default
+family, font and point size are Times Roman, Bold Italic, 4 points
+larger than
+<a href="definitions.html#running">running text</a>.
 </p>
 
 <!-- -DRAFT- -->
 
-<hr width="33%" align="left"/>
-
-<a name="DRAFT"></a>
+<div class="macro-id-overline">
+<h3 id="draft" class="macro-id">DRAFT</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>DRAFT</strong> <kbd>&lt;draft number&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>DRAFT</b> <kbd class="macro-args">&lt;draft number&gt;</kbd>
+</div>
 
 <p>
-<strong>DRAFT</strong> only gets used with
-<a href="#COPYSTYLE">COPYSTYLE DRAFT</a>.
-If the <strong>COPYSTYLE</strong> is <strong>FINAL</strong> (the
-default), <strong>mom</strong> ignores <strong>DRAFT</strong>.
-<strong>DRAFT</strong> accepts both alphabetic and numeric
-arguments, hence it's possible to do either
-
-<pre>
-    .DRAFT 2
-       or
-    .DRAFT Two
-</pre>
+DRAFT only gets used with
+<a href="#copystyle">COPYSTYLE&nbsp;DRAFT</a>.
+If the COPYSTYLE is FINAL (the default), mom ignores DRAFT.  DRAFT
+accepts both alphabetic and numeric arguments, hence it&#8217;s
+possible to do either
+<br/>
+<span class="pre">
+  .DRAFT 2
+     or
+  .DRAFT Two
+</span>
 </p>
 
 <p>
-<strong>Mom</strong> prints the argument to <kbd>.DRAFT</kbd> (i.e.
-the draft number) beside the word &quot;Draft&quot; in the middle
-part of
-<a href="definitions.html#TERMS_HEADER">page headers</a>.
+Mom prints the argument to <kbd>.DRAFT</kbd> (i.e. the draft number)
+beside the word &#8220;Draft&#8221; in the middle part of
+<a href="definitions.html#header">page headers</a>.
 </p>
 
-<p>
-<strong>A small word of caution:</strong> If your argument to
-<kbd>.DRAFT</kbd> is more than one word long, you must enclose the
-argument in double-quotes.
+<div class="box-tip">
+<p class="tip">
+<span class="note">A small word of caution:</span>
+If your argument to <kbd>.DRAFT</kbd> is more than one word long,
+you must enclose the argument in double-quotes.
 </p>
+</div>
 
 <p>
 You may, if you wish, invoke <kbd>.DRAFT</kbd> without an
 argument, in which case, no draft number will be printed beside
-&quot;Draft&quot; in headers or footers.
+&#8220;Draft&#8221; in headers or footers.
 </p>
 
 <!-- -DRAFT_STRING- -->
 
-<a name="DRAFT_STRING"><h4><u>The draft string</u></h4></a>
+<h3 id="draft-string" class="docs">The draft string</h3>
 
 <p>
-If you're not writing in English, you can ask <strong>mom</strong>
-to use the word for &quot;draft&quot; in your own language by
-telling her what it is with the <strong>DRAFT_STRING</strong> macro,
+If you&#8217;re not writing in English, you can ask mom
+to use the word for &#8220;draft&#8221; in your own language by
+telling her what it is with the DRAFT_STRING macro,
 like this:
-
-<pre>
-    .DRAFT_STRING "Jet"
-</pre>
+<br/>
+<span class="pre">
+  .DRAFT_STRING "Jet"
+</span>
 </p>
 
 <p>
-Equally, <strong>DRAFT_STRING</strong> can be used to roll your own
-solution to something other than the word &quot;Draft.&quot;  For
-example, you might want &quot;Trial run alpha-three&quot; to appear
-in the headers of a draft version.  You'd accomplish this by doing
-
-<pre>
-    .DRAFT alpha-three
-    .DRAFT_STRING "Trial run
-</pre>
+Equally, DRAFT_STRING can be used to roll your own solution to
+something other than the word &#8220;Draft.&#8221; For example, you
+might want &#8220;Trial run alpha-three&#8221; to appear in the
+headers of a draft version.  You&#8217;d accomplish this by doing
+<br/>
+<span class="pre">
+  .DRAFT alpha-three
+  .DRAFT_STRING "Trial run"
+</span>
 </p>
 
 <p>
-<kbd>.DRAFT</kbd> without an argument, above, ensures that only the
-<strong>DRAFT_STRING</strong> gets printed.
+If you wanted only &#8220;Trial run&#8221; to appear, entering
+<kbd>.DRAFT</kbd> without an argument as well as
+<kbd>.DRAFT_STRING&nbsp;"Trial&nbsp;run"</kbd> is how you&#8217;d do it.
 </p>
 
-<p>
-<strong>NOTE:</strong> If you define both a blank <kbd>.DRAFT</kbd>
-and a blank <kbd>.DRAFT_STRING</kbd>, <strong>mom</strong> skips the
-draft field in headers entirely.  If this is what you want, this is
-also the only way to do it.  Simply omitting a <kbd>.DRAFT</kbd> and
-<kbd>.DRAFT_STRING</kbd> will result in <strong>mom</strong> using
-her default, which is to print &quot;Draft &lt;number&gt;&quot;.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you define both a blank <kbd>.DRAFT</kbd> and a blank
+<kbd>.DRAFT_STRING</kbd>, mom skips the draft field in headers
+entirely.  If this is what you want, this is also the only way
+to do it.  Simply omitting invocations of <kbd>.DRAFT</kbd> and
+<kbd>.DRAFT_STRING</kbd> will result in mom using her default, which
+is to print &#8220;Draft &lt;number&gt;&#8221;.
 </p>
+</div>
 
 <!-- -REVISION- -->
 
-<hr width="33%" align="left"/>
-
-<a name="REVISION"></a>
-
-<p>
-<nobr>Macro: <strong>REVISION</strong> <kbd>&lt;revision number&gt;</kbd></nobr>
-</p>
-
-<p>
-<strong>REVISION</strong> only gets used with
-<a href="#COPYSTYLE">COPYSTYLE DRAFT</a>.
-If the <strong>COPYSTYLE</strong> is <strong>FINAL</strong>
-(the default), <strong>mom</strong> ignores the
-<strong>REVISION</strong> macro. <strong>REVISION</strong> accepts
-both alphabetic and numeric arguments, hence it's possible to do
-either
-
-<pre>
-    .REVISION 2
-       or
-    .REVISION Two
-</pre>
+<div class="macro-id-overline">
+<h3 id="revision" class="macro-id">REVISION</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>REVISION</b> <kbd class="macro-args">&lt;revision number&gt;</kbd>
+</div>
+
+<p>
+REVISION only gets used with
+<a href="#copystyle">COPYSTYLE DRAFT</a>.
+If the COPYSTYLE is FINAL (the default), mom ignores the REVISION
+macro. REVISION accepts both alphabetic and numeric arguments, hence
+it&#8217;s possible to do either
+<br/>
+<span class="pre" style="margin-bottom: -1em;">
+  .REVISION 2
+</span>
+or
+<span class="pre" style="margin-top: -.5em;">
+  .REVISION Two
+</span>
 </p>
 
 <p>
-<strong>Mom</strong> prints the revision number beside the shortform
-&quot;Rev.&quot; in the middle part of
-<a href="definitions.html#TERMS_HEADER">page headers</a>.
+Mom prints the revision number beside the shortform
+&#8220;Rev.&#8221; in the middle part of
+<a href="definitions.html#header">page headers</a>.
 </p>
 
-<p>
-<strong>A small word of caution:</strong> If your argument to
-<kbd>.REVISION</kbd> is more than one word long, you must
-enclose the argument in double-quotes.
+<div class="box-tip">
+<p class="tip">
+<span class="note">A small word of caution:</span>
+If your argument to <kbd>.REVISION</kbd> is more than one word long,
+you must enclose the argument in double-quotes.
 </p>
+</div>
 
 <p>
 You may, if you wish, invoke <kbd>.REVISION</kbd> without an
@@ -1282,46 +1186,45 @@
 
 <!-- -REVISION_STRING- -->
 
-<a name="REVISION_STRING"><h4><u>The revision string</u></h4></a>
+<h3 id="revision-string" class="docs">The revision string</h3>
 
 <p>
-If you're not writing in English, you can ask <strong>mom</strong>
-to use the word for &quot;revision,&quot; or a shortform
+If you&#8217;re not writing in English, you can ask mom
+to use the word for &#8220;revision,&#8221; or a shortform
 thereof, in your own language by telling her what it is with the
-<strong>REVISION_STRING</strong> macro, like this:
-
-<pre>
-    .REVISION_STRING "Rév."
-</pre>
+REVISION_STRING macro, like this:
+<br/>
+<span class="pre">
+  .REVISION_STRING "Rév."
+</span>
 </p>
 
 <p>
-Additionally, you may sometimes want to make use of
-<strong>mom</strong>'s
-<a href="#COPYSTYLE">COPYSTYLE DRAFT</a>
-but not actually require any draft information.  For example, you
-might like <strong>mom</strong> to indicate only the revision
-number of your document.  The way to do that is to define an empty
+Additionally, you may sometimes want to make use of mom&#8217;s
+<a href="#copystyle">COPYSTYLE DRAFT</a>
+but not actually require any draft information.  For example,
+you might like mom to indicate only the revision number of
+your document.  The way to do that is to define an empty
 <kbd>.DRAFT</kbd> and <kbd>.DRAFT_STRING</kbd> in addition to
 <kbd>.REVISION</kbd>, like this:
-
-<pre>
-    .DRAFT
-    .DRAFT_STRING
-    .REVISION 2
-</pre>
+<br/>
+<span class="pre">
+  .DRAFT
+  .DRAFT_STRING
+  .REVISION 2
+</span>
 </p>
 
 <p>
 Equally, if you want to roll your own solution to what revision
 information appears in headers, you could do something like this:
-
-<pre>
-    .DRAFT
-    .DRAFT_STRING
-    .REVISION "two-twenty-two"
-    .REVISION_STRING "Revision"
-</pre>
+<br/>
+<span class="pre">
+  .DRAFT
+  .DRAFT_STRING
+  .REVISION "two-twenty-two"
+  .REVISION_STRING "Revision"
+</span>
 </p>
 
 <p>
@@ -1332,2049 +1235,2392 @@
 
 <!-- -COPYRIGHT- -->
 
-<hr width="33%" align="left"/>
-
-<a name="COPYRIGHT"></a>
+<div class="macro-id-overline">
+<h3 id="copyright" class="macro-id">COPYRIGHT</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>COPYRIGHT</strong> <kbd>[COVER | DOC_COVER] &quot;&lt;copyright info&gt;&quot;</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>COPYRIGHT</b> <kbd class="macro-args">[COVER | DOC_COVER] &quot;&lt;copyright info&gt;&quot;</kbd>
+</div>
 
-<em>*Argument must be enclosed in double-quotes</em>
+<p class="requires">
+&bull;&nbsp;Argument must be enclosed in double-quotes
 </p>
 
 <p>
-The argument passed to <strong>COPYRIGHT</strong> is only used on
-cover or doc cover pages, and then only if the argument COPYRIGHT is
-passed to
-<a href="cover.html#COVER">COVER</a>
+The argument passed to COPYRIGHT is only used on cover or doc cover
+pages, and then only if the argument COPYRIGHT is passed to
+<a href="cover.html#cover">COVER</a>
 or
-<a href="cover.html#DOC_COVER">DOC_COVER</a>.
+<a href="cover.html#doc-cover">DOC_COVER</a>.
 Do not include the copyright symbol in the argument passed to
-<strong>COPYRIGHT</strong>; <strong>mom</strong> puts it in for
-you.
+COPYRIGHT; mom puts it in for you.
 </p>
 
 <p>
 If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>,
-is given to <strong>COPYRIGHT</strong>, the string argument
-represents the copyright information that will appear on cover or
-document cover pages (see the
-<a href="cover.html#COVER_INTRO">Introduction to cover pages</a>
-for a description of the difference between &quot;document
-covers&quot; and &quot;covers&quot;).  Thus, it is possible to have
-differing copyright information on the document cover and on the
-cover (&quot;title&quot;) page.  An example might be:
-
-<pre>
-    .COPYRIGHT DOC_COVER "2006 John Smith and Jane Doe"
-    .COPYRIGHT COVER "2002 Joe Blow"
-</pre>
-
+is given to COPYRIGHT, the string argument represents the copyright
+information that will appear on cover or document cover pages (see
+the
+<a href="cover.html#cover-intro">Introduction to cover pages</a>
+for a description of the difference between &#8220;document
+covers&#8221; and &#8220;covers&#8221;).  Thus, it is possible to
+have differing copyright information on the document cover and on
+the cover (&#8220;title&#8221;) page.  An example might be:
+<br/>
+<span class="pre-in-pp">
+  .COPYRIGHT DOC_COVER "2010 John Smith and Jane Doe"
+  .COPYRIGHT COVER "2008 Joe Blow"
+</span>
 The first invocation of <kbd>.COPYRIGHT</kbd> establishes the
 copyright information that appears on the document cover; the second
 establishes the copyright information that appears on the cover
-(&quot;title&quot;) page.
+(&#8220;title&#8221;) page.
 </p>
 
 <p>
-If you don't require differing copyright information for doc cover
-and cover pages, <kbd>.COPYRIGHT</kbd>, without the optional
-first argument, is sufficient, provided you give the word
-&quot;COPYRIGHT&quot; as an argument to the macro
-<a href="cover.html#DOC_COVER">DOC_COVER</a>
+If you don&#8217;t require differing copyright information for
+doc cover and cover pages, <kbd>.COPYRIGHT</kbd>, without the
+optional first argument, is sufficient, provided you give the word,
+<kbd>COPYRIGHT</kbd>, as an argument to the macro
+<a href="cover.html#doc-cover">DOC_COVER</a>
 or
-<a href="cover.html#COVER">COVER</a>
+<a href="cover.html#cover">COVER</a>
 </p>
 
 <!-- -MISC- -->
 
-<hr width="33%" align="left"/>
-
-<a name="MISC"></a>
+<div class="macro-id-overline">
+<h3 id="misc" class="macro-id">MISC</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>MISC</strong> <kbd>[COVER | DOC_COVER] &quot;&lt;argument 1&gt;&quot; [&quot;&lt;argument 2&gt;&quot; &quot;&lt;argument 3&gt;&quot; ...]</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>MISC</b> <kbd class="macro-args">[COVER | DOC_COVER] &quot;&lt;argument 1&gt;&quot; [&quot;&lt;argument 2&gt;&quot; &quot;&lt;argument 3&gt;&quot; ...]</kbd>
+</div>
 
-<em>*String arguments must be enclosed in double-quotes</em>
+<p class="requires">
+&bull;&nbsp;String arguments must be enclosed in double-quotes
 </p>
 
 <p>
-The argument(s) passed to <strong>MISC</strong> are only used
-on cover or doc cover pages, and then only if the argument
-<kbd>MISC</kbd> is passed to
-<a href="cover.html#COVER">COVER</a>
+The argument(s) passed to MISC are only used on cover or doc cover
+pages, and then only if the argument <kbd>MISC</kbd> is passed to
+<a href="cover.html#cover">COVER</a>
 or
-<a href="cover.html#DOC_COVER">DOC_COVER</a>.
-<strong>MISC</strong> can contain any information you like.  Each
-argument appears on a separate line at the bottom of the cover or
-doc cover page.
+<a href="cover.html#doc-cover">DOC_COVER</a>.
+MISC can contain any information you like.  Each argument appears on
+a separate line at the bottom of the cover or doc cover page.
 </p>
 
 <p>
-For example, if you're submitting an essay where the prof has
-requested that you include the course number, his name and the
-date, you could do
-
-<pre>
-    .MISC &quot;Music History 101&quot; &quot;Professor Hasbeen&quot; &quot;Dec. 24, 2006&quot;
-</pre>
-
-and the information would appear on the essay's cover page.
+For example, if you&#8217;re submitting an essay where the prof has
+requested that you include the course number, his name and the date,
+you could do
+<br/>
+<span class="pre-in-pp">
+  .MISC "Music History 101" "Professor Hasbeen" "Dec. 24, 2010"
+</span>
+and the information would appear on the essay&#8217;s cover page.
 </p>
 
 <p>
 If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>,
-is given to <strong>MISC</strong>, the string arguments represent
-the miscellaneous information that will appear on cover or document
-cover pages (see the
-<a href="cover.html#COVER_INTRO">Introduction to cover pages</a>
-for a description of the difference between &quot;document
-covers&quot; and &quot;covers&quot;).  Thus, it is possible to have
-differing miscellaneous information on the document cover and on the
-cover (&quot;title&quot;) page.  An example might be:
-
-<pre>
-    .MISC DOC_COVER "Music History 101" "Professor Hasbeen"
-    .MISC COVER "Spring Term Paper"
-</pre>
+is given to MISC, the string arguments represent the miscellaneous
+information that will appear on cover or document cover pages (see
+the
+<a href="cover.html#cover-intro">Introduction to cover pages</a>
+for a description of the difference between &#8220;document
+covers&#8221; and &#8220;covers&#8221;).  Thus, it is possible to
+have differing miscellaneous information on the document cover and
+on the cover (&#8220;title&#8221;) page.  An example might be:
+<br/>
+<span class="pre">
+  .MISC DOC_COVER "Music History 101" "Professor Hasbeen"
+  .MISC COVER "Spring Term Paper"
+</span>
+</p>
 
+<p>
 The first invocation of <kbd>.MISC</kbd> establishes the
 miscellaneous information that appears on the document cover; the
 second establishes the miscellaneous information that appears on the
-cover (&quot;title&quot;) page.
+cover (&#8220;title&#8221;) page.
 </p>
 
 <p>
-If you don't require differing miscellaneous information for doc
-cover and cover pages, <kbd>.MISC</kbd>, without the optional first
-argument, is sufficient, provided you give the word &quot;MISC&quot;
-as an argument to the macro
-<a href="cover.html#DOC_COVER">DOC_COVER</a>
+If you don&#8217;t require differing miscellaneous information
+for doc cover and cover pages, <kbd>.MISC</kbd>, without the
+optional first argument, is sufficient, provided you give the word
+&#8220;MISC&#8221; as an argument to the macro
+<a href="cover.html#doc-cover">DOC_COVER</a>
 or
-<a href="cover.html#COVER">COVER</a>
+<a href="cover.html#cover">COVER</a>
 </p>
 
 <!-- -COVER_TITLE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="COVERTITLE"></a>
-
-<p>
-<nobr>Macro: <strong>COVERTITLE</strong> <kbd>&quot;&lt;user defined cover page title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd></nobr> 
-<br/>
+<div class="macro-id-overline">
+<h3 class="macro-id">COVERTITLE &amp; DOC_COVERTITLE</h3>
+</div>
 
-<a name="DOC_COVERTITLE"></a>
-
-<nobr>Macro: <strong>DOC_COVERTITLE</strong> &quot;&lt;user defined document cover page title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</nobr> 
-<br/>
+<div id="covertitle" class="box-macro-args">
+Macro: <b>COVERTITLE</b> <kbd class="macro-args">&quot;&lt;user defined cover page title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd> 
+</div>
+<p class="requires">
+&bull;&nbsp;Arguments must be enclosed in double-quotes
+</p>
 
-<em>*Arguments must be enclosed in double-quotes</em>
+<div id="doc-covertitle" class="box-macro-args">
+Macro: <b>DOC_COVERTITLE</b> <kbd class="macro-args">&quot;&lt;user defined document cover page title&gt;&quot; [&quot;&lt;2nd line&gt;&quot; [&quot;&lt;3rd line&gt;&quot; ... ] ]</kbd> 
+</div>
+<p class="requires">
+&bull;&nbsp;Arguments must be enclosed in double-quotes
 </p>
 
 <p>
-The arguments passed to <strong>COVERTITLE</strong> or
-<strong>DOC_COVERTITLE</strong> are only used on cover or doc cover
-pages, and then only if the argument COVERTITLE is passed to
-<a href="cover.html#COVER">COVER</a>
+The arguments passed to COVERTITLE or DOC_COVERTITLE are only
+used on cover or doc cover pages, and then only if the argument
+COVERTITLE is passed to
+<a href="cover.html#cover">COVER</a>
 or
-<a href="cover.html#DOC_COVER">DOC_COVER</a>.
+<a href="cover.html#doc-cover">DOC_COVER</a>.
 </p>
 
 <p>
-The only time you require a <strong>COVERTITLE</strong> or
-<strong>DOC_COVERTITLE</strong> is when none of the required first
-arguments to <strong>COVER</strong> or <strong>DOC_COVER</strong>
-fits your needs for the title you want to appear on cover (or doc
-cover) pages.
+The only time you require a COVERTITLE or DOC_COVERTITLE is when
+none of the required first arguments to COVER or DOC_COVER fits
+your needs for the title you want to appear on cover (or doc cover)
+pages.
 </p>
 
 <p>
-<strong>COVERTITLE</strong> and <strong>DOC_COVERTITLE</strong>
-accept multiple arguments, each surrounded by double-quotes.  Each
-argument is printed on a separate line, permitting you to create
-multi-line titles on your cover and/or doc cover pages.
+COVERTITLE and DOC_COVERTITLE accept multiple arguments, each
+surrounded by double-quotes.  Each argument is printed on a separate
+line, permitting you to create multi-line titles on your cover
+and/or doc cover pages.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ======================================================================== -->
 
-<a name="DOCSTYLE_MACROS"><h2><u>The Docstyle Macros</u></h2></a>
+<h2 id="docstyle-macros" class="macro-group">The docstyle macros</h2>
 
 <p>
-The docstyle macros tell <strong>mom</strong> what type of
-document you're writing, whether you want the output typeset or
-&quot;typewritten&quot;, and whether you want a draft copy (with
-draft and revision information in the headers) or a final copy.
-</p>
-
-<a name="INDEX_DOCSTYLE"><h3><u>Docstyle macros list</u></h3></a>
-
-<ul>
-    <li><a href="#DOCTYPE">DOCTYPE</a></li>
-    <li><a href="#PRINTSTYLE">PRINTSTYLE</a></li>
-    <ul>
-        <li><a href="#TYPESET_DEFAULTS">Defaults for PRINTSTYLE TYPESET</a></li>
-        <li><a href="#TYPEWRITE_DEFAULTS">Defaults for PRINTSTYLE TYPEWRITE</a></li>
-        <ul>
-            <li><a href="#TYPEWRITE_CONTROL">TYPEWRITE control macros</a></li>
-        </ul>
-    </ul>
-    <li><a href="#COPYSTYLE">COPYSTYLE</a></li>
+The docstyle macros tell mom what type of document you&#8217;re
+writing, whether you want the output typeset or &#8220;typewritten,
+double-spaced&#8221;, and whether you want a draft copy (with draft
+and revision information in the headers) or a final copy.
+</p>
+
+<div class="macro-list-container">
+<h3 id="index-docstyle" class="macro-list">Docstyle macros</h3>
+<ul class="macro-list">
+  <li><a href="#doctype">DOCTYPE</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;"> 
+    <li><a href="#doctype-underline">DOCTYPE_UNDERLINE</a> &ndash; how to control DOCTYPE <kbd>NAMED</kbd> underlining</li>      
+  </ul></li>
+  <li><a href="#printstyle">PRINTSTYLE</a> &ndash; non-optional macro required for document processing
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#typeset-defaults">Defaults for PRINTSTYLE TYPESET</a></li>
+    <li><a href="#typewrite-defaults">Defaults for PRINTSTYLE TYPEWRITE</a>
+    <ul style="margin-left: -.5em; list-style-type: circle;">
+      <li><a href="#typewrite-control">PRINTSTYLE TYPEWRITE control macros</a>
+      <ul style="margin-left: -1.5em; list-style-type: square;">
+        <li><a href="#typewriter-family">Family</a></li>
+        <li><a href="#typewriter-size">Point size</a></li>
+        <li><a href="#typewriter-underlining">Underlining of italics</a></li>
+      </ul></li>
+    </ul></li>
+  </ul></li>
+  <li><a href="#copystyle">COPYSTYLE</a></li>
 </ul>
+</div>
 
 <!-- -DOCTYPE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="DOCTYPE"></a>
-
-<p>
-<nobr>Macro: <strong>DOCTYPE</strong> <kbd>DEFAULT | CHAPTER | NAMED &quot;&lt;name&gt;&quot; | LETTER</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="doctype" class="macro-id">DOCTYPE</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOCTYPE</b> <kbd class="macro-args">DEFAULT | CHAPTER | NAMED &quot;&lt;name&gt;&quot; | LETTER</kbd>
+</div>
 
 <p>
-The arguments <kbd>DEFAULT, CHAPTER</kbd> and
-<kbd>NAMED</kbd> tell <strong>mom</strong> what to put in the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>
+The arguments <kbd>DEFAULT,</kbd> <kbd>CHAPTER</kbd> and
+<kbd>NAMED</kbd> tell mom what to put in the
+<a href="definitions.html#docheader">docheader</a>
 and
-<a href="definitions.html#TERMS_HEADER">page headers</a>.
+<a href="definitions.html#header">page headers</a>.
 <kbd>LETTER</kbd> tells her that you want to write a letter.
 </p>
 
 <p>
-<strong>Mom</strong>'s default <strong>DOCTYPE</strong> is
-<kbd>DEFAULT</kbd>.  If that's what you want, you don't
-have to give a <strong>DOCTYPE</strong> command.
+Mom&#8217;s default DOCTYPE is <kbd>DEFAULT</kbd>.  If that&#8217;s
+what you want, you don&#8217;t have to give a DOCTYPE command.
 </p>
 
-<h4><u>DEFAULT</u></h4>
-
 <p>
-<strong>DEFAULT</strong> prints a
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>
+<kbd>DEFAULT</kbd> prints a
+<a href="definitions.html#docheader">docheader</a>
 containing the title, subtitle and author information given to the
-<a href="#REFERENCE_MACROS">reference macros</a>,
-and page headers with the author and title.
-(See
-<a href="headfootpage.html#HEADER_STYLE">Default specs for headers</a>
-for how <strong>mom</strong> outputs each part of the page header.)
+<a href="#reference-macros">reference macros</a>,
+and page headers with the author and title.  (See
+<a href="headfootpage.html#header-style">Default specs for headers</a>
+for how mom outputs each part of the page header.)
 </p>
 
-<h4><u>CHAPTER</u></h4>
-
 <p>
-<strong>CHAPTER</strong> prints &quot;Chapter &lt;n&gt;&quot; in place of a
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>
-<nobr>(<kbd>&lt;n&gt;</kbd></nobr> is what you gave to the
-<a href="#REFERENCE_MACROS">reference macro</a>
-<a href="#CHAPTER">CHAPTER</a>).
+<kbd>CHAPTER</kbd> prints &#8220;Chapter &lt;n&gt;&#8221; in place
+of a
+<a href="definitions.html#docheader">docheader</a>
+(&lt;n&gt; is what you gave to the
+<a href="#reference-macros">reference macro</a>,
+<kbd><a href="#chapter">CHAPTER</a></kbd>).
 If you give the chapter a title with
-<a href="#CHAPTER_TITLE">CHAPTER TITLE</a>,
-<strong>mom</strong> prints &quot;Chapter &lt;n&gt;&quot; and the
+<a href="#chapter-title">CHAPTER TITLE</a>,
+mom prints &#8220;Chapter &lt;n&gt;&#8221; and the
 title underneath.  If you omit the
-<a href="#CHAPTER">CHAPTER</a>
+<a href="#chapter">CHAPTER</a>
 reference macro but supply a
-<a href="#CHAPTER_TITLE">CHAPTER_TITLE</a>,
-<strong>mom</strong> prints only the chapter title. <em>(*For
-backward compatibility with pre-1.1.5 versions of</em>
-<strong>mom</strong><em>, you can also supply a chapter title by
-omitting the</em> <strong>CHAPTER</strong> <em>reference macro and
-supplying a chapter title with</em>
-<a href="#CHAPTER_STRING">CHAPTER_STRING</a>.)
+<a href="#chapter-title">CHAPTER_TITLE</a>,
+mom prints only the chapter title.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+For backward compatibility with pre-1.1.5 versions of mom, you can
+also supply a chapter title by omitting the CHAPTER reference macro
+and supplying a chapter title with
+<a href="#chapter-string">CHAPTER_STRING</a>.)
 </p>
+</div>
 
 <p>
-The page headers in <strong>DOCTYPE CHAPTER</strong> contain the author,
+The page headers in DOCTYPE <kbd>CHAPTER</kbd> contain the author,
 the title of the book (which you gave with
-<a href="#TITLE">TITLE</a>),
-and &quot;Chapter &lt;n&gt;&quot; (or the chapter title).  See
-<a href="headfootpage.html#HEADER_STYLE">Default Specs for Headers</a>
-for <strong>mom</strong>'s default type parameters for each part of
+<a href="#title">TITLE</a>),
+and &#8220;Chapter &lt;n&gt;&#8221; (or the chapter title).  See
+<a href="headfootpage.html#header-style">Default Specs for Headers</a>
+for mom&#8217;s default type parameters for each part of
 the page header.
 </p>
 
-<h4><u>NAMED</u></h4>
-
 <p>
-<strong>NAMED</strong> takes an additional argument: a name
-for this particular kind of document  (e.g. outline, synopsis,
-abstract, memorandum), enclosed in double-quotes.
-<strong>NAMED</strong> is identical to <strong>DEFAULT</strong>
-except that <strong>mom</strong> prints the argument to
-<strong>NAMED</strong> beneath the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>,
+<kbd>NAMED</kbd> takes an additional argument: a name for this
+particular kind of document (e.g. outline, synopsis, abstract,
+memorandum), enclosed in double-quotes. <kbd>NAMED</kbd> is
+identical to <kbd>DEFAULT</kbd> except that mom prints the argument
+to <kbd>NAMED</kbd> beneath the
+<a href="definitions.html#docheader">docheader</a>,
 as well as in page headers.
 (See
-<a href="headfootpage.html#HEADER_STYLE">Default specs for headers</a>
-for how <strong>mom</strong> outputs each part of the page header.)
+<a href="headfootpage.html#header-style">Default specs for headers</a>
+for how mom outputs each part of the page header.)
 </p>
 
 <p>
 Additionally, if you wish the name of this particular kind of
-document to be coloured, you can pass <strong>DOCTYPE NAMED</strong>
-a third (optional) argument: the name of a colour pre-defined (or
-&quot;initialized&quot;) with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
+document to be coloured, you can pass DOCTYPE <kbd>NAMED</kbd> a
+third (optional) argument: the name of a colour pre-defined (or
+&#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
 or
-<a href="color.html#XCOLOR">XCOLOR</a>.
-For example, if you have a doctype named &quot;Warning&quot;,
-and you'd like &quot;Warning&quot; to be in red, assuming you've
-pre-defined (or &quot;initialized&quot;) the color, red, this is
-what the <strong>DOCTYPE</strong> entry would look like:
-
-<pre>
-    .DOCTYPE NAME "Warning" red
-</pre>
+<a href="color.html#xcolor">XCOLOR</a>.
+For example, if you have a doctype named &#8220;Warning&#8221;,
+and you&#8217;d like &#8220;Warning&#8221; to be in red, assuming you&#8217;ve
+pre-defined (or &#8220;initialized&#8221;) the color, red, this is
+what the DOCTYPE entry would look like:
+<br/>
+<span class="pre">
+  .DOCTYPE NAMED "Warning" red
+</span>
 </p>
 
-<p>
-By default, the string passed to <strong>DOCTYPE NAMED</strong> is
+<div class="box-tip" style="margin-top: 1.5em;">
+<h3 id="doctype-underline" class="docs control">How to control DOCTYPE NAMED underlining</h3>
+
+<p style="tip">
+By default, the string passed to DOCTYPE <kbd>NAMED</kbd> is
 underlined in the docheader, and on document-cover pages and cover
-(&quot;title"&quot;) pages.  (See the
-<a href="cover.html#INTRO">Introduction to covers</a>
-for the difference between &quot;doc cover&quot; and &quot;cover&quot;
-pages.)
+(&#8220;title&#8221;) pages.  (See the
+<a href="cover.html#intro">Introduction to covers</a>
+for the difference between &#8220;doc cover&#8221; and
+&#8220;cover&#8221; pages.)
 </p>
 
-<a name="DOCTYPE_UNDERLINE"><h5><u>The DOCTYPE_UNDERLINE macro</u></h5></a>
-
 <p>
-Formerly, this underlining was carved in stone.  As of version
-1.5 of <strong>mom</strong>, you can now use the macro
-<strong>DOCTYPE_UNDERLINE</strong> to set the weight of the
-underline and its distance from the doctype-name <em>in the
-docheader</em> (doc covers and covers handle underlining of the
+Formerly, this underlining was carved in stone.  As of version 1.5
+of mom, you can use the macro DOCTYPE_UNDERLINE to set the weight of
+the underline and its distance from where the doctype-name appears
+in the docheader (doc covers and covers handle underlining of the
 doctype-name differently; see
-<a href="cover.html#COVER_UNDERLINE">COVER_UNDERLINE</a>),
-or simply toggle doctype underlining on or off.
-<strong>Mom</strong>'s default is to underline the doctype-name.
+<a href="cover.html#cover-underline">COVER_UNDERLINE</a>),
+or simply toggle doctype underlining on or off.  Mom&#8217;s default
+is to underline the doctype-name.
 </p>
 
 <p>
 The order of arguments is <kbd>weight</kbd>, optionally followed by
-<kbd>gap</kbd>, where &quot;gap&quot; is the distance from the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+<kbd>gap</kbd>, where &#8220;gap&#8221; is the distance from the
+<a href="definitions.html#baseline">baseline</a>
 of the doctype-name to the underline.
 </p>
 
 <p>
 The <kbd>weight</kbd> argument is given in points, or fractions
-thereof, and must NOT have the
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
+thereof, and must not have the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
 <kbd>p</kbd>, appended.  Like
-<a href="inlines.html#RULE_WEIGHT">RULE_WEIGHT</a>,
-weights MUST be greater than 0 and less than 100.
-<strong>Mom</strong>'s default for head underlines is 1/2 point.
+<a href="inlines.html#rule-weight">RULE_WEIGHT</a>,
+weights must be greater than 0 and less than 100.  Mom&#8217;s
+default for DOCTYPE <kbd>NAMED</kbd> underlining is 1/2 point.
 </p>
 
 <p>
 The <kbd>gap</kbd> argument can be given using any unit of measure,
-and MUST have the unit of measure appended to the argument.  The
-distance of the gap is measured from the baseline of the head to
-the upper edge of the underline.  <strong>Mom</strong>'s default
-gap for named-doctype underlines is 2 points.
+and must have the unit of measure appended to the argument.
+The distance of the gap is measured from the baseline of the
+DOCTYPE <kbd>NAMED</kbd> name to the upper edge of the underline.
+Mom&#8217;s default gap for named-doctype underlining is 2 points.
 </p>
 
 <p>
 As an example, supposed you want the doctype-name underlined in the
 docheader with a 2-point rule separated from the head by 3 points.
-The way to accomplish that is:
-
-<pre>
-    .DOCTYPE_UNDERLINE 2 3p
-</pre>
-
-If you wanted the same thing, but were content with
-<strong>mom</strong>'s default gap of 2 points,
-
-<pre>
-    .DOCTYPE_UNDERLINE 4
-</pre>
-
+The way to accomplish it is:
+<br/>
+<span class="pre-in-pp">
+  .DOCTYPE_UNDERLINE 2 3p
+</span>
+If you wanted the same thing, but were content with mom&#8217;s
+default gap of 2 points,
+<br/>
+<span class="pre-in-pp">
+  .DOCTYPE_UNDERLINE 4
+</span>
 would do the trick.
 </p>
 
 <p>
-If you merely want to toggle the underlining of the doctype-name
-in docheaders on or off, invoke <kbd>.DOCTYPE_UNDERLINE</kbd> by
-itself to turn the underlining on, or <kbd><nobr>.DOCTYPE_UNDERLINE
-OFF</nobr></kbd> (or <strong>NO</strong>, <strong>X</strong>, etc.)
+If you merely want to toggle the underlining of
+the doctype-name in docheaders on or off, invoke
+<kbd>.DOCTYPE_UNDERLINE</kbd> by itself to turn the underlining on,
+or <kbd>.DOCTYPE_UNDERLINE&nbsp;OFF</kbd> (or NO, X, etc.)
 </p>
 
-<p>
-Please note that if you supply a weight to
-<strong>DOCTYPE_UNDERLINE</strong>, and optionally a gap, you also
-turn the underlining of the doctype-name in docheaders on; if this
-is not what you want, you must turn head underlining off manually
-afterwards.
+<p class="tip-bottom">
+Please note that if you supply a weight to DOCTYPE_UNDERLINE, and
+optionally a gap, you also turn the underlining of the doctype-name
+in docheaders on; if this is not what you want, you must turn the
+underlining off manually afterwards.
 </p>
-
-<h4><u>LETTER</u></h4>
+</div>
 
 <p>
-<strong>LETTER</strong> tells mom you're writing a letter.  See
-the section
-<a href="letters.html#INTRO">Writing Letters</a>
-for instructions on using <strong>mom</strong> to format letters.
+<kbd>LETTER</kbd> tells mom you&#8217;re writing a letter.  See the
+section
+<a href="letters.html#letters">Writing Letters</a>
+for instructions on using mom to format letters.
 </p>
 
 <!-- -PRINTSTYLE- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="printstyle" class="macro-id">PRINTSTYLE</h3>
+</div>
 
-<a name="PRINTSTYLE"></a>
-
-<p>
-<nobr>Macro: <strong>PRINTSTYLE</strong> <kbd>TYPESET | TYPEWRITE [ SINGLESPACE ]</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>PRINTSTYLE</b> <kbd class="macro-args">TYPESET | TYPEWRITE [ SINGLESPACE ]</kbd>
+</div>
 
-<em>*Required for document processing</em>
+<p class="requires">
+&bull;&nbsp;Required for document processing
 <br/>
-
-<em>*Must come before any changes to default document style</em>
+Must come before any changes to default document style
 </p>
 
 <p>
-<strong>PRINTSTYLE</strong> tells <strong>mom</strong> whether to typeset
-a document, or to print it out &quot;typewritten, doubled-spaced&quot;.
+PRINTSTYLE tells mom whether to typeset a document, or to print it
+out &#8220;typewritten, doubled-spaced&#8221;.
 </p>
 
-<p>
-<strong>THIS MACRO MAY NOT BE OMITTED.</strong>  In order for
-document processing to take place, <strong>mom</strong> requires
-a <strong>PRINTSTYLE</strong>.  If you don't give one,
-<strong>mom</strong> will warn you on stderr and print a single
+<div class="box-important">
+<p class="tip-top">
+<span class="important">Important:</span>
+<b>This macro may not be omitted.</b> In order for document
+processing to take place, mom requires a PRINTSTYLE.  If you
+don&#8217;t give one, mom will warn you on stderr and print a single
 page with a nasty message.
 </p>
 
-<p>
-Furthermore, <strong>PRINTSTYLE</strong> must come before any
-changes to <strong>mom</strong>'s default typestyle parameters.
-(This applies primarily to, but is by no means restricted to,
-<strong>PRINTSTYLE TYPESET</strong>.) <strong>PRINTSTYLE</strong>
-sets up complete &quot;templates&quot; that include default
-papersize, margins, family, fonts, point sizes, and so on.
-Therefore, changes to any aspect of document style must come
-afterwards.
+<p class="tip-bottom">
+Furthermore, PRINTSTYLE must come before any changes to mom&#8217;s
+default typestyle parameters.  (This applies primarily to, but is by
+no means restricted to, PRINTSTYLE <kbd>TYPESET</kbd>.) PRINTSTYLE
+sets up complete templates that include default papersize, margins,
+family, fonts, point sizes, and so on.  Therefore, changes to any
+aspect of document style must come afterwards.
 </p>
+</div>
 
 <p>
-<strong>TYPESET</strong>, as the argument implies, typesets
+<kbd>TYPESET</kbd>, as the argument implies, typesets
 documents (by default in Times Roman; see
-<a href="#TYPESET_DEFAULTS">TYPESET defaults</a>).
+<a href="#typeset-defaults">TYPESET defaults</a>).
 You have full access to all the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>
 as well as the
-<a href="definitions.html#STYLE_CONTROL">style control macros</a>
+<a href="definitions.html#style-control">style control macros</a>
 of document processing.
 </p>
 
 <p>
-As mentioned above, <strong>PRINTSTYLE TYPESET</strong> must come
-before any changes to <strong>mom</strong>'s default typographic
-settings.  For example,
-
-<pre>
-    .PAPER A4
-    .LS 14
-    .PRINTSTYLE TYPESET
-</pre>
-
-will not changes <strong>mom</strong>'s default paper size to A4,
+As mentioned above, PRINTSTYLE <kbd>TYPESET</kbd> must come before
+any changes to mom&#8217;s default typographic settings.  For
+example,
+<br/>
+<span class="pre-in-pp">
+  .PAPER A4
+  .LS 14
+  .PRINTSTYLE TYPESET
+</span>
+will not changes mom&#8217;s default paper size to A4,
 nor her default document leading 14 points, whereas
-
-<pre>
-    .PRINTSTYLE TYPESET
-    .PAPER A4
-    .LS 14
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .PRINTSTYLE TYPESET
+  .PAPER A4
+  .LS 14
+</span>
 will.
 </p>
 
 <p>
-With <strong>TYPEWRITE</strong>, <strong>mom</strong> does her best
-to reproduce the look and feel of typewritten, double-spaced copy (see
-<a href="#TYPEWRITE_DEFAULTS">TYPEWRITE defaults</a>).
-<a href="docelement.html#DOCELEMENT_CONTROL">Control macros</a>
+With <kbd>TYPEWRITE</kbd>, mom does her best to reproduce the look
+and feel of typewritten, double-spaced copy (see
+<a href="#typewrite-defaults">TYPEWRITE defaults</a>).
+<a href="docelement.html#docelement-control">Control macros</a>
 and
-<a href="typesetting.html#INTRO_MACROS_TYPESETTING">typesetting macros</a>
+<a href="typesetting.html#intro-macros-typesetting">typesetting macros</a>
 that alter family, font, point size, and
-<a href="definitions.html#TERMS_LEADING">leading</a>
+<a href="definitions.html#leading">leading</a>
 are (mostly) ignored.  An important exception is
-<a href="headfootpage.html#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a>
-(and, by extension, <strong>FOOTER_SIZE</strong>), which allows
-you to reduce the point size of headers/footers should they become
-too crowded.  Most of <strong>mom</strong>'s inlines affecting the
-appearance of type are also ignored (<kbd>\*S</kbd> is an exception;
-there may be a few others).
+<a href="headfootpage.html#hdrftr-global-size">HEADER_SIZE</a>
+(and, by extension, FOOTER_SIZE), which allows you to reduce the
+point size of headers/footers should they become too crowded.  Most
+of mom&#8217;s inlines affecting the appearance of type are also
+ignored
+(<kbd><a href="inlines.html#inline-size-mom">\*S[&lt;size&gt;]</a></kbd>
+is an exception; there may be a few others).
 </p>
 
 <p>
-In short, <strong>TYPEWRITE</strong> never produces effects
-other than those available on a typewriter.  Don't be fooled by
-how brainless this sounds; <strong>mom</strong> is remarkably
-sophisticated when it comes to conveying the typographic sense of a
-document within the confines of <strong>TYPEWRITE</strong>.
+In short, <kbd>TYPEWRITE</kbd> never produces effects
+other than those available on a typewriter.  Don&#8217;t be fooled
+by how brainless this sounds; mom is remarkably sophisticated when
+it comes to conveying the typographic sense of a document within the
+confines of <kbd>TYPEWRITE</kbd>.
 </p>
 
 <p>
-The primary uses of <strong>TYPEWRITE</strong> are: outputting hard
-copy drafts of your work (for editing), and producing documents
+The primary uses of <kbd>TYPEWRITE</kbd> are: outputting hard
+copy drafts of your work (for editing) and producing documents
 for submission to publishers and agents who (wisely) insist on
 typewritten, double-spaced copy.  To get a nicely typeset version of
-work that's in the submission phase of its life (say, to show fellow
-writers for critiquing), simply change <strong>TYPEWRITE</strong> to
-<strong>TYPESET</strong> and print out a copy.
-</p>
-
-<p>
-If, for some reason, you would prefer the output
-of <strong>TYPEWRITE</strong> single-spaced, pass
-<strong>PRINTSTYLE TYPEWRITE</strong> the optional argument,
-<strong>SINGLESPACE</strong>.
-</p>
-
-<p>
-If you absolutely must have a leading other than typewriter double-
-or singlespaced, the only way to get it is with the
-<a href="#DOC_LEAD">DOC_LEAD</a>
-macro, and then ONLY if <strong>DOC_LEAD</strong> is set
-<strong>before</strong> you invoke the <kbd>.START</kbd>
-macro.
-</p>
-
-<a name="TYPESET_DEFAULTS"><h3><u>TYPESET defaults</u></h3></a>
-
-<pre>
-    Family            = Times Roman
-    Point size        = 12.5
-    Paragraph leading = 16 points, adjusted
-    Fill mode         = justified
-    Hyphenation       = enabled
-                        max. lines = 2
-                        margin = 36 points
-                        interword adjustment = 1 point
-    Kerning           = enabled
-    Ligatures         = enabled
-    Smartquotes       = enabled
-    Word space        = groff default
-    Sentence space    = 0
-</pre>
-
-<a name="TYPEWRITE_DEFAULTS"><h3><u>TYPEWRITE defaults</u></h3></a>
-
-<pre>
-    Family            = Courier
-    Italics           = underlined
-    Point size        = 12
-    Paragraph leading = 24 points, adjusted; 12 points for SINGLESPACE
-    Fill mode         = left
-    Hyphenation       = disabled
-    Kerning           = disabled
-    Ligatures         = disabled
-    Smartquotes       = disabled
-    Word space        = groff default
-    Sentence space    = groff default
-    Columns           = ignored
-</pre>
-
-<a name="TYPEWRITE_CONTROL"><h3><u>PRINTSTYLE TYPEWRITE control macros</u></h3></a>
-
-<p>
-In <strong>PRINTSTYLE TYPEWRITE</strong>, <strong>mom</strong>,
-by default, underlines anything that looks like italics.  This
-includes the
-<a href="typesetting.html#SLANT_INLINE"><kbd>\*[SLANT]</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+work that&#8217;s in the submission phase of its life (say, to show
+fellow writers for critiquing), simply change <kbd>TYPEWRITE</kbd>
+to <kbd>TYPESET</kbd> and print out a copy.
+</p>
+
+<p>
+If, for some reason, you would prefer the output of
+<kbd>TYPEWRITE</kbd> single-spaced, pass PRINTSTYLE
+<kbd>TYPEWRITE</kbd> the optional argument, <kbd>SINGLESPACE</kbd>.
+</p>
+
+<div class="defaults-container">
+<h3 id="typeset-defaults" class="docs defaults" style="margin-top: 0;">PRINTSTYLE TYPESET defaults</h3>
+<span class="pre defaults">
+  Family            = Times Roman
+  Point size        = 12.5
+  Paragraph leading = 16 points, adjusted
+  Fill mode         = justified
+  Hyphenation       = enabled
+                      max. lines = 2
+                      margin = 36 points
+                      interword adjustment = 1 point
+  Kerning           = enabled
+  Ligatures         = enabled
+  Smartquotes       = enabled
+  Word space        = groff default
+  Sentence space    = 0
+</span>
+</div>
+
+<div class="defaults-container">
+<h3 id="typewrite-defaults" class="docs defaults" style="margin-top: 0;">PRINTSTYLE TYPEWRITE defaults</h3>
+<span class="pre defaults">
+  Family            = Courier
+  Italics           = underlined
+  Point size        = 12
+  Paragraph leading = 24 points, adjusted; 12 points for SINGLESPACE
+  Fill mode         = left
+  Hyphenation       = disabled
+  Kerning           = disabled
+  Ligatures         = disabled
+  Smartquotes       = disabled
+  Word space        = groff default
+  Sentence space    = groff default
+  Columns           = ignored
+</span>
+</div>
+
+<div class="box-tip" style="margin-top: 1.5em;">
+<h3 id="typewrite-control" class="docs control">PRINTSTYLE TYPEWRITE control macros</h3>
+
+<h4 id="typewriter-family" class="docs">Family</h4>
+
+<p style="margin-top: .5em;">
+If you&#8217;d prefer a monospace
+<a href="definitions.html#family">family</a>
+for PRINTSTYLE <kbd>TYPEWRITE</kbd> other than than mom's default,
+Courier, you can change it with
+<kbd>.TYPEWRITER_FAMILY&nbsp;&lt;family&gt;</kbd> (or
+<kbd>.TYPEWRITER_FAM</kbd>).  Since groff ships with only the
+Courier family, you will have to install any other monospace family
+yourself.  See
+<a href="appendices.html#fonts">Adding PostScript fonts to
+groff</a>.
+</p>
+
+<h4 id="typewriter-size" class="docs">Point size</h4>
+
+<p style="margin-top: .5em;">
+If you&#8217;d like a smaller or larger point size for
+for PRINTSTYLE <kbd>TYPEWRITE</kbd> (mom&#8217;s default is 12-point),
+you can change it with
+<kbd>.TYPEWRITER_SIZE&nbsp;&lt;size&gt;</kbd>.  There&#8217;s no need to
+add a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+to the <kbd>&lt;size&gt;</kbd> argument; points is assumed.  Be
+aware, however, that regardless of point size, mom&#8217;s
+leading/linespacing for <kbd>TYPEWRITE</kbd> is fixed at 24-point
+for double-spaced, and 12-point for single-spaced.
+</p>
+
+<h4 id="typewriter-underlining" class="docs">Underlining of italics</h4>
+
+<p>
+In PRINTSTYLE <kbd>TYPEWRITE</kbd>, mom, by default, underlines
+anything that looks like italics.  This includes the
+<a href="typesetting.html#slant-inline"><kbd>\*[SLANT]</kbd></a>
+<a href="definitions.html#inlines">inline escape</a>
 for pseudo-italics.
 </p>
 
-<p>
-If you'd prefer that <strong>mom</strong> were less bloody-minded
-about pretending to be a typewriter (i.e. you'd like italics and
+<p id="printstyle-italics">
+If you&#8217;d prefer that mom were less bloody-minded
+about pretending to be a typewriter (i.e. you&#8217;d like italics and
 pseudo-italics to come out as italics), use the control macros
-<kbd>.ITALIC_MEANS_ITALIC</kbd> and <kbd>.SLANT_MEANS_SLANT</kbd>.
+<br/>
+<span class="pre-in-pp">
+  .ITALIC_MEANS_ITALIC
+</span>
+and
+<span class="pre-in-pp">
+  .SLANT_MEANS_SLANT
+</span>
 Neither requires an argument.
 </p>
 
 <p>
-Although it's unlikely, should you wish to reverse
+Although it&#8217;s unlikely, should you wish to reverse
 the sense of these macros in the midst of a document,
 <kbd>.UNDERLINE_ITALIC</kbd> and <kbd>.UNDERLINE_SLANT</kbd> restore
 underlining of italics and pseudo-italics.
 </p>
 
-<a name="UNDERLINE_QUOTES"></a>
-
 <p>
-Additionally, by default, <strong>mom</strong> underlines
-<a href="definitions.html#TERMS_QUOTES">quotes</a>
+Additionally, by default, mom underlines
+<a href="definitions.html#quotes">quotes</a>
 (but not
-<a href="definitions.html#TERMS_BLOCKQUOTES">blockquotes</a>)
-in <strong>PRINTSTYLE TYPEWRITE</strong>.
-If you don't like this behaviour, turn it off with
-
-<pre>
-    .UNDERLINE_QUOTES OFF
-</pre>
+<a href="definitions.html#blockquotes">blockquotes</a>)
+in PRINTSTYLE <kbd>TYPEWRITE</kbd>.  If you don&#8217;t like this
+behaviour, turn it off with
+<br/>
+<span class="pre">
+  .UNDERLINE_QUOTES OFF
+</span>
 </p>
 
 <p>
-To turn underlining of quotes back on, use
-<strong>UNDERLINE_QUOTES</strong> without an argument.
+To turn underlining of quotes back on, use UNDERLINE_QUOTES without
+an argument.
 </p>
 
-<p>
+<p class="tip-bottom">
 While most of the
-<a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>
-have no effect on <strong>PRINTSTYLE TYPEWRITE</strong>, there
+<a href="docelement.html#docelement-control">control macros</a>
+have no effect on <b>PRINTSTYLE TYPEWRITE</b>, there
 is an important exception:
-<a href="headfootpage.html#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a>
-(and by extension, <strong>FOOTER_SIZE</strong>).  This is
+<a href="headfootpage.html#hdrftr-global-size">HEADER_SIZE</a>
+(and by extension, FOOTER_SIZE).  This is
 particularly useful for reducing the point size of
 headers/footers should they become crowded (quite likely to
 happen if the title of your document is long and your
-<a href="#COPYSTYLE">COPYSTYLE</a>
-is <strong>DRAFT</strong>).
+<kbd><a href="#copystyle">COPYSTYLE</a></kbd>
+is DRAFT).
 </p>
+</div>
 
 <!-- -COPYSTYLE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="COPYSTYLE"></a>
-
-<p>
-<nobr>Macro: <strong>COPYSTYLE</strong> <kbd>DRAFT | FINAL</kbd></nobr>
-</p>
-
-<p>
-<strong>Mom</strong>'s default <strong>COPYSTYLE</strong> is
-<strong>FINAL</strong>, so you don't have to use this macro unless
-you want to.
+<div class="macro-id-overline">
+<h3 id="copystyle" class="macro-id">COPYSTYLE</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>COPYSTYLE</b> <kbd class="macro-args">DRAFT | FINAL</kbd>
+</div>
+
+<p>
+Mom&#8217;s default COPYSTYLE is <kbd>FINAL</kbd>, so you
+don&#8217;t have to use this macro unless you want to.
 </p>
 
 <p>
-<strong>COPYSTYLE DRAFT</strong> exhibits the following behaviour:
-
-<ol>
-    <li>documents start on page 1, whether or not you
-        request a different starting page number with
-        <a href="headfootpage.html#PAGENUMBER">PAGENUMBER</a>
-    </li>
-    <li>page numbers are set in lower case roman numerals</li>
-    <li>the draft number supplied by 
-        <a href="#DRAFT">DRAFT</a>
-        and a revision number, if supplied with 
-        <a href="#REVISION">REVISION</a>
-        (see
-        <a href="#REFERENCE_MACROS">reference macros</a>),
-        appear in the centre part of
-        <a href="definitions.html#TERMS_HEADER">page headers</a>
-        (or footers, depending on which you've selected) along with
-        any other information that normally appears there.
-    </li>
+COPYSTYLE <kbd>DRAFT</kbd> exhibits the following behaviour:
+</p>
+<ol style="margin-top: -.5em;">
+  <li>Documents start on page 1, whether or not you
+      request a different starting page number with
+      <a href="headfootpage.html#pagenumber">PAGENUMBER</a>.
+  </li>
+  <li>Page numbers are set in lower case roman numerals.</li>
+  <li>The draft number supplied by 
+      <a href="#draft">DRAFT</a>
+      and a revision number, if supplied with 
+      <a href="#revision">REVISION</a>
+      (see
+      <a href="#reference-macros">reference macros</a>),
+      appear in the centre part of
+      <a href="definitions.html#header">page headers</a>
+      (or footers, depending on which you&#8217;ve selected) along with
+      any other information that normally appears there.
+  </li>
 </ol>
-</p>
-
-<p>
-<strong>IMPORTANT:</strong> If you define your own centre part for page
-headers with
-<a href="headfootpage.html#HDRFTR_CENTER">HEADER_CENTER</a>,
-no draft and/or revision number will appear there.  If you want draft
-and revision information in this circumstance, use
-<a href="headfootpage.html#DRAFT_WITH_PAGENUMBER">DRAFT_WITH_PAGENUMBER</a>.
-</p>
-
-<p>
-<strong>COPYSTYLE FINAL</strong> differs from <strong>DRAFT</strong> in that:
 
-<ol>
-    <li>it respects the starting page number you give the document</li>
-    <li>page numbers are set in normal (Arabic) digits</li>
-    <li>no draft or revision number appears in the page headers</li>
+<div class="box-important">
+<p class="tip">
+<span class="important">Important:</span>
+If you define your own centre part for page headers with
+<a href="headfootpage.html#hdrftr-center">HEADER_CENTER</a>,
+no draft and/or revision number will appear there.  If you want
+draft and revision information in this circumstance, use
+<a href="headfootpage.html#draft-with-pagenumber">DRAFT_WITH_PAGENUMBER</a>.
+</p>
+</div>
+
+<p>
+COPYSTYLE <kbd>FINAL</kbd> differs from <kbd>DRAFT</kbd> in that:
+</p>
+<ol style="margin-top: -.5em;">
+  <li>It respects the starting page number you give the document.</li>
+  <li>Page numbers are set in normal (Arabic) digits.</li>
+  <li>No draft or revision number appears in the page headers.</li>
 </ol>
-</p>
 
-<p>
-<a name="COPYSTYLE_NOTE"><strong>NOTE:</strong></a>
-The centre part of page headers can get crowded,
-especially with
-<a href="docprocessing.html#DOCTYPE">DOCTYPE CHAPTER</a>
+<div class="box-tip">
+<p id="copystyle-note" class="tip">
+<span class="note">Note:</span>
+The centre part of page headers can get crowded, especially with
+<a href="docprocessing.html#doctype">DOCTYPE <kbd>CHAPTER</kbd></a>
 and
-<a href="docprocessing.html#DOCTYPE">DOCTYPE NAMED</a>,
-when the <strong>COPYSTYLE</strong> is <strong>DRAFT</strong>.
-Three mechanisms are available to overcome this problem.  One is to
-reduce the overall size of headers (with
-<a href="headfootpage.html#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a>).
+<a href="docprocessing.html#doctype">DOCTYPE <kbd>NAMED</kbd></a>,
+when the COPYSTYLE is <kbd>DRAFT</kbd>.  Three mechanisms are
+available to overcome this problem.  One is to reduce the overall
+size of headers (with
+<a href="headfootpage.html#hdrftr-global-size">HEADER_SIZE</a>).
 Another, which only works with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
-is to reduce the size of the header's centre part only (with
-<a href="headfootpage.html#_SIZE">HEADER_CENTER_SIZE</a>).
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>,
+is to reduce the size of the header&#8217;s centre part only (with
+<a href="headfootpage.html#_size">HEADER_CENTER_SIZE</a>).
 And finally, you can elect to have the draft/revision information
 attached to page numbers instead of having it appear in the centre
 of page headers (see
-<a href="headfootpage.html#DRAFT_WITH_PAGENUMBER">DRAFT_WITH_PAGENUMBER</a>).
+<a href="headfootpage.html#draft-with-pagenumber">DRAFT_WITH_PAGENUMBER</a>).
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ======================================================================== -->
 
-<a name="START_MACRO"><h2><u>Initiate document processing</u></h2></a>
+<h2 id="start-macro" class="macro-group">Initiate document processing</h2>
 
 <p>
-In order to use <strong>mom</strong>'s document element macros
-(tags), you have to tell her you want them.  The macro to do this is
-<strong>START</strong>.
+In order to use mom&#8217;s document element macros (tags), you have
+to tell her you want them.  The macro to do this is
+<a href="#start">START</a>.
 </p>
 
 <p>
-<strong>START</strong> collects the information you gave
-<strong>mom</strong> in the setup section at the top of your file (see
-<a href="#DOCPROCESSING_TUT">Tutorial &mdash; setting up a mom document</a>),
+START collects the information you gave mom in the setup section at
+the top of your file (see
+<a href="#docprocessing-tut">Tutorial &ndash; Setting up a mom document</a>),
 merges it with her defaults, sets up headers and page numbering,
-and prepares <strong>mom</strong> to process your document using
-the document element tags.  No document processing takes place until
-you invoke <kbd>.START</kbd>.
+and prepares mom to process your document using the document
+element tags.  No document processing takes place until you invoke
+<kbd>.START</kbd>.
 </p>
 
 <!-- -START- -->
 
-<hr width="66%" align="left"/>
-
-<a name="START"></a>
+<div class="macro-id-overline">
+<h3 id="start" class="macro-id">START</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>START</strong></nobr>
-<br/>
-
-<em>*Required for document processing.</em>
+<div class="box-macro-args">
+Macro: <b>START</b>
+</div>
+<p class="requires">
+&bull;&nbsp;Required for document processing
 </p>
 
 <p>
-<strong>START</strong> takes no arguments.  It simply instructs
-<strong>mom</strong> to begin document processing.  If you don't
-want document processing (i.e. you only want the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>),
-don't use <strong>START</strong>.
+START takes no arguments.  It simply instructs mom to begin document
+processing.  If you don&#8217;t want document processing (i.e. you
+only want the
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>),
+don&#8217;t use START.
 </p>
 
 <p>
-At a barest minimum before <strong>START</strong>, you must enter a
-<a href="#PRINTSTYLE">PRINTSTYLE</a>
+At a barest minimum before START, you must enter a
+<a href="#printstyle">PRINTSTYLE</a>
 command.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ======================================================================== -->
 
-<a name="STYLE_BEFORE_START"><h2><u>Changing global typesetting and formatting parameters before START</u></h2></a>
+<h2 id="style-before-start" class="macro-group">Establishing type and formatting parameters before START</h2>
 
 <p>
 In the third (optional) part of setting up a document (see
-<a href="#DOCPROCESSING_TUT">Tutorial &mdash; setting up a mom document</a>),
+<a href="#docprocessing-tut">Tutorial &ndash; Setting up a mom document</a>),
 you can use the
 <a href="typesetting.html">typesetting macros</a>
-to change <strong>mom</strong>'s document-wide defaults for margins,
+to change mom&#8217;s document-wide defaults for margins,
 line length, family, base point size,
-<a href="definitions.html#TERMS_LEADING">leading</a>,
+<a href="definitions.html#leading">leading</a>,
 and justification style.
 </p>
 
 <p>
 Two additional style concerns have to be addressed here (i.e. in
 macros before
-<a href="#START">START</a>):
+<a href="#start">START</a>):
 changes to the
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>,
-and whether you want you want the document's nominal leading
+<a href="definitions.html#docheader">docheader</a>,
+and whether you want you want the document&#8217;s nominal leading
 adjusted to fill pages fully to the bottom margin.
 </p>
 
-<ul>
-    <li><a href="#TYPE_BEFORE_START">Using the typesetting macros before START</a></li>
-    <li><a href="#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a>
-        &mdash; adjusting linespacing for equal, accurate bottom margins
-    </li>
-    <li><a href="#DOCHEADER">DOCHEADER</a>
-        &mdash; turning the docheader off
-    </li>
-    <ul>
-        <li><a href="#DOCHEADER_CONTROL">Docheader control</a></li>
-    </ul>
-</ul>
-
-<hr width="66%" align="left"/>
-
-<a name="TYPE_BEFORE_START"><h3><u>Using the typesetting macros before START</u></h3></a>
-
-<p>
-From time to time (or maybe frequently), you'll want the overall
-look of a document to differ from <strong>mom</strong>'s defaults.
-Perhaps you'd like her to use a different
-<a href="definitions.html#TERMS_FAMILY">family</a>,
+<div class="macro-list-container" style="margin-top: 2em;">
+<h3 id="index-style-before-start" class="macro-list">Type &amp; formatting parameters before START</h3>
+<ul class="macro-list">
+  <li><a href="#type-before-start">Behaviour of the typesetting macros before START</a>
+  <ul class="sublist" style="line-height: 120%; margin-bottom: .25em;">
+    <li><a href="#meanings">List of meanings</a></li>
+    <li><a href="#lrc-note">Special note on LEFT, RIGHT and CENTER</a></li>
+    <li><a href="#include">Including (sourcing) style sheets and files</a></li>
+    <li><a href="#color">Initializing colors</a></li>
+  </ul></li>
+  <li><a href="#doc-lead-adjust">DOC_LEAD_ADJUST</a> &ndash; adjust linespacing to fill pages and align bottom margins</li>
+  <li><a href="#docheader">DOCHEADER</a>
+  <ul class="sublist" style="line-height: 120%;">
+    <li><a href="#docheader-control">Docheader control</a></li>
+  </ul></li>
+  <li><a href="#columns">COLUMNS</a>
+  <ul class="sublist" style="line-height: 120%;">
+    <li><a href="#col-next">COL_NEXT</a></li>
+    <li><a href="#col-break">COL_BREAK</a></li>
+  </ul></li>
+</ul>
+</div>
+
+<h3 id="type-before-start" class="docs">Behaviour of the typesetting macros before START</h3>
+
+<p>
+From time to time (or maybe frequently), you&#8217;ll want the
+overall look of a document to differ from mom&#8217;s defaults.
+Perhaps you&#8217;d like her to use a different
+<a href="definitions.html#family">family</a>,
 or a different overall
-<a href="definitions.html#TERMS_LEADING">leading</a>,
+<a href="definitions.html#leading">leading</a>,
 or have different left and/or right page margins.
 </p>
 
 <p>
 To accomplish such alterations, use the appropriate
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
-(listed below) <strong>after</strong>
-<a href="#PRINTSTYLE">PRINTSTYLE</a>
-and <strong>before</strong>
-<a href="#START">START</a>.
-</p>
-
-<p>
-More than one user has, quite understandably, not fully grasped
-the significance of the preceding sentence.  The part they've missed
-is &quot;<u>after <strong>PRINTSTYLE</strong></u>&quot;.
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>
+(listed below) after
+<a href="#printstyle">PRINTSTYLE</a>
+and before
+<a href="#start">START</a>.
 </p>
 
 <p>
-Changes to any aspect of the default look and/or formatting
-of a <strong>mom</strong> document must come after
-<strong>PRINTSTYLE</strong>.  For example, it might seem natural to
-set up page margins at the very top of a document with
-
-<pre>
-    .L_MARGIN 1i
-    .R_MARGIN 1.5i
-</pre>
+More than one user has, quite understandably, not fully grasped the
+significance of the preceding sentence.  The part they&#8217;ve missed is
+<i>after</i> PRINTSTYLE.
 </p>
 
 <p>
+Changes to any aspect of the default look and/or formatting of a mom
+document must come after PRINTSTYLE.  For example, it might seem
+natural to set up page margins at the very top of a document with
+<br/>
+<span class="pre-in-pp">
+  .L_MARGIN 1i
+  .R_MARGIN 1.5i
+</span>
 However, when you invoke <kbd>.PRINTSTYLE</kbd>, those margins
-will be overridden.  The correct place to set margins &mdash; and
-all other changes to the look of a document &mdash; is <strong>after
-PRINTSTYLE</strong>.
+will be overridden.  The correct place to set margins&mdash;and
+all other changes to the look of a document&mdash;is <i>after</i>
+PRINTSTYLE.
 </p>
 
-<p>
-<strong>NOTE:</strong> Don't use the macros listed in
-<a href="#DOC_PARAM_MACROS">Changing document-wide typesetting parameters after START</a>
-prior to <strong>START</strong>; they are exclusively for use
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Don&#8217;t use the macros listed in
+<a href="#doc-param-macros">Changing document-wide typesetting parameters after START</a>
+prior to START; they are exclusively for use
 afterwards.
 </p>
+</div>
 
-<p>
-When used before <strong>START</strong>, the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
-(below) have the following meanings:
-
-<pre>
-    L_MARGIN       Left margin of pages, including headers/footers
-    R_MARGIN       Right margin of pages, including headers/footers
-    T_MARGIN       The point at which running text (i.e. not
-                   headers/footers or page numbers) starts on each page
-    B_MARGIN*      The point at which running text (i.e. not
-    (see note)     headers/footers or page numbers) ends on each page
-
-    PAGE           If you use PAGE, its final four arguments have the
-                   same meaning as L_ R_ T_ and B_MARGIN (above).
-
-    LL             The line length for everything on the page;
-                   equivalent to setting the right margin with R_MARGIN
-    FAMILY         The family of all type in the document
-    PT_SIZE        The point size of type in paragraphs; mom uses this
-                   to calculate automatic point size changes (e.g. for
-                   heads, footnotes, quotes, headers, etc)
-    LS/AUTOLEAD**  The leading used in paragraphs; all leading and spacing
-                   of running text is calculated from this
-
-    QUAD/JUSTIFY   Affects paragraphs only
-    LEFT           No effect***
-    RIGHT          No effect***
-    CENTER         No effect***
+<div id="meanings" class="defaults-container">
+<h3 class="docs defaults" style="margin-top: 0;">Meanings</h3>
+<p style="margin-left: 9px; margin-top: -.25em;">
+When used before START, the
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>,
+below have the following meanings:
+<br/>
+<span class="pre">
+  L_MARGIN       Left margin of pages, including headers/footers
+  R_MARGIN       Right margin of pages, including headers/footers
+  T_MARGIN       The point at which running text (i.e. not
+                 headers/footers or page numbers) starts on each
+                 page
+  B_MARGIN*      The point at which running text (i.e. not
+  (see note)     headers/footers or page numbers) ends on each page
+
+  PAGE           If you use PAGE, its final four arguments have the
+                 same meaning as L_ R_ T_ and B_MARGIN (above).
+
+  LL             The line length for everything on the page;
+                 equivalent to setting the right margin with
+                 R_MARGIN
+  FAMILY         The family of all type in the document
+  PT_SIZE        The point size of type in paragraphs; mom uses
+                 this to calculate automatic point size changes
+                 (e.g. for heads, footnotes, quotes, headers, etc)
+  LS/AUTOLEAD**  The leading used in paragraphs; all leading and
+                 spacing of running text is calculated from this
+
+  QUAD/JUSTIFY   Affects paragraphs only
+  LEFT***        No effect
+  RIGHT***       No effect
+  CENTER***      No effect
 
 ------
-  *See <a href="headfootpage.html#FOOTER_MARGIN">FOOTER MARGIN AND BOTTOM MARGIN</a> for an important warning
- **See <a href="#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a>
-***See <a href="#LRC_NOTE">Special note</a>
-</pre>
+  *See <a href="headfootpage.html#footer-margin">FOOTER MARGIN AND BOTTOM MARGIN</a> for an important warning
+ **See <kbd><a href="#doc-lead-adjust">DOC_LEAD_ADJUST</a></kbd>
+***See <a href="#lrc-note">Special note</a>
+</span>
 </p>
+</div>
 
-<p>
+<p style="margin-top: -.75em;">
 Other macros that deal with type style, or refinements thereof
-(<strong>KERN, LIGATURES, HY, WS, SS,</strong> etc.), behave normally.
+(<b>KERN, LIGATURES, HY, WS, SS,</b> etc.), behave normally.
 It is not recommended that you set up tabs or indents prior to
-<strong>START</strong>.
+START.
 </p>
 
 <p>
 If you want to change any of the basic parameters (above)
-<em>after</em> <strong>START</strong> and have them affect a
-document globally (as if you'd entered them <em>before</em>
-<strong>START</strong>), you must use the macros listed in
-<a href="#DOC_PARAM_MACROS">Changing document-wide style parameters after START</a>.
+<i>after</i> START and have them affect a document globally (as if
+you&#8217;d entered them <i>before</i> START), you must use the macros
+listed in
+<a href="#doc-param-macros">Changing document-wide style parameters after START</a>.
 </p>
 
-<a name="LRC_NOTE"><h4><u>Special note on LEFT, RIGHT and CENTER prior to START</u></h4></a>
+<h4 id="lrc-note" class="docs">Special note on LEFT, RIGHT and CENTER prior to START</h4>
 
 <p>
 In a word, these three macros have no effect on document processing
-when invoked prior to <strong>START</strong>.
+when invoked prior to START.
 </p>
 
 <p>
-All <strong>mom</strong>'s document element tags
-(<strong>PP</strong>, <strong>HEAD</strong>,
-<strong>BLOCKQUOTE</strong>, <strong>FOOTNOTE</strong>, etc.)
-except
-<a href="docelement.html#QUOTE">QUOTE</a>
+All mom&#8217;s document element tags (PP, HEAD, BLOCKQUOTE,
+FOOTNOTE, etc.) except
+<a href="docelement.html#quote">QUOTE</a>
 set a
-<a href="definitions.html#TERMS_FILLED">fill mode</a>
-as soon as they're invoked.  If you wish to turn fill mode off for
-the duration of any tag (with
-<nobr><a href="typesetting.html#LRC">LEFT, RIGHT or CENTER</a>)</nobr>
+<a href="definitions.html#filled">fill mode</a>
+as soon as they&#8217;re invoked.  If you wish to turn fill mode off
+for the duration of any tag (with
+<a href="typesetting.html#lrc">LEFT, RIGHT or CENTER</a>)
 you must do so immediately after invoking the tag.  Furthermore,
-the change affects <em>only</em> the current invocation of the tag.
+the change affects <i>only</i> the current invocation of the tag.
 Subsequent invocations of the same tag for which you want the same
 change require that you invoke <kbd>.LEFT</kbd>, <kbd>.RIGHT</kbd>
-or <kbd> CENTER</kbd> immediately after every invocation of the tag.
+or <kbd>.CENTER</kbd> immediately after every invocation of the tag.
 </p>
 
 <!-- -INCLUDE- -->
 
-<hr align="left" width="66%"/>
-
-<a name="INCLUDE"><h2><u>Including (sourcing) style sheets and files</u></h2></a>
+<h4 id="include" class="docs">Including (sourcing) style sheets and files</h4>
 
 <p>
-If you routinely make the same changes to <strong>mom</strong>'s
-defaults in order to create similar documents in a similar
-style &mdash; in other words, you need a template&mdash; you can create
-style-sheet files and include, or "source", them into your
-<strong>mom</strong> documents with the macro,
-<strong>INCLUDE</strong>.  The right place for such style sheets is
-after 
-<a href="#PRINTSTYLE">PRINTSTYLE</a>
+If you routinely make the same changes to mom&#8217;s defaults in
+order to create similar documents in a similar style&mdash;in other
+words, you need a template&mdash; you can create style-sheet files
+and include, or "source", them into your mom documents with the
+macro, INCLUDE.  The right place for such style sheets is after
+<a href="#printstyle">PRINTSTYLE</a>
 and before
-<a href="#START">START</a>
+<a href="#start">START</a>.
 </p>
 
 <p>
-Say, for example, in a particular kind of document, you
-always want main heads set in Helvetica Bold Italic, flush
-left, with no underscore.  You'd create a file, let's call
-it <kbd>head_template</kbd>, in which you'd place the pertinent
-HEAD control macros.
-
-<pre>
-    .HEAD_FAMILY    H
-    .HEAD_FONT      BI
-    .HEAD_QUAD      L
-    .HEAD_UNDERLINE OFF
-</pre>
-
+Say, for example, in a particular kind of document, you always
+want main heads set in Helvetica Bold Italic, flush left,
+with no underscore.  You&#8217;d create a file, let&#8217;s call it
+<kbd>head-template</kbd>, in which you&#8217;d place the pertinent HEAD
+control macros.
+<br/>
+<span class="pre-in-pp">
+  .HEAD_FAMILY    H
+  .HEAD_FONT      BI
+  .HEAD_QUAD      L
+  .HEAD_UNDERLINE OFF
+</span>
 Then, in the preliminary document set-up section of your main file,
-you'd include the style sheet, or template, like this:
-
-<pre>
-    .TITLE      "Sample Document
-    .AUTHOR     "Joe Blow
-    .PRINTSTYLE TYPESET
-    \#
-    .INCLUDE    head_template
-    \#
-    .START
-</pre>
+you&#8217;d include the style sheet, or template, like this:
+<br/>
+<span class="pre-in-pp">
+  .TITLE      "Sample Document
+  .AUTHOR     "Joe Blow
+  .PRINTSTYLE TYPESET
+  \#
+  .INCLUDE    head-template
+  \#
+  .START
+</span>
 
-The blank comment lines <nobr>( <kbd>\#</kbd> )</nobr> aren't
-required, but they do make your file(s) easier to read.
+The blank comment lines ( <kbd>\#</kbd> ) aren&#8217;t required, but
+they do make your file(s) easier to read.
 </p>
 
 <p>
 If the file to be included is in the same directory as the file
-you're working, you simply enter the filename after
-<kbd>.INCLUDE</kbd>.  If the file's in another directory, you must
-provide a full path name to it.  For example, if you're working in
+you&#8217;re working, you simply enter the filename after
+<kbd>.INCLUDE</kbd>.  If the file&#8217;s in another directory, you must
+provide a full path name to it.  For example, if you&#8217;re working in
 a directory called <kbd>/home/joe/stories</kbd> and your
-style-sheet is in <kbd>/home/joe/style_sheets</kbd>, the above
+style-sheet is in <kbd>/home/joe/style-sheets</kbd>, the above
 example would have to look like this:
-
-<pre>
-    .TITLE      "Sample Document
-    .AUTHOR     "Joe Blow
-    .PRINTSTYLE TYPESET
-    \#
-    .INCLUDE    /home/joe/style_sheets/head_template
-    \#
-    .START
-</pre>
-</p>
-
-<p>
-<strong>INCLUDE</strong> is not restricted to style sheets
-or templates.  You can include any file at any point into a
-document, provided the file contains only text and valid groff or
-<strong>mom</strong> formatting commands.  Neither is
-<strong>INCLUDE</strong> restricted to use with
-<strong>mom</strong>'s document processing macros.  You can use it
-in plain typeset documents as well.
+<br/>
+<span class="pre-in-pp">
+  .TITLE      "Sample Document
+  .AUTHOR     "Joe Blow
+  .PRINTSTYLE TYPESET
+  \#
+  .INCLUDE    /home/joe/style-sheets/head-template
+  \#
+  .START
+</span>
 </p>
 
 <p>
-<strong>EXPERTS: INCLUDE</strong> is an alias for the groff
-request, <kbd>.so</kbd>.  Mix 'n' match with impunity.
+INCLUDE is not restricted to style sheets or templates.  You can
+include any file at any point into a document, provided the file
+contains only text and valid groff or mom formatting commands.
+Neither is INCLUDE restricted to use with mom&#8217;s document
+processing macros.  You can use it in plain typeset documents as
+well.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span>
+INCLUDE is an alias for the groff request, <kbd>.so</kbd>.  Mix 'n'
+match with impunity.
 </p>
+</div>
 
 <!-- -COLOUR- -->
 
-<hr align="left" width="66%"/>
-
-<a name="COLOR"><h2><u>Initializing colours</u></h2></a>
+<h4 id="color" class="docs">Initializing colours</h4>
 
 <p>
-Although it doesn't really matter where you define/initialize
+Although it doesn&#8217;t really matter where you define/initialize
 colours for use in document processing (see
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
+<a href="color.html#newcolor">NEWCOLOR</a>
 and
-<a href="color.html#XCOLOR">XCOLOR</a>
+<a href="color.html#xcolor">XCOLOR</a>
 in the section
-<a href="color.html#COLOR_INTRO">Coloured text</a>),
+<a href="color.html#color-intro">Coloured text</a>),
 I recommend doing so before you begin document processing with
-<a href="#START">START</a>.
+<kbd><a href="#start">START</a></kbd>.
 </p>
 
 <p>
 The macro,
-<a href="color.html#COLOR">COLOR</a>,
+<a href="color.html#color">COLOR</a>,
 and the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<a href="color.html#COLOR_INLINE"><kbd>\[&lt;colorname&gt;]</kbd></a>,
+<a href="definitions.html#inlines">inline escape</a>,
+<a href="color.html#color-inline"><kbd>\[&lt;colorname&gt;]</kbd></a>,
 can be used at any time during document processing for occasional
 colour effects.  However, consistent and reliable colourizing of
 various document elements (the docheader, heads, linebreaks,
 footnotes, pagenumbers, and so on) must be managed through the use
 of the
-<a href="docelement.html#DOCELEMENT_CONTROL">document element control macros</a>.
+<a href="docelement.html#docelement-control">document element control macros</a>.
 </p>
 
-<p>
-<strong>PLEASE NOTE:</strong> If you plan to have <strong>mom</strong>
-generate a
-<a href="docelement.html#TOC">table of contents</a>,
-do NOT embed colour
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-(<a href="color.html#COLOR_INLINE"><kbd>\[&lt;colorname&gt;]</kbd></a>)
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you plan to have mom generate a
+<a href="docelement.html#toc">table of contents</a>,
+do not embed colour
+<a href="definitions.html#inlines">inline escapes</a>
+(<a href="color.html#color-inline"><kbd>\[&lt;colorname&gt;]</kbd></a>)
 in the
-<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments</a>
+<a href="definitions.html#stringargument">string arguments</a>
 given to any of the
-<a href="docprocessing.html#REFERENCE_MACROS">reference macros</a>,
+<a href="docprocessing.html#reference-macros">reference macros</a>,
 nor in the string arguments given to
-<a href="docelement.html#HEAD">HEAD</a>,
-<a href="docelement.html#SUBHEAD">SUBHEAD</a>
+<a href="docelement.html#head">HEAD</a>,
+<a href="docelement.html#subhead">SUBHEAD</a>
 or
-<a href="docelement.html#PARAHEAD">PARAHEAD</a>.
+<a href="docelement.html#parahead">PARAHEAD</a>.
 Use, rather, the
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>
-<strong>mom</strong> provides to automatically colourize these
+<a href="definitions.html#controlmacro">control macros</a>
+mom provides to automatically colourize these
 elements.
 </p>
+</div>
 
 <!-- -DOC LEAD ADJUST- -->
 
-<hr align="left" width="66%"/>
-
-<a name="DOC_LEAD_ADJUST"><h2><u>Adjust a document's leading to fill pages</u></h2></a>
-
-<p>
-<nobr>Macro: <strong>DOC_LEAD_ADJUST</strong> <kbd>toggle</kbd></nobr>
-<br/>
-
-<em>*Must come after LS or AUTOLEAD and before START</em>
+<div class="macro-id-overline">
+<h3 id="doc-lead-adjust" class="macro-id">Adjust linespacing to fill pages and align bottom margins</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_LEAD_ADJUST</b> <kbd class="macro-args">toggle</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Must come after
+<a href="typesetting.html#ls"><span class="normal">LS</span></a>
+or
+<a href="typesetting.html.#autoloead"><span class="normal">AUTOLEAD</span></a>
+and before
+<a href="#start"><span class="normal">START</span></a>
 </p>
 
 <p>
-<strong>DOC_LEAD_ADJUST</strong> is a special macro to adjust
-document
-<a href="definitions.html#TERMS_LEADING">leading</a>
+DOC_LEAD_ADJUST is a special macro to adjust document
+<a href="definitions.html#leading">leading</a>
 so that bottom margins fall precisely where you expect.
 </p>
 
 <p>
-If you invoke <kbd>.DOC_LEAD_ADJUST</kbd>, <strong>mom</strong>
-takes the number of lines that fit on the page at your requested
-leading, then incrementally adds
-<a href="definitions.html#TERMS_UNITS">machine units</a>
+When you invoke <kbd>.DOC_LEAD_ADJUST</kbd>, mom takes the number
+of lines that fit on the page at your requested leading, then
+incrementally adds
+<a href="definitions.html#units">machine units</a>
 to the leading until the maximum number of lines at the new leading
-matches the bottom margin.  In most instances, the difference
-between the requested lead and the adjusted lead is
-unnoticeable, and since in almost all cases adjusted leading is
-what you want, it's <strong>mom</strong>'s default.
+that fit on the page coincides perfectly with the bottom margin of
+<a href="definitions.html#running">running text</a>.
 </p>
 
 <p>
-Should you NOT want adjusted document leading, you MUST turn it
-off manually, like this:
-
-<pre>
-    .DOC_LEAD_ADJUST OFF
-</pre>
+In most instances, the difference between the requested lead and
+the adjusted lead is unnoticeable, and since in almost all cases
+adjusted leading is what you want, it&#8217;s mom&#8217;s default
+and you don't have to invoke it explicitly.
 </p>
 
 <p>
-If you set the document leading prior to <strong>START</strong>
-with
-<a href="typesetting.html#LEADING">LS</a>
-or
-<a href="typesetting.html#AUTOLEAD">AUTOLEAD</a>,
-<strong>DOC_LEAD_ADJUST OFF</strong> must come afterwards, like
-this:
-
-<pre>
-    .LS 12
-    .DOC_LEAD_ADJUST OFF
-</pre>
+However, should you not want adjusted document leading, you must
+turn it off manually, like this:
+<br/>
+<span class="pre">
+  .DOC_LEAD_ADJUST OFF
+</span>
 </p>
 
 <p>
+If you set the document leading prior to START with
+<a href="typesetting.html#leading">LS</a>
+or
+<a href="typesetting.html#autolead">AUTOLEAD</a>,
+DOC_LEAD_ADJUST&nbsp;<kbd>OFF</kbd> must come afterwards, like
+this:
+<br/>
+<span class="pre-in-pp">
+  .LS 12
+  .DOC_LEAD_ADJUST OFF
+</span>
 In this scenario, the maximum number of lines that fit on a page at
 a
-<a href="definitions.html#TERMS_LEADING">leading</a>
+<a href="definitions.html#leading">leading</a>
 of 12
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-determine where <strong>mom</strong> ends
-a page.  The effect will be that last lines usually fall (slightly)
-short of the &quot;official&quot; bottom margin.
+<a href="definitions.html#picaspoints">points</a>
+determine where mom ends a page.  The effect will be that last lines
+usually fall (slightly) short of the &#8220;official&#8221; bottom
+margin.
 </p>
 
 <p>
 In
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a>
-<strong>TYPEWRITE</strong>, the leading is always adjusted and
-can't be turned off.
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>&nbsp;<kbd>TYPEWRITE</kbd>,
+the leading is always adjusted and can&#8217;t be turned off.
 </p>
 
-<p>
-<strong>NOTE:</strong> <strong>DOC_LEAD_ADJUST</strong>, if
-used, must be invoked after
-<a href="typesetting.html#LEADING">LS</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+DOC_LEAD_ADJUST, if used, must be invoked after
+<a href="typesetting.html#leading">LS</a>
 or
-<a href="typesetting.html#AUTOLEAD">AUTOLEAD</a>
+<a href="typesetting.html#autolead">AUTOLEAD</a>
 and before
-<a href="#START">START</a>
+<a href="#start">START</a>.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Even if you disable
-<strong>DOC_LEAD_ADJUST</strong>, <strong>mom</strong> will still
-adjust the leading of endnotes pages and toc pages.  See
-<a href="docelement.html#ENDNOTE_LEAD">ENDNOTE_LEAD</a>
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+Even if you disable DOC_LEAD_ADJUST, mom will still adjust the
+leading of endnotes pages and toc pages.  See
+<a href="docelement.html#endnote-lead">ENDNOTE_LEAD</a>
 and
-<a href="docelement.html#TOC_LEAD">TOC_LEAD</a>
+<a href="docelement.html#toc-lead">TOC_LEAD</a>
 for an explanation of how to disable this default behaviour.
 </p>
+</div>
 
 <!-- -DOCHEADER- -->
 
-<hr align="left" width="66%"/>
+<div class="macro-id-overline">
+<h3 id="docheader" class="macro-id">Managing the docheader</h3>
+</div>
 
-<a name="DOCHEADER"><h2><u>Managing the docheader</u></h2></a>
+<div class="box-macro-args">
+Macro: <b>DOCHEADER</b> <kbd class="macro-args">&lt;toggle&gt; [ distance to advance from top of page ]</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>DOCHEADER</strong> <kbd>&lt;toggle&gt; [ distance to advance from top of page ]</kbd></nobr>
-<br/>
-
-<em>*Must come before</em> START; <kbd>distance</kbd> <em>requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<p class="requires">
+&bull;&nbsp;Must come before
+<a href="#start"><span class="normal">START</span></a>; <kbd><span class="normal">distance</span></kbd> requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-By default, <strong>mom</strong> prints a
-<a href="definitions.html#TERMS_DOCHEADER">docheader</a>
+By default, mom prints a
+<a href="definitions.html#docheader">docheader</a>
 on the first page of any document (see
-<a href="#DOCHEADER_DESC">below</a>
-for a description of the docheader).  If you don't want a docheader,
+<a href="#docheader-desc">below</a>
+for a description of the docheader).  If you don&#8217;t want a docheader,
 turn it off with
-
-<pre>
-    .DOCHEADER OFF
-</pre> 
-</p>
-
-<p>
-<strong>DOCHEADER</strong> is a toggle macro, so the argument doesn't
-have to be <strong>OFF</strong>; it can be anything you like.
+<br/>
+<span class="pre-in-pp">
+  .DOCHEADER OFF
+</span> 
+DOCHEADER is a toggle macro, so the argument doesn&#8217;t
+have to be OFF; it can be anything you like.
 </p>
 
 <p>
-If you turn the docheader off, <strong>mom</strong>, by default, starts
+If you turn the docheader off, mom, by default, starts
 the running text of your document on the same top
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-as all subsequent pages.  If you'd like her to start at a different
-vertical position, give her the distance you'd like as a second
+<a href="definitions.html#baseline">baseline</a>
+as all subsequent pages.  If you&#8217;d like her to start at a different
+vertical position, give her the distance you&#8217;d like as a second
 argument.
-
-<pre>
-    .DOCHEADER OFF 1.5i
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .DOCHEADER OFF 1.5i
+</span>
 This starts the document 1.5 inches from the top of the page PLUS
-whatever spacing adjustment <strong>mom</strong> has to make in
-order to ensure that the first baseline of running text falls on a
-&quot;valid&quot; baseline (i.e. one that ensures that the bottom
-margin of the first page falls where it should).  The distance is
-measured from the top edge of the paper to the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+whatever spacing adjustment mom has to make in order to ensure that
+the first baseline of running text falls on a &#8220;valid&#8221;
+baseline (i.e. one that ensures that the bottom margin of the first
+page falls where it should).  The distance is measured from the top
+edge of the paper to the
+<a href="definitions.html#baseline">baseline</a>
 of the first line of type.
 </p>
 
-<p>
-<strong>TIP:</strong> Since no document processing happens until
-you invoke
-<a href="#START"><kbd>.START</kbd></a>
-&mdash; including anything to do with docheaders &mdash; you can
-typeset your own docheader prior to <strong>START</strong> (if
-you don't like the way <strong>mom</strong> does things) and use
-<strong>DOCHEADER OFF</strong> with its optional distance argument
-to ensure that the body of your document starts where you want.  You
-can even insert a PostScript file (with <kbd>.PSPIC</kbd>; see the
-<strong>groff_tmac</strong> man page for usage).
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+Since no document processing happens until you invoke
+<a href="#start"><kbd>.START</kbd></a>&mdash;including
+anything to do with docheaders&mdash;you can
+typeset your own docheader prior to START (if
+you don&#8217;t like the way mom does things) and use
+<kbd>.DOCHEADER&nbsp;OFF</kbd> with its optional distance
+argument to ensure that the body of your document starts where
+you want.  You can even insert a PostScript image file (see <a
+href="docelement.html#pspic">PSPIC)</a>.
 </p>
+</div>
 
 <!-- DOCHEADER CONTROL -->
 
-<a name="DOCHEADER_CONTROL"><h3><u>How to change the look of docheaders: docheader control macros</u></h3></a>
+<h3 id="docheader-control" class="docs">Docheader control: How to change the look of docheaders</h3>
 
 <p>
-With
-<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-the look of docheaders is carved in stone.
 In
-<a href="#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
-however, you can make a lot of changes.  Macros that alter docheaders
-MUST come before
-<a href="#START">START</a>.
+<a href="#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
+the look of docheaders is carved in stone.  In
+<a href="#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>,
+however, you can make a lot of changes.  Macros that alter
+docheaders must come before
+<a href="#start">START</a>.
 </p>
 
-<a name="DOCHEADER_DESC"></a>
+<h4 id="docheader-desc" class="docs">Docheader description</h4>
 
 <p>
-A typeset docheader has the following characteristics.  Note that
-title, subtitle, author, and document type are what you supply
-with the
-<a href="#REFERENCE_MACROS">reference macros</a>.
-Any you leave out will not appear; <strong>mom</strong> will
-compensate:
+A typeset docheader has the following characteristics:
+</p>
+<div class="box-code" style="margin-left: 24px;">
+<span class="pre" style="color: #302419;">
+    TITLE       bold, 3.5 points larger than running text (not necessarily caps)
+   Subtitle     medium, same size as running text
+      by        medium italic, same size as running text
+   Author(s)    medium italic, same size as running text
 
-<pre>
-        TITLE         bold, 3.5 points larger than running text (not necessarily caps)
-       Subtitle       medium, same size as running text
-          by          medium italic, same size as running text
-       Author(s)      medium italic, same size as running text
+(Document type) bold italic, underscored, 3 points larger than running text
 
-    (Document type)   bold italic, underscored, 3 points larger than running text
-</pre>
-</p>
+</span>
+</div>
 
 <p>
-If the
-<a href="#DOCTYPE">DOCTYPE</a>
-is CHAPTER,
-
-<pre>
-       Chapter &lt;n&gt;       bold, 4 points larger than running text
-      Chapter Title      bold italic, 4 points larger than running text
-</pre>
+Or, if the
+<a href="#doctype">DOCTYPE</a>
+is <kbd>CHAPTER</kbd>,
 </p>
+<div class="box-code" style="margin-left: 24px;">
+<span class="pre" style="color: #302419;">
+ Chapter &lt;n&gt;   bold, 4 points larger than running text
+Chapter Title  bold italic, 4 points larger than running text
+
+</span>
+</div>
 
 <p>
 The
-<a href="definitions.html#TERMS_FAMILY">family</a>
-is the prevailing family of the whole document.
+<a href="definitions.html#family">family</a>
+is the prevailing family of the whole document.  Title, subtitle,
+author and document type are what you supply with the
+<a href="#reference-macros">reference macros</a>.
+Any you leave out will not appear; mom will compensate:
+
 </p>
 
-<p>
-<strong>NOTE:</strong> If your <strong>DOCTYPE</strong> is
-<strong>CHAPTER</strong> and you have both &quot;Chapter
-&lt;n&gt;&quot; and a &quot;Chapter Title&quot; (as above),
-<strong>mom</strong> inserts a small amount of whitespace between
-them, equal to one-quarter of the
-<a href="definitions.html#TERMS_LEADING">leading</a>
-in effect.  If this doesn't suit you, you can alter the space
-by including the
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
-<a href="inlines.html#UP"><kbd>\*[UP]</kbd></a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your DOCTYPE is <kbd>CHAPTER</kbd> and you have both &#8220;Chapter
+&lt;n&gt;&#8221; and a &#8220;Chapter Title&#8221; (as above), mom
+inserts a small amount of whitespace between them, equal to
+one-quarter of the <a href="definitions.html#leading">leading</a> in
+effect.  If this doesn&#8217;t suit you, you can alter the space by
+including the
+<a href="definitions.html#inlines">inline escapes</a>,
+<a href="inlines.html#up"><kbd>\*[UP]</kbd></a>
 or
-<a href="inlines.html#DOWN"><kbd>\*[DOWN]</kbd></a>,
+<a href="inlines.html#down"><kbd>\*[DOWN]</kbd></a>,
 in the argument you pass to
-<a href="#CHAPTER_TITLE">CHAPTER_TITLE</a>,
+<a href="#chapter-title">CHAPTER_TITLE</a>,
 like this:
-
-<pre>
-    .CHAPTER_TITLE "\*[DOWN 2p]Why Not Patent Calculus?"
-        or
-    .CHAPTER_TITLE "\*[UP 2p]Why Not Patent Calculus?"
-</pre>
-</p>
-
-<a name="DOCHEADER_CONTROL_INDEX"><h4><u>The docheader macros to:</u></h4></a>
-
-<ol>
-    <li><a href="#CHANGE_START">Change the starting position of the docheader</a></li>
-    <li><a href="#DOCHEADER_FAMILY">Change the family of the entire docheader</a></li>
-    <li><a href="#ADJUST_LEADING">Adjust the docheader leading</a></li>
-    <li><a href="#CHANGE_FAMILY">Change the family of individual docheader elements</a></li>
-    <li><a href="#CHANGE_FONT">Change the font of docheader elements</a></li>
-    <li><a href="#CHANGE_COLOR">Change the colour of the docheader</a></li>
-    <li><a href="#CHANGE_SIZE">Adjust the size of docheader elements</a></li>
-    <li><a href="#CHANGE_ATTRIBUTE">Change the attribution string (&quot;by&quot;)</a></li>
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .CHAPTER_TITLE "\*[DOWN 2p]Why Not Patent Calculus?"
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .CHAPTER_TITLE "\*[UP 2p]Why Not Patent Calculus?"
+</span>
+</p>
+</div>
+
+<div class="macro-list-container">
+<h3 id="index-docheader-control" class="macro-list">Docheader control</h3>
+<ol class="macro-list">
+  <li><a href="#change-start">Change the starting position of the docheader</a></li>
+  <li><a href="#docheader-quad">Change quad direction the entire docheader</a></li>
+  <li><a href="#docheader-family">Change the family of the entire docheader</a></li>
+  <li><a href="#change-family">Change the family of individual docheader elements</a></li>
+  <li><a href="#change-font">Change the font of individual docheader elements</a></li>
+  <li><a href="#change-size">Adjust the size of docheader elements</a></li>
+  <li><a href="#adjust-leading">Adjust the docheader leading</a></li>
+  <li><a href="#docheader-color">Change the colour of the entire docheader</a></li>
+  <li><a href="#change-color">Change the colour of the individual docheader elements</a></li>
+  <li><a href="#change-attribute">Change the attribution string (&#8220;by&#8221;)</a></li>
 </ol>
+</div>
 
-<a name="CHANGE_START"><h5><u>1. Change the starting position</u></h5></a>
+<h4 id="change-start" class="docs">1. Change the starting position of the docheader</h4>
 
 <p>
 By default, a docheader starts on the same
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+<a href="definitions.html#baseline">baseline</a>
 as
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-If you'd like it to start somewhere else, use the macro
-<kbd>.DOCHEADER_ADVANCE</kbd> and give it the distance you want
-(measured from the top edge of the paper to the first baseline
-of the docheader), like this:
-
-<pre>
+<a href="definitions.html#running">running text</a>.
+If you&#8217;d like it to start somewhere else, use the macro,
+DOCHEADER_ADVANCE, and give it the distance you want (measured from
+the top edge of the paper to the first baseline of the docheader),
+like this:
+<br/>
+<span class="pre-in-pp">
     .DOCHEADER_ADVANCE 4P
-</pre>
-
+</span>
 A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 is required.
 </p>
 
-<p>
-<strong>NOTE:</strong> If
-<a href="headfootpage.html#HEADERS">HEADERS</a>
-are <strong>OFF</strong>, <strong>mom</strong>'s normal top
-margin for
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If
+<a href="headfootpage.html#headers">HEADERS</a>
+are <kbd>OFF</kbd>, mom&#8217;s normal top margin for
+<a href="definitions.html#running">running text</a>
 (7.5
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>)
-changes to 6 picas (visually approx. 1 inch).  Since the
-first baseline of the docheader falls on the same baseline
-as the first line of running text (on pages after page 1),
-you might find the docheaders a bit high when headers are off.
-Use
-<a href="#CHANGE_START">DOCHEADER_ADVANCE</a>
+<a href="definitions.html#picaspoints">picas</a>)
+changes to 6 picas (visually approx. 1 inch).  Since the first
+baseline of the docheader falls on the same baseline as the first
+line of running text (on pages after page 1), you might find the
+docheaders a bit high when headers are off.  Use DOCHEADER_ADVANCE
 to place them where you want.
 </p>
+</div>
 
-<a name="DOCHEADER_FAMILY"><h5><u>2. Change the family of the entire docheader</u></h5></a>
+<h4 id="docheader-quad" class="docs">2. Change the quad direction of the docheader</h4>
 
 <p>
-By default, <strong>mom</strong> sets the docheader in the same
-family used for 
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-If you'd prefer to have your docheaders set in a different family,
-invoke <kbd>.DOCHEADER_FAMILY</kbd> with the family you want.
-The argument for <strong>DOCHEADER_FAMILY</strong> is the same as
-for
-<a href="typesetting.html#FAMILY">FAMILY</a>.
+By default, mom centers the docheader.  If you&#8217;d prefer to
+have your docheaders set flush left or right, or need to restore
+the default centering, invoke <kbd>.DOCHEADER_QUAD</kbd> with the
+quad direction you want, either <kbd>LEFT</kbd> (or <kbd>L</kbd>),
+<kbd>RIGHT</kbd> (or <kbd>R</kbd>) or <kbd>CENTER</kbd> (or
+<kbd>C</kbd>).
 </p>
 
-<p>
-For example, <strong>mom</strong>'s default family for running text
-is Times Roman.  If you'd like to keep that default, but have the
-docheaders set entirely in Helvetica,
-
-<pre>
-    .DOCHEADER_FAMILY H
-</pre>
-
-is how you'd do it.
-</p>
+<h4 id="docheader-family" class="docs">3. Change the family of the entire docheader</h4>
 
 <p>
-Please note that if you use <strong>DOCHEADER_FAMILY</strong>,
-you can still alter the family of individual parts of the docheader
-with the macros listed
-<a href="#CHANGE_FAMILY">here</a>.
+By default, mom sets the docheader in the same
+family used for 
+<a href="definitions.html#running">running text</a>.
+If you&#8217;d prefer to have your docheaders set in a different
+family, invoke <kbd>.DOCHEADER_FAMILY</kbd> with the family you
+want.  The argument to DOCHEADER_FAMILY is the same as for
+<a href="typesetting.html#family">FAMILY</a>.
 </p>
 
-<a name="ADJUST_LEADING"><h5><u>3. Adjust the leading</u></h5></a>
-
 <p>
-The
-<a href="definitions.html#TERMS_LEADING">leading</a>
-of docheaders is the same as running text.  If you'd like your
-docheaders to have a different leading, say, 2 points more than the
-lead of running text, use:
-
-<pre>
-    .DOCHEADER_LEAD +2
-</pre>
+For example, mom&#8217;s default family for running text is Times
+Roman.  If you&#8217;d like to keep that default, but have the
+docheaders set entirely in Helvetica,
+<br/>
+<span class="pre-in-pp">
+  .DOCHEADER_FAMILY H
+</span>
+is how you&#8217;d do it.
 </p>
 
 <p>
-Since the leading of docheaders is calculated from the lead of running
-text, a + or - sign is required before the argument (how much to add
-or subtract from the lead of running text).  No 
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-is required; points is assumed.
+Please note that if you use DOCHEADER_FAMILY, you can still alter
+the family of individual parts of the docheader with the macros
+listed
+<a href="#change-family">here</a>.
 </p>
 
-<a name="CHANGE_FAMILY"><h5><u>4. Change the family of docheader elements</u></h5></a>
+<h4 id="change-family" class="docs">4. Change the family of individual docheader elements</h4>
 
 <p>
 The following macros let you change the
-<a href="definitions.html#TERMS_FAMILY">family</a>
+<a href="definitions.html#family">family</a>
 of each docheader element separately:
-
-<ul>
-    <li><nobr><kbd>.TITLE_FAMILY &lt;family&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.CHAPTER_TITLE_FAMILY &lt;family&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.SUBTITLE_FAMILY &lt;family&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.AUTHOR_FAMILY &lt;family&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.DOCTYPE_FAMILY &lt;family&gt;</kbd></nobr>
-        (if <a href="#DOCTYPE">DOCTYPE</a> is NAMED)
-    </li>
-</ul>
 </p>
+<ul style="list-style-type: none; margin: -.5em;">
+  <li>Macro: <b>TITLE_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd></li>
+  <li>Macro: <b>CHAPTER_TITLE_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd></li>
+  <li>Macro: <b>SUBTITLE_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd></li>
+  <li>Macro: <b>AUTHOR_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd></li>
+  <li>Macro: <b>DOCTYPE_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd>
+      (if <a href="#doctype">DOCTYPE</a> is <kbd>NAMED</kbd>)
+  </li>
+</ul>
 
 <p>
 Simply pass the appropriate macro the family you want, just as you
 would with
-<a href="typesetting.html#FAMILY">FAMILY</a>.
+<a href="typesetting.html#family">FAMILY</a>.
 </p>
 
-<a name="CHANGE_FONT"><h5><u>5. Change the font of docheader elements</u></h5></a>
+<h4 id="change-font" class="docs">5. Change the font of individual docheader elements</h4>
 
 <p>
 The following macros let you change the
-<a href="definitions.html#TERMS_FONT">font</a>
+<a href="definitions.html#font">font</a>
 of each docheader element separately:
-
-<ul>
-    <li><nobr><kbd>.TITLE_FONT R | B | I | BI</kbd></nobr></li>
-    <li><nobr><kbd>.CHAPTER_TITLE_FONT R | B | I | BI</kbd></nobr></li>
-    <li><nobr><kbd>.SUBTITLE_FONT R | B | I | BI</kbd></nobr></li>
-    <li><nobr><kbd>.AUTHOR_FONT R | B | I | BI</kbd></nobr></li>
-    <li><nobr><kbd>.DOCTYPE_FONT R | B | I | BI</kbd></nobr>
-        (if <a href="#DOCTYPE">DOCTYPE</a> is NAMED)
-    </li>
-</ul>
 </p>
+<ul style="list-style-type: none; margin: -.5em;">
+  <li>Macro: <b>TITLE_FONT</b> <kbd class="macro-args">R | B | I | BI</kbd></li>
+  <li>Macro: <b>CHAPTER_TITLE_FONT</b> <kbd class="macro-args">R | B | I | BI</kbd></li>
+  <li>Macro: <b>SUBTITLE_FONT</b> <kbd class="macro-args">R | B | I | BI</kbd></li>
+  <li>Macro: <b>AUTHOR_FONT</b> <kbd class="macro-args">R | B | I | BI</kbd></li>
+  <li>Macro: <b>DOCTYPE_FONT</b> <kbd class="macro-args">R | B | I | BI</kbd>
+      (if <a href="#doctype">DOCTYPE</a> is <kbd>NAMED</kbd>)
+  </li>
+</ul>
 
 <p>
 Simply pass the appropriate macro the font you want. <kbd>R, B,
 I</kbd> and <kbd>BI</kbd> have the same meaning as they do for
-<a href="typesetting.html#FONT">FT</a>.
+<a href="typesetting.html#font">FT</a>.
 </p>
 
-<a name="CHANGE_COLOR"><h5><u>6. Change the colour of the docheader elements individually</u></h5></a>
+<h4 id="change-size" class="docs">6. Adjust the size of individual docheader elements</h4>
 
 <p>
-The following macros let you change the color of each docheader
-element separately.  You must pre-define (or
-&quot;initialize&quot;) the color with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
-or
-<a href="color.html#XCOLOR">XCOLOR</a>.
-
-<ul>
-    <li><nobr><kbd>.TITLE_COLOR &lt;colorname&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.CHAPTER_TITLE_COLOR &lt;colorname&gt;</kbd></nobr></li>
-    <ul>
-        <li><strong>Note: CHAPTER_TITLE_COLOR</strong> is needed
-            only if you enter both a <strong>CHAPTER</strong>
-            reference macro AND a <strong>CHAPTER_TITLE</strong>
-            macro.  Otherwise, the macro,
-            <strong>TITLE_COLOR</strong> takes care of colorizing
-            the chapter header.
-        </li>
-    </ul>
-    <li><nobr><kbd>.SUBTITLE_COLOR &lt;colorname&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.ATTRIBUTE_COLOR &lt;colorname&gt;</kbd></nobr>
-        (the &quot;by&quot; string that precedes the author[s] name[s])
-    </li>
-    <li><nobr><kbd>.AUTHOR_COLOR &lt;colorname&gt;</kbd></nobr></li>
-    <li><nobr><kbd>.DOCTYPE_COLOR  &lt;colorname&gt;</kbd></nobr>
-        (if <a href="#DOCTYPE">DOCTYPE</a> is NAMED)
-    </li>
-</ul>
+The following macros let you adjust the point size of each docheader
+element separately.
 </p>
 
 <p>
-It is not recommended that you embed colour (with the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<a href="color.html#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a>)
-in the strings passed to
-<strong>TITLE</strong>, <strong>CHAPTER_TITLE</strong>,
-<strong>SUBTITLE</strong>, <strong>AUTHOR</strong> or the name you
-give <strong>DOCTYPE NAMED</strong>.  The strings passed to these
-macros are used to generate page
-<a href="definitions.html#TERMS_HEADER">headers</a>
-and
-<a href="definitions.html#TERMS_FOOTER">footers</a>.
-An embedded colour will cause the string to be colourized any time
-it appears in headers or footers.  (If you want headers or footers
-colourized, or parts thereof, use the header/footer control macros.)
-</p>
-
-<a name="DOCHEADER_COLOR"></a>
+Mom calculates the point size of docheader elements from the point
+size of paragraphs in running text, so you must prepend a + or -
+sign to the argument.  Points is assumed as the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+so there&#8217;s no need to append a unit to the argument.
+Fractional point sizes are allowed.
+</p>
+
+<ul style="list-style-type: none; margin: -.5em;">
+  <li>Macro: <b>TITLE_SIZE</b> <kbd class="macro-args">&lt;+/-points&gt;</kbd>
+      <br/>
+      &nbsp;&nbsp;&nbsp;default = +3.5 (+4 if docheader title is &quot;Chapter &lt;n&gt;&quot;)
+  </li>
+  <li>Macro: <b>.CHAPTER_TITLE_SIZE</b> <kbd class="macro-args">&lt;+/-points&gt;</kbd>
+      <br/>
+      &nbsp;&nbsp;&nbsp;default = +4
+  </li>
+  <li>Macro: <b>.SUBTITLE_SIZE</b> <kbd class="macro-args">&lt;+/-points&gt;</kbd>
+      <br/>
+      &nbsp;&nbsp;&nbsp;default = +0
+  </li>
+  <li>Macro: <b>.AUTHOR_SIZE</b> <kbd class="macro-args">&lt;+/-points&gt;</kbd>
+      <br/>
+      &nbsp;&nbsp;&nbsp;default = +0
+  </li>
+  <li>Macro: <b>.DOCTYPE_SIZE</b> <kbd class="macro-args">&lt;+/-points&gt;</kbd>
+      (if <a href="#doctype">DOCTYPE</a> is <kbd>NAMED</kbd>)
+      <br/>
+      &nbsp;&nbsp;&nbsp;default = +3
+  </li>
+</ul>
 
 <p>
-If you want to colourize the entire docheader, use the macro
-
-<ul>
-    <li><nobr><strong>DOCHEADER_COLOR</strong> <kbd>&lt;color name&gt;</kbd></nobr></li>
-</ul>
+Simply pass the appropriate macro the size adjustment you want.
 </p>
 
-<a name="CHANGE_SIZE"><h5><u>7. Adjust the size of docheader elements</u></h5></a>
+<h4 id="adjust-leading" class="docs">7. Adjust the docheader leading</h4>
 
 <p>
-The following macros let you adjust the point size of each docheader
-element separately.
+The
+<a href="definitions.html#leading">leading</a>
+of docheaders is the same as running text.  If you&#8217;d like your
+docheaders to have a different leading, say, 2 points more than the
+lead of running text, use:
+<br/>
+<span class="pre-in-pp">
+  .DOCHEADER_LEAD +2
+</span>
+Since the leading of docheaders is calculated from the lead of running
+text, a + or - sign is required before the argument (how much to add
+or subtract from the lead of running text).  No 
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+is required; points is assumed.
 </p>
 
+<h4 id="docheader-color" class="docs">8. Change the colour of the entire docheader</h4>
+
 <p>
-<strong>Mom</strong> calculates the point size
-of docheader elements from the point size of paragraphs in running
-text, so you must prepend a + or - sign to the argument.  Points is
-assumed as the
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
-so there's no need to append a unit to the argument.  Fractional point
-sizes are allowed.
+If you want to colourize the entire docheader:
+<br/>
+<span class="pre-in-pp">
+  .DOCHEADER_COLOR <kbd class="macro-args">&lt;color name&gt;</kbd>
+</span>
+You must pre-define (or &#8220;initialize&#8221;) the colour with
+<a href="color.html#newcolor">NEWCOLOR</a>
+or
+<a href="color.html#xcolor">XCOLOR</a>.
 </p>
 
-<ul>
-    <li><nobr><kbd>.TITLE_SIZE &lt;+/-points&gt;</kbd></nobr>
-        <br/>
-
-        default = +3.5 (+4 if docheader title is &quot;Chapter &lt;n&gt;&quot;)
-    </li>
-    <li><nobr><kbd>.CHAPTER_TITLE_SIZE &lt;+/-points&gt;</kbd></nobr>
-        <br/>
 
-        default = +4
-    </li>
-    <li><nobr><kbd>.SUBTITLE_SIZE &lt;+/-points&gt;</kbd></nobr>
-        <br/>
-
-        default = +0
-    </li>
-    <li><nobr><kbd>.AUTHOR_SIZE &lt;+/-points&gt;</kbd></nobr>
-        <br/>
+<h4 id="change-color" class="docs">9. Change the colour of the docheader elements individually</h4>
 
-        default = +0
-    </li>
-    <li><nobr><kbd>.DOCTYPE_SIZE &lt;+/-points&gt;</kbd></nobr>
-        (if <a href="#DOCTYPE">DOCTYPE</a> is NAMED)
-        <br/>
-
-        default = +3
-    </li>
+<p>
+The following macros let you change the colour of each
+docheader element separately.  You must pre-define (or
+&#8220;initialize&#8221;) the colour with
+<a href="color.html#newcolor">NEWCOLOR</a>
+or
+<a href="color.html#xcolor">XCOLOR</a>.
+</p>
+<ul style="list-style-type: none; margin: -.5em;">
+  <li>Macro: <b>TITLE_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd></li>
+  <li>Macro: <b>CHAPTER_TITLE_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd>
+  <ul style="list-style-type: disc; margin-left: -.5em;">
+    <li>Note: <b>CHAPTER_TITLE_COLOR</b> is needed only if you supply both a
+        <a href="#chapter">CHAPTER</a>
+        reference macro and a
+        <a href="#chapter-title">CHAPTER_TITLE</a>
+        macro.  Otherwise, TITLE_COLOR takes care of colorizing the
+        chapter header.
+    </li>
+  </ul></li>
+  <li>Macro: <b>SUBTITLE_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd></li>
+  <li>Macro: <b>ATTRIBUTE_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd>
+      (the &#8220;by&#8221; string preceding author[s] name[s])
+  </li>
+  <li>Macro: <b>AUTHOR_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd></li>
+  <li>Macro: <b>DOCTYPE_COLOR</b> <kbd class="macro-args"> &lt;colorname&gt;</kbd>
+      (if <a href="#doctype">DOCTYPE</a> is <kbd>NAMED</kbd>)
+  </li>
 </ul>
 
 <p>
-Simply pass the appropriate macro the size adjustment you want.
+It is not recommended that you embed colour (with the
+<a href="definitions.html#inlines">inline escape</a>,
+<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>)
+in the strings passed to TITLE, CHAPTER_TITLE, SUBTITLE, AUTHOR or
+the name you give DOCTYPE <kbd>NAMED</kbd>.  The strings passed to
+these macros are used to generate page
+<a href="definitions.html#header">headers</a>
+and
+<a href="definitions.html#footer">footers</a>,
+with the result that an embedded colour will cause the string to be
+colourized in headers and/or footers as well.  (If you want headers
+or footers colourized, or parts thereof, use the header/footer
+control macros.)
 </p>
 
-<a name="CHANGE_ATTRIBUTE"><h5><u>8. Change the attribution string (&quot;by&quot;)</u></h5></a>
+<h4 id="change-attribute" class="docs">10. Change the attribution string (&#8220;by&#8221;)</h4>
 
 <p>
-If you're not writing in English, you can change what
-<strong>mom</strong> prints where &quot;by&quot; appears in
-docheaders.  For example,
-
-<pre>
-    .ATTRIBUTE_STRING "par"
-</pre>
-
-changes &quot;by&quot; to &quot;par&quot;.  <strong>ATTRIBUTE_STRING</strong>
+If you&#8217;re not writing in English, you can change what mom
+prints where &#8220;by&#8221; appears in docheaders.  For example,
+<br/>
+<span class="pre-in-pp">
+  .ATTRIBUTE_STRING "par"
+</span>
+changes &#8220;by&#8221; to &#8220;par&#8221;.  ATTRIBUTE_STRING
 can also be used, for example, to make the attribution read
 &quot;Edited by&quot;.
 </p>
 
 <p>
-If you don't want an attribution string at all, simply pass
-<strong>ATTRIBUTE_STRING</strong> an empty argument, like this:
-
-<pre>
-    .ATTRIBUTE_STRING ""
-</pre>
-</p>
-
-<p>
-<strong>Mom</strong> will deposit a blank line where the
-attribution string normally appears.
+If you don&#8217;t want an attribution string at all, simply pass
+ATTRIBUTE_STRING an empty argument, like this:
+<br/>
+<span class="pre-in-pp">
+  .ATTRIBUTE_STRING ""
+</span>
+Mom will deposit a blank line where the attribution string normally
+appears.
 </p>
 
 <p>
 If the optional argument, <kbd>COVER</kbd> or <kbd>DOC_COVER</kbd>,
-is given to <strong>ATTRIBUTE_STRING</strong>, the string argument
-represents the attribution string that will appear on cover or
-document cover pages (see the
-<a href="cover.html#COVER_INTRO">Introduction to cover pages</a>
-for a description of the difference between &quot;document
-covers&quot; and &quot;covers&quot;).  Thus, it is possible to have
-different attribution strings on the document cover page, the cover
-(&quot;title&quot;) page, and in the first-page docheader.  An
-extreme example would be:
-
-<pre>
-    .ATTRIBUTE_STRING ""
-    .ATTRIBUTE_STRING DOC_COVER "Edited by"
-    .ATTRIBUTE_STRING COVER "by"
-</pre>
-
+is given to ATTRIBUTE_STRING, the string argument represents the
+attribution string that will appear on cover or document cover pages
+(see the
+<a href="cover.html#cover-intro">Introduction to cover pages</a>
+for a description of the difference between &#8220;document
+covers&#8221; and &#8220;covers&#8221;).  Thus, it is possible to
+have different attribution strings on the document cover page, the
+cover (&#8220;title&#8221;) page, and in the first-page docheader.
+An extreme example would be:
+<br/>
+<span class="pre-in-pp">
+  .ATTRIBUTE_STRING ""
+  .ATTRIBUTE_STRING DOC_COVER "Edited by"
+  .ATTRIBUTE_STRING COVER "by"
+</span>
 The first invocation of <kbd>.ATTRIBUTE_STRING</kbd> establishes a
 blank attribution string that will be incorporated in the first-page
-docheader.  The second will print &quot;Edited by&quot; on the
-document cover; the third will print &quot;by&quot; on the cover
-(&quot;title&quot;) page.
+docheader.  The second will print &#8220;Edited by&#8221; on the
+document cover; the third will print &#8220;by&#8221; on the cover
+(&#8220;title&#8221;) page.
 </p>
 
 <p>
-If you don't require differing attribute strings for doc
-cover pages, cover pages, or the first-page docheader,
+If you don&#8217;t require differing attribute strings for
+doc cover pages, cover pages, or the first-page docheader,
 <kbd>.ATTRIBUTE_STRING</kbd>, without either of the optional first
 arguments, is sufficient.
 </p>
 
-<p>
-<strong>NOTE:</strong> The type specs for the attribution line
-in docheaders are the same as for the author line.  Although
-it's highly unlikely you'll want the attribution line in a
-different family, font, or point size, you can do so by using
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-in the argument to <strong>ATTRIBUTE_STRING</strong>.  For
-example,
-
-<pre>
-    .ATTRIBUTE_STRING "\f[HBI]\*[SIZE -2p] by \*[SIZE +2p]\*[PREV]"
-</pre>
-
-would set &quot;by&quot; in Helvetica bold italic, 2 points
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The type specs for the attribution line in docheaders are the
+same as for the author line.  Although it&#8217;s highly unlikely
+you&#8217;ll want the attribution line in a different family, font,
+or point size, you can make such changes using
+<a href="definitions.html#inlines">inline escapes</a>
+in the argument to ATTRIBUTE_STRING.  For example,
+<br/>
+<span class="pre-in-pp">
+  .ATTRIBUTE_STRING "\f[HBI]\*[SIZE -2p] by \*[SIZE +2p]\*[PREV]"
+</span>
+would set &#8220;by&#8221; in Helvetica bold italic, 2 points
 smaller than normal.
 </p>
+</div>
 
-<!-- -COLUMNS- -->
+<div class="rule-short"><hr/></div>
 
-<hr align="left" width="66%"/>
+<!-- -COLUMNS- -->
 
-<a name="COLUMNS_INTRO"><h2><u>Setting documents in columns</u></h2></a>
+<h2 id="columns-intro" class="docs">Setting documents in columns</h2>
 
 <p>
-Setting documents in columns is easy with <strong>mom</strong>.  (Of
-course she'd say that, but it's true!)  All you have to do is is say
-how many columns you want and how much space you want between them
-(the
-<a href="definitions.html#TERMS_GUTTER">gutters</a>).
-That's it. <strong>Mom</strong> takes care of everything else, from
-soup to nuts.
+Setting documents in columns is easy with mom.  All you have to do
+is is say how many columns you want and how much space you want
+between them (the
+<a href="definitions.html#gutter">gutters</a>).
+That&#8217;s it. Mom takes care of everything else, from soup to
+nuts.
 </p>
 
-<h3><u>Some words of advice</u></h3>
+<h3 class="docs">Some words of advice</h3>
 
 <p>
 If you want your type to achieve a pleasing
-<a href="definitions.html#TERMS_JUST">justification</a>
+<a href="definitions.html#just">justification</a>
 or
-<a href="definitions.html#TERMS_RAG">rag</a>
+<a href="definitions.html#rag">rag</a>
 in columns, reduce the point size of type (and probably the
-<a href="definitions.html#TERMS_LEADING">leading</a>
-as well).  <strong>Mom</strong>'s default document point
-size is 12.5, which works well across her default 39
-<a href="definitions.html#TERMS_PICASPOINTS">pica</a>
-full page line length, but with even just two columns on a page,
-the default point size is awkward to work with.
+<a href="definitions.html#leading">leading</a>
+as well).  Mom&#8217;s default document point size is 12.5, which
+works well across her default 39
+<a href="definitions.html#picaspoints">pica</a>
+full page line length, but with even just two columns on a page, the
+default point size is awkward to work with.
 </p>
 
 <p>
-Furthermore, you'll absolutely need to reduce the indents for
-<a href="docelement.html#EPIGRAPH_CONTROL">epigraphs</a>,
-<a href="docelement.html#QUOTE_GENERAL">quotes</a>,
+Furthermore, you&#8217;ll absolutely need to reduce the indents for
+<a href="docelement.html#epigraph-control">epigraphs</a>,
+<a href="docelement.html#quote-general">quotes</a>,
 and
-<a href="docelement.html#BLOCKQUOTE_GENERAL">blockquotes</a>
+<a href="docelement.html#blockquote-general">blockquotes</a>
 (and probably the
-<a href="docelement.html#PARA_INDENT">paragraph first-line indent</a>
+<a href="docelement.html#para-indent">paragraph first-line indent</a>
 as well).
 </p>
 
 <!-- -COLUMN- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="columns" class="macro-id">COLUMNS</h3>
+</div>
 
-<a name="COLUMNS"></a>
+<div class="box-macro-args">
+Macro: <b>COLUMNS</b> <kbd class="macro-args">&lt;number of columns&gt; &lt;width of gutters&gt;</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>COLUMNS</strong> <kbd>&lt;number of columns&gt; &lt;width of gutters&gt;</kbd></nobr>
+<p class="requires">
+&bull;&nbsp;Should be the last macro before START
 <br/>
 
-<em>*Should be the last macro before</em> START
-<br/>
-
-<em>The second argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<i>The second argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a></i>
 </p>
 
 <p>
-<strong>COLUMNS</strong> takes two arguments: the number of
-columns you want on document pages, and the width of the
-<a href="definitions.html#TERMS_GUTTER">gutter</a>
+COLUMNS takes two arguments: the number of columns you want on
+document pages, and the width of the
+<a href="definitions.html#gutter">gutter</a>
 between them.  For example, to set up a page with two columns
-separated by an 18 point gutter, you'd do
-
-<pre>
-    .COLUMNS 2 18p
-</pre>
-</p>
-
-<p>
-Nothing to it, really.  However, as noted above,
-<strong>COLUMNS</strong> should always be the last document
-setup macro prior to
-<a href="#START">START</a>.
+separated by an 18 point gutter, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .COLUMNS 2 18p
+</span>
+Nothing to it, really.  However, as noted above, COLUMNS should
+always be the last document setup macro prior to
+<a href="#start">START</a>.
 </p>
 
-<p>
-<strong>NOTE:</strong> <strong>Mom</strong> ignores columns completely
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Mom ignores columns completely
 when the
-<a href="#PRINTSTYLE">PRINTSTYLE</a>
-is <strong>TYPEWRITE</strong>.    The notion of typewriter-style
+<a href="#printstyle">PRINTSTYLE</a>
+is <kbd>TYPEWRITE</kbd>.  The notion of typewriter-style
 output in columns is just too ghastly for her to bear.
 </p>
+</div>
 
-<h4><u>Using tabs when COLUMNS are enabled</u></h4>
+<h3 class="docs">Using tabs when COLUMNS are enabled</h3>
 
 <p>
-<strong>Mom</strong>'s tabs
-(both
-<a href="typesetting.html#TYPESETTING_TABS">typesetting tabs</a>
+Mom&#8217;s tabs (both
+<a href="typesetting.html#typesetting-tabs">typesetting tabs</a>
 and
-<a href="typesetting.html#STRING_TABS">string tabs</a>)
-behave as you'd expect during document processing, even when
-<strong>COLUMNS</strong> are enabled.  Tab structures set up
-during document processing carry over from page to page and column
-to column.
+<a href="typesetting.html#string-tabs">string tabs</a>)
+behave as you&#8217;d expect during document processing, even
+when COLUMNS are enabled.  Tab structures set up during document
+processing carry over from page to page and column to column.
 </p>
 
 <!-- -BREAKING COLUMNS- -->
 
-<a name="BREAKING_COLUMNS"><h4><u>Breaking columns manually</u></h4></a>
+<h3 id="breaking-columns" class="docs">Breaking columns manually</h3>
 
 <p>
-<strong>Mom</strong> takes care of breaking columns when they reach
-the bottom margin of a page.  However, there may be times you want to
-break the columns yourself.  There are two macros for breaking columns
-manually: <strong>COL_NEXT</strong> and <strong>COL_BREAK</strong>.
+Mom takes care of breaking columns when they reach the bottom
+margin of a page.  However, there may be times you want to break
+the columns yourself.  There are two macros for breaking columns
+manually: COL_NEXT and COL_BREAK.
 </p>
 
-<a name="COL_NEXT"></a>
+<div id="col-next" class="box-macro-args">
+Macro: <b>COL_NEXT</b>
+</div>
 
 <p>
 <kbd>.COL_NEXT</kbd> breaks the line just before it,
-<a href="definitions.html#TERMS_QUAD">quads</a>
+<a href="definitions.html#quad">quads</a>
 it left (assuming the type is justified or quad left), and moves over
 to the top of the next column.  If the column happens to be the last
-(rightmost) one on the page, <strong>mom</strong> starts a new page
+(rightmost) one on the page, mom starts a new page
 at the &quot;column 1&quot; position.  This is the macro to use when
 you want to start a new column after the end of a paragraph.
 </p>
 
-<a name="COL_BREAK"></a>
+<div id="col-break" class="box-macro-args">
+Macro: <b>COL_BREAK</b>
+</div>
 
 <p>
-<kbd>.COL_BREAK</kbd> is almost the same, except that
-instead of breaking and quadding the line preceding it,
-she breaks and spreads it (see
-<a href="typesetting.html#SPREAD">SPREAD</a>).
+<kbd>.COL_BREAK</kbd> is almost the same as <kbd>.COL_NEXT</kbd>,
+except that instead of breaking and quadding the line preceding it,
+mom breaks and spreads it (see
+<a href="typesetting.html#spread">SPREAD</a>).
 Use this macro whenever you need to start a new column in the middle
 of a paragraph.
 </p>
 
-<p>
-If you need <strong>COL_BREAK</strong> in the middle of a blockquote
-or (god help you) an epigraph, you must do the following in order for
-<strong>COL_BREAK</strong> to work:
-
-<pre>
-    .SPREAD
-    \!.COL_BREAK
-</pre>
+<div class="box-important">
+<p class="tip">
+<span class="important">Warning:</span>
+If you need COL_BREAK in the middle of a blockquote or (god help
+you) an epigraph, you must do the following in order for COL_BREAK
+to work:
+<br/>
+<span class="pre-in-pp">
+  .SPREAD
+  \!.COL_BREAK
+</span>
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ======================================================================== -->
 
-<a name="DOC_PARAM_MACROS"><h2><u>Changing global style parameters after START</u></h2></a>
+<!-- *** -->
 
-<p>
-In the normal course of things, you change the basic type
-parameters of a document <em>before</em>
-<a href="#START">START</a>,
-using
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
-(<strong>L_MARGIN, FAMILY, PT_SIZE, LS,</strong> etc).  After
-<strong>START</strong>, you MUST use the following macros to make
-global changes to the basic type parameters of a document.
-</p>
 
-<a name="INDEX_DOC_PARAM"><h3><u>Macro list</u></h3></a>
+<h2 id="style-after-start" class="macro-group">Changing basic type and formatting parameters after START</h2>
 
-<ul>
-    <li><a href="#DOC_LEFT_MARGIN">DOC_LEFT_MARGIN</a></li>
-    <li><a href="#DOC_RIGHT_MARGIN">DOC_RIGHT_MARGIN</a></li>
-    <li><a href="#DOC_LINE_LENGTH">DOC_LINE_LENGTH</a></li>
-    <li><a href="#DOC_FAMILY">DOC_FAMILY</a></li>
-    <li><a href="#DOC_PT_SIZE">DOC_PT_SIZE</a></li>
-    <li><a href="#DOC_LEAD">DOC_LEAD</a></li>
-    <li><a href="#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a></li>
-    <li><a href="#DOC_QUAD">DOC_QUAD</a></li>
+<ul id="changing-basic-type">
+  <li><a href="#behaviour">Behaviour of the typesetting macros during document processing</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#behaviour-specific">Effect of specific typesetting macros</a></li>
+  </ul></li>
+  <li><a href="#tb-margins">Top and bottom margins in document processing</a></li>
+  <li><a href="#space">Inserting space at the top of a new page</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#add-space">ADD_SPACE</a></li>
+  </ul></li>
 </ul>
 
-<!-- -DOC_LEFT_MARGIN -->
-
-<hr width="66%" align="left"/>
+<div class="rule-medium"><hr/></div>
 
-<a name="DOC_LEFT_MARGIN"></a>
+<h3 id="behaviour" class="docs">Behaviour of the typesetting macros during document processing</h3>
 
 <p>
-<nobr>Macro: <strong>DOC_LEFT_MARGIN</strong> <kbd>&lt;left margin&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+During document processing, most of the
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>
+affect type in the document globally.  For example, if you turn
+kerning off, pairwise kerning is disabled not only in paragraphs,
+but also in headers, footers, quotes, and so on.
 </p>
 
-<ul>
-    <li>the argument is the same as for
-        <a href="typesetting.html#L_MARGIN">L_MARGIN</a>
-    </li>
-    <li>changes all left margins to the new value</li>
-    <li>the line length remains the same (i.e. the right margin
-        shifts when you change the left margin)
-    </li>
-</ul>
-
-<!-- -DOC_RIGHT_MARGIN -->
+<p>
+Typesetting macros that alter margins and line lengths affect
+<a href="definitions.html#running">running text</a>
+globally (or at least try to), but leave headers/footers and
+footnotes alone.  (To indent footnotes, see the full explanation of
+the
+<a href="docelement.html#footnote">FOOTNOTE</a>
+macro.)
+</p>
 
-<hr width="33%" align="left"/>
+<p>
+Mom&#8217;s tabs (both
+<a href="typesetting.html#typesetting-tabs">typesetting tabs</a>
+and
+<a href="typesetting.html#string-tabs">string tabs</a>)
+behave as expected in running text during document processing.  Tab
+structures that do not exceed the line length of running text are
+preserved sensibly from page to page, and, if
+<a href="docprocessing.html#columns">COLUMNS</a>
+are enabled, from column to column.
+</p>
 
-<a name="DOC_RIGHT_MARGIN"></a>
+<p>
+Some typesetting macros, however, when used during document
+processing, behave in special ways.  These are the macros that deal
+with the basic parameters of type style: horizontal and vertical
+margins, line length,
+<a href="definitions.html#family">family</a>,
+<a href="definitions.html#font">font</a>,
+<a href="definitions.html#ps">point size</a>,
+<a href="definitions.html#leading">leading</a>,
+and
+<a href="definitions.html#quad">quad</a>.
+</p>
 
 <p>
-<nobr>Macro: <strong>DOC_RIGHT_MARGIN</strong> <kbd>&lt;right margin&gt;</kbd></nobr>
-<br/>
+Mom assumes that any changes to these parameters stem from a
+temporary need to set type in a style different from that provided
+by mom&#8217;s
+<a href="docelement.html#index-docelement">document element tags</a>.
+In other words, you need to do a bit of creative typesetting in the
+middle of a document.
+</p>
 
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<p>
+The following lists those typesetting macros whose behaviour during
+document processing requires some explanation.
+(Please refer to
+<a href="#tb-margins">Top and bottom margins in document processing</a>
+for information on how mom interprets
+<a href="typesetting.html#t-margin">T_MARGIN</a>
+and
+<a href="typesetting.html#b-margin">B_MARGIN</a>
+in document processing.  Additionally, see
+<a href="#add-space">ADD_SPACE</a>
+if you encounter the problem of trying to get mom to put space at
+the tops of pages after the first.)
+</p>
+<div id="behaviour-specific" class="box-code" style="margin-left: 24px;">
+<span class="pre" style="color: #302419;">
+  MACRO       EFFECT DURING DOCUMENT PROCESSING
+  -----       ---------------------------------
+
+  L_MARGIN    &bull;The left margin of all running text
+               assumes the new value.
+
+              &bull;The line length remains unaltered.
+
+              &bull;The header and footer left margin
+               remain at the current document default.
+
+              (You won&#8217;t use this often by itself.  Most
+               likely, you&#8217;ll use it in combination with
+               R_MARGIN or LL.)
+
+  R_MARGIN    &bull;The right margin of all running text
+               assumes the new value.  In other words,
+               the line length is altered.
+
+              &bull;The header and footer right margin
+               remain at the current document default.
+
+  LL          &bull;The line length of all running text
+               is set to the new value.
+
+              &bull;The header and footer line length remain
+               at the current document default.
+
+  FAMILY      &bull;Changes family for the duration of the
+               current tag only.  As soon as another document
+               element tag is invoked, the family reverts to
+               the current default for the new tag.
+
+  FT          &bull;Changes font for the duration of the
+               current tag only.  As soon as another document
+               element tag is entered, the font reverts
+               to the current default for the new tag.
+
+               N.B. &mdash; \&bull;[SLANT] and \&bull;[BOLDER] affect
+               paragraph text, and remain in effect for all
+               paragraphs until turned off.  If you want to
+               use them in a macro that takes a string
+               argument, include the escape in the string.
+               \&bull;[COND] and \&bull;[EXT] behave similarly.
+
+  PT_SIZE     &bull;Changes point size for the duration of the
+               current tag only.  As soon as another document
+               element tag is entered, the point size reverts
+               to the current document default for the new
+               tag.
+
+  LS          &bull;Changes line space for the duration of the
+               current tag only.  As soon as another document
+               element tag is entered, the line space reverts
+               to the current document default for the new
+               tag.
+
+               Using LS to temporarily change leading within
+               a document will almost certainly result in a
+               bottom margin that doesn&#8217;t align with
+               the bottom margin of subsequent pages.  You&#8217;ll
+               need to use the SHIM macro to get mom back on
+               track when you&#8217;re ready to return to the
+               document&#8217;s default leading.
+
+  QUAD        &bull;Changes quad for the duration of the
+               current tag only.  As soon as another document
+               element tag is entered, the quad reverts to
+               the current document default for the new
+               tag.
+
+               N.B. &mdash; Line-for-line quadding macros
+               (LEFT, CENTER, RIGHT) are also temporary,
+               overridden by the QUAD value of any subsequent
+               document element tag.
+</span>
+</div>
+
+<h3 id="tb-margins" class="docs" style="margin-top: 1.5em;">Top and bottom margins in document processing</h3>
+
+<p>
+Normally, mom establishes the top and bottom
+margins of
+<a href="definitions.html#running">running text</a>
+in documents from the values of <b>HEADER_MARGIN +
+HEADER_GAP</b> and <b>FOOTER_MARGIN + FOOTER_GAP</b>
+respectively.  However, if you invoke
+<a href="typesetting.html#t-margin">T_MARGIN</a>
+or
+<a href="typesetting.html#b-margin">B_MARGIN</a>
+either before or after
+<a href="docelement.html#start">START</a>,
+they set the top and bottom margins of running text irrespective of
+HEADER_GAP and FOOTER_GAP.
 </p>
 
-<ul>
-    <li>the argument is the same as for
-        <a href="typesetting.html#R_MARGIN">R_MARGIN</a>
-    </li>
-    <li>changes all right margins, including
-        <a href="definitions.html#TERMS_DOCHEADER">docheaders</a>,
-        headers (or footers) and page numbering to the new value;
-        for changing the right margin of
-        <a href="definitions.html#TERMS_RUNNING">running text</a>
-        only, use
-        <a href="typesetting.html#R_MARGIN">R_MARGIN</a>
-        (see
-        <a href="typemacdoc.html#TOP">Using typesetting macros during
-        document processing</a>,
-        entry for <strong>R_MARGIN</strong>)
-    </li>
-    <li>all mom commands that include a right indent calculate
-        the indent from the new value
-    </li>
-</ul>
+<p>
+Put another way, in document processing, T_MARGIN
+and B_MARGIN set the top and bottom margins of
+running text, but have no effect on the placement of
+<a href="definitions.html#header">headers</a>,
+<a href="definitions.html#footer">footers</a>,
+or page numbers.
+</p>
 
-<!-- -DOC_RIGHT_MARGIN -->
+<!-- ==================================================================== -->
 
-<hr width="33%" align="left"/>
+<h3 id="space" class="docs">Inserting space at the top of a new page</h3>
 
-<a name="DOC_LINE_LENGTH"></a>
+<p>
+Occasionally, you may want to insert space before the start of
+<a href="definitions.html#running">running text</a>
+on pages after the first.
+</p>
 
 <p>
-<nobr>Macro: <strong>DOC_LINE_LENGTH</strong> <kbd>&lt;length&gt;</kbd></nobr>
-<br/>
+You might have tried using
+<a href="typesetting.html#ald">ALD</a>
+or
+<a href="typesetting.html#space">SPACE</a>
+and found it did nothing.  This is because mom normally inhibits
+any extra space before the start of running text on pages after the
+first.
+</p>
 
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<p>
+If you need the space, you must use the macro, ADD_SPACE, in
+conjuction with
+<a href="typesetting.html#newpage">NEWPAGE</a>.
 </p>
 
-<ul>
-    <li>the argument is the same as for
-        <a href="typesetting.html#LINELENGTH">LL</a>
-    </li>
-    <li>exactly equivalent to changing the right margin with
-        DOC_RIGHT_MARGIN (see
-        <a href="#DOC_RIGHT_MARGIN">above</a>);
-        for changing the line length of
-        <a href="definitions.html#TERMS_RUNNING">running text</a>
-        only, use
-        <a href="typesetting.html#LINELENGTH">LL</a>
-        (see
-        <a href="typemacdoc.html#TOP">Using typesetting macros during
-        document processing</a>,
-        entry for <strong>LL</strong>)
-    </li>
-</ul>
+<!-- -ADD_SPACE- -->
 
-<!-- -DOC_FAMILY- -->
+<div class="macro-id-overline">
+<h3 id="add-space" class= "macro-id">ADD_SPACE</h3>
+</div>
 
-<hr width="33%" align="left"/>
+<div class="box-macro-args">
+Macro: <b>ADD_SPACE</b> <kbd class="macro-args">&lt;amount of space&gt;</kbd>
+</div>
 
-<a name="DOC_FAMILY"></a>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
 
 <p>
-<nobr>Macro: <strong>DOC_FAMILY</strong> <kbd>&lt;family&gt;</kbd></nobr>
+ADD_SPACE takes as its single argument the distance
+you want mom to advance from the normal
+baseline position at the top of any page after the first
+(i.e. the one on which the docheader is normally printed).  A
+<a href="definitions.html#unitofmeasure">unit of measure</a> is
+required.
 </p>
 
-<ul>
-    <li>the argument is the same as for
-        <a href="typesetting.html#FAMILY">FAMILY</a>
-    </li>
-    <li>globally changes the type family for</li>
-    <ul>
-        <li>the <a href="definitions.html#TERMS_DOCHEADER">docheader</a></li>
-        <li>all <a href="docelement.html#INDEX_DOCELEMENT">document element tags</a>, including footnotes</li>
-        <li><a href="definitions.html#TERMS_HEADER">headers and/or footers</a></li>
-        <li><a href="docelement.html#NUMBER_LINES_INTRO">line numbering</a></li>
-        <li><a href="headfootpage.html#PAGINATION">page numbering</a></li>
-    </ul>
-    <li>does <em>not</em> change the family of</li>
-    <ul>
-        <li><a href="cover.html#DOC_COVER">document cover pages</a></li>
-        <li><a href="cover.html#COVER">cover pages</a></li>
-        <li><a href="docelement.html#ENDNOTE_INTRO">endnotes pages</a></li>
-        <li><a href="docelement.html#TOC_INTRO">table of contents</a></li>
-    </ul>
-    <li>any page elements (e.g. headers page numbers, footnotes) whose
-        families you wish to remain at their old values must be
-        reset with the appropriate
-        <a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>
-    </li>
-</ul>
-
-<!-- -DOC_PT_SIZE- -->
+<p>
+For example, say you wanted to insert 2 inches of space before the
+start of
+<a href="definitions.html#running">running text</a>
+on a page other than the first.  You&#8217;d accomplish it with
+<br/>
+<span class="pre-in-pp">
+  .NEWPAGE
+  .ADD_SPACE 2i
+</span>
+which would terminate your current page, break to a new page, print
+the header (assuming headers are on) and insert 2 inches of space
+before the start of running text.
+</p>
 
-<hr width="33%" align="left"/>
+<p>
+Since adding space in this way is almost sure to disrupt mom&#8217;s
+ability to guarantee perfectly flush bottom margins, I highly
+recommend using the
+<a href="docprocessing.html#shim">SHIM</a>
+macro immediately after ADD_SPACE.
+</p>
 
-<a name="DOC_PT_SIZE"></a>
+<!-- *** -->
+<h2 id="intro-doc-param" class="macro-group">Changing basic type and formatting parameters after START</h2>
 
 <p>
-<nobr>Macro: <strong>DOC_PT_SIZE</strong> <kbd>&lt;point size&gt;</kbd></nobr>
-<br/>
-
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>; points is assumed</em>
+In the normal course of things, you establish the basic type
+parameters of a document prior to invoking
+<a href="#start">START</a>,
+using the
+<a href="typesetting.html#macros-typesetting">typesetting macros</a>
+(<b>L_MARGIN, FAMILY, PT_SIZE, LS,</b> etc).  After
+START, you <i>must</i> use the following macros to make
+global changes to the basic type parameters of a document.
 </p>
 
-<ul>
-    <li>the argument is the same as for
-        <a href="typesetting.html#PS">PT_SIZE</a>,
-        and refers to the point size of type in paragraphs
-    </li>
-    <li>all automatic point size changes (heads, quotes,
-        footnotes, headers, etc.) are affected by the new size;
-        anything you do not want affected must be reset to
-        its former value (see the Control Macros section of
-        the pertinent document element for instructions on
-        how to do this)
-    </li>
+<div class="macro-list-container">
+<h3 id="index-doc-param" class="macro-list">Post-START global style change macros</h3>
+<ul class="macro-list">
+  <li><a href="#doc-left-margin">DOC_LEFT_MARGIN</a></li>
+  <li><a href="#doc-right-margin">DOC_RIGHT_MARGIN</a></li>
+  <li><a href="#doc-line-length">DOC_LINE_LENGTH</a></li>
+  <li><a href="#doc-family">DOC_FAMILY</a></li>
+  <li><a href="#doc-pt-size">DOC_PT_SIZE</a></li>
+  <li><a href="#doc-lead">DOC_LEAD</a></li>
+  <li><a href="#doc-lead-adjust">DOC_LEAD_ADJUST</a></li>
+  <li><a href="#doc-quad">DOC_QUAD</a></li>
 </ul>
+</div>
 
-<!-- -DOC_LEAD- -->
+<!-- -DOC_LEFT_MARGIN -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="doc-left-margin" class="macro-id">DOC_LEFT_MARGIN</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_LEFT_MARGIN</b> <kbd class="macro-args">&lt;left margin&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
+
+<h4 class="docs doc-param-macros">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the argument is the same as for
+      <a href="typesetting.html#l-margin">L_MARGIN</a>
+  </li>
+  <li>changes all left margins to the new value</li>
+  <li>the line length remains the same (i.e. the right margin
+      shifts when you change the left margin)
+  </li>
+</ul>
 
-<a name="DOC_LEAD"></a>
+<!-- -DOC_RIGHT_MARGIN -->
 
-<p>
-<nobr>Macro: <strong>DOC_LEAD</strong> <kbd>&lt;points&gt;</kbd> [ ADJUST ]</nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="doc-right-margin" class="macro-id">DOC_RIGHT_MARGIN</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_RIGHT_MARGIN</b> <kbd class="macro-args">&lt;right margin&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
+
+<h4 class="docs doc-param-macros">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the argument is the same as for
+      <a href="typesetting.html#r-margin">R_MARGIN</a>
+  </li>
+  <li>changes all right margins, including
+      <a href="definitions.html#docheader">docheaders</a>,
+      headers (or footers) and page numbering to the new value;
+      for changing the right margin of
+      <a href="definitions.html#running">running text</a>
+      only, use
+      <a href="typesetting.html#r-margin">R_MARGIN</a>
+      (see
+      <a href="#behaviour">typesetting macros during
+      document processing</a>,
+      entry for R_MARGIN)
+  </li>
+  <li>all mom commands that include a right indent calculate
+      the indent from the new value
+  </li>
+</ul>
 
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>; points is assumed</em>
-</p>
+<!-- -DOC_RIGHT_MARGIN -->
 
-<ul>
-    <li>the argument is the same as for
-        <a href="typesetting.html#LEADING">LS</a>,
-        and refers to the
-        <a href="definitions.html#TERMS_LEAD">leading</a>
-        of paragraphs
-    </li>
-    <li>because paragraphs will have a new leading, the leading and
-        spacing of most running text is influenced by the new value
-    </li>
-    <li>epigraphs and footnotes remain unaffected;
-        if you wish to change their leading, use
-        <a href="docelement.html#EPIGRAPH_AUTOLEAD">EPIGRAPH_AUTOLEAD</a>
-        and
-        <a href="docelement.html#FOOTNOTE_AUTOLEAD">FOOTNOTE_AUTOLEAD</a>.
-    </li>
-    <li>the optional argument <strong>ADJUST</strong> performs
-        leading adjustment as explained in
-        <a href="#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a>
-    </li>
+<div class="macro-id-overline">
+<h3 id="doc-line-length" class="macro-id">DOC_LINE_LENGTH</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_LINE_LENGTH</b> <kbd class="macro-args">&lt;length&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
+
+<h4 class="docs doc-param-macros">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the argument is the same as for
+      <a href="typesetting.html#linelength">LL</a>
+  </li>
+  <li>exactly equivalent to changing the right margin with
+      DOC_RIGHT_MARGIN (see
+      <a href="#doc-right-margin">above</a>);
+      for changing the line length of
+      <a href="definitions.html#running">running text</a>
+      only, use
+      <a href="typesetting.html#linelength">LL</a>
+      (see
+      <a href="#behaviour">typesetting macros during document processing</a>,
+      entry for LL)
+  </li>
 </ul>
 
-<p>
-<strong>IMPORTANT:</strong> Do not use <strong>DOC_LEAD</strong>
-in the middle of a page!  It should always and only be invoked
-immediately prior to a new page, like this:
+<!-- -DOC_FAMILY- -->
 
-<pre>
-    .DOC_LEAD &lt;new value&gt;
-    .NEWPAGE
-</pre>
-</p>
+<div class="macro-id-overline">
+<h3 id="doc-family" class="macro-id">DOC_FAMILY</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd>
+</div>
+
+<h4 class="docs doc-param-macros" style="margin-top: 1em;">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the argument is the same as for
+      <a href="typesetting.html#family">FAMILY</a>
+  </li>
+  <li>globally changes the type family for
+  <ul>
+    <li style="margin-left: -.5em;">the <a href="definitions.html#docheader">docheader</a></li>
+    <li style="margin-left: -.5em;">all <a href="docelement.html#index-docelement">document element tags</a>, including footnotes</li>
+    <li style="margin-left: -.5em;"><a href="definitions.html#header">headers and/or footers</a></li>
+    <li style="margin-left: -.5em;"><a href="docelement.html#number-lines-intro">line numbering</a></li>
+    <li style="margin-left: -.5em;"><a href="headfootpage.html#pagination">page numbering</a></li>
+  </ul></li>
+  <li>does <i>not</i> change the family of
+  <ul>
+      <li><a href="cover.html#doc-cover">document cover pages</a></li>
+      <li><a href="cover.html#cover">cover pages</a></li>
+      <li><a href="docelement.html#endnote-intro">endnotes pages</a></li>
+      <li><a href="docelement.html#toc-intro">table of contents</a></li>
+  </ul></li>
+  <li>any page elements (e.g. headers page numbers, footnotes) whose
+      families you wish to remain at their old values must be
+      reset with the appropriate
+      <a href="docelement.html#docelement-control">control macros</a>
+  </li>
+</ul>
 
-<p>
-<strong>NOTE:</strong> Even if you don't pass
-<strong>DOC_LEAD</strong> the optional argument
-<kbd>ADJUST</kbd>, <strong>mom</strong> will still adjust the
-leading of endnotes pages and toc pages.  See
-<a href="docelement.html#ENDNOTE_LEAD">ENDNOTE_LEAD</a>
+<!-- -DOC_PT_SIZE- -->
+
+<div class="macro-id-overline">
+<h3 id="doc-pt-size" class="macro-id">DOC_PT_SIZE</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_PT_SIZE</b> <kbd class="macro-args">&lt;point size&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>; points is assumed
+</p>
+
+<h4 class="docs doc-param-macros">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the argument is the same as for
+      <a href="typesetting.html#ps">PT_SIZE</a>,
+      and refers to the point size of type in paragraphs
+  </li>
+  <li>all automatic point size changes (heads, quotes,
+      footnotes, headers, etc.) are affected by the new size;
+      anything you do not want affected must be reset to
+      its former value (see the Control Macros section of
+      the pertinent document element for instructions on
+      how to do this)
+  </li>
+</ul>
+
+<!-- -DOC_LEAD- -->
+
+<div class="macro-id-overline">
+<h3 id="doc-lead" class="macro-id">DOC_LEAD</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_LEAD</b> <kbd class="macro-args">&lt;points&gt; [ ADJUST ]</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>; points is assumed
+</p>
+
+<h4 class="docs doc-param-macros">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the argument is the same as for
+      <a href="typesetting.html#leading">LS</a>,
+      and refers to the
+      <a href="definitions.html#lead">leading</a>
+      of paragraphs
+  </li>
+  <li>because paragraphs will have a new leading, the leading and
+      spacing of most running text is influenced by the new value
+  </li>
+  <li>epigraphs and footnotes remain unaffected;
+      if you wish to change their leading, use
+      <a href="docelement.html#epigraph-autolead">EPIGRAPH_AUTOLEAD</a>
+      and
+      <a href="docelement.html#footnote-autolead">FOOTNOTE_AUTOLEAD</a>.
+  </li>
+  <li>the optional argument <kbd>ADJUST</kbd> performs
+      leading adjustment as explained in
+      <a href="#doc-lead-adjust">DOC_LEAD_ADJUST</a>
+  </li>
+</ul>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">Important:</span>
+Do not use DOC_LEAD in the middle of a page!  It should always and
+only be invoked immediately prior to a new page, like this:
+<br/>
+<span class="pre-in-pp">
+  .DOC_LEAD &lt;new value&gt;
+  .NEWPAGE
+</span>
+</p>
+</div>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Even if you don&#8217;t pass DOC_LEAD the optional argument
+<kbd>ADJUST</kbd>, mom will still adjust the leading of endnotes
+pages and toc pages.  See
+<a href="docelement.html#endnote-lead">ENDNOTE_LEAD</a>
 and
-<a href="docelement.html#TOC_LEAD">TOC_LEAD</a>
+<a href="docelement.html#toc-lead">TOC_LEAD</a>
 for an explanation of how to disable this default behaviour.
 </p>
+</div>
 
 <!-- -DOC_QUAD- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="doc-quad" class="macro-id">DOC_QUAD</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DOC_QUAD</b> <kbd class="macro-args">L | R | C | J</kbd>
+</div>
+
+<h4 class="docs doc-param-macros" style="margin-top: 1em;">Arguments and behaviour</h4>
+
+<ul class="doc-param-macros">
+  <li>the arguments are the same as for
+      <a href="typesetting.html#quad">QUAD</a>
+  </li>
+  <li>affects paragraphs, epigraphs and footnotes; does not
+      affect blockquotes
+  </li>
+</ul>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 24%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 43%; text-align: right;"><a href="docelement.html#top">Next: The document element tags</a></td>
+</tr>
+</table>
 
-<a name="DOC_QUAD"></a>
+</div>
 
-<p>
-<nobr>Macro: <strong>DOC_QUAD</strong> <kbd>L | R | C | J</kbd></nobr>
-</p>
-
-<ul>
-    <li>the arguments are the same as for
-        <a href="typesetting.html#QUAD">QUAD</a>
-    </li>
-    <li>affects paragraphs, epigraphs and footnotes; does not
-        affect blockquotes
-    </li>
-</ul>
-
-<hr/>
-
-<p>
-<a href="typemacdoc.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="color.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/goodies.html groff-1.21/contrib/mom/momdoc/goodies.html
--- groff-1.20.1/contrib/mom/momdoc/goodies.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/goodies.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,948 +16,949 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Goodies</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Goodies</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="inlines.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="typesetting.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="inlines.html#top">Next: Inline escapes</a></td>
+</tr>
+</table>
 
-<a name="GOODIES"><h1 align="center"><u>Goodies</u></h1></a>
+<h1 id="goodies" class="docs">Goodies</h1>
 
 <p>
 The macros in this section are a collection of useful (and sometimes
 nearly indispensable) routines to simplify typesetting.
 </p>
 
-<a name="INDEX_GOODIES"><h3><u>Goodies list</u></h3></a>
-
-<ul>
-    <li><a href="#ALIAS">ALIAS</a> (rename macros)</li>
-    <li><a href="#SILENT">SILENT</a> (&quot;hide&quot; input lines from output)</li>
-    <li><a href="#TRAP">TRAP</a> (suspend/re-invoke traps)</li>
-    <li><a href="#SMARTQUOTES">SMARTQUOTES</a> (convert typewriter doublequotes to proper doublequotes)</li>
-    <li><a href="#CAPS">CAPS</a> (convert to upper case)</li>
-    <li><a href="#STRING">STRING</a> (user-definable strings)</li>
-    <li><a href="#ESC_CHAR">ESC_CHAR</a> (change to escape character to something other than a backslash)</li>
-    <li><strong>Underscore/underline</strong></li>
-    <ul>
-        <li><a href="#UNDERSCORE">UNDERSCORE</a> (single underscore)</li>
-        <li><a href="#UNDERSCORE2">UNDERSCORE2</a> (double underscore)</li>
-        <li><a href="#UNDERLINE">UNDERLINE</a> (underline &mdash; Courier only!)</li>
-        <li><a href="#UL">\*[UL]</a> (inline escape to underline &mdash; Courier only!)</li>
-    </ul>
-    <li><strong>Padding</strong></li>
-    <ul>
-        <li><a href="#PAD">PAD</a> (insert equalized space into lines)</li>
-        <li><a href="#PAD_MARKER">PAD_MARKER</a> (change/set the marker used with <strong>PAD</strong>)</li>
-    </ul>
-    <li><strong>Leaders</strong></li>
-    <ul>
-        <li><a href="#LEADER">\*[LEADER]</a> (inline escape to add leaders to a line)</li>
-        <li><a href="#LEADER_CHARACTER">LEADER_CHARACTER</a> (change/set the leader character)</li>
-    </ul>
-    <li><strong>Drop caps</strong></li>
-    <ul>
-        <li><a href="#DROPCAP">DROPCAP</a> (set a drop cap)</li>
-        <li><strong>Support macros for DROPCAP</strong></li>
-        <ul>
-            <li><a href="#DROPCAP_FAMILY">DROPCAP_FAMILY</a> (change drop cap family)</li>
-            <li><a href="#DROPCAP_FONT">DROPCAP_FONT</a> (change drop cap font)</li>
-            <li><a href="#DROPCAP_ADJUST">DROPCAP_ADJUST</a> (alter size of drop cap)</li>
-            <li><a href="#DROPCAP_COLOR">DROPCAP_COLOR</a> (change colour of drop cap)</li>
-            <li><a href="#DROPCAP_GUTTER">DROPCAP_GUTTER</a> (change space between drop cap and running text)</li>
-        </ul>
-    </ul>
-    <li><strong>Superscripts</strong></li>
-    <ul>
-        <li><a href="#SUP">\*[SUP]</a> (set superscript)</li>
-        <li><a href="#CONDSUP">\*[CONDSUP]</a> (set condensed superscript)</li>
-        <li><a href="#EXTSUP">\*[EXTSUP]</a> (set extended superscript)</li>
-    </ul>
-    <li><strong>Lists</strong></li>
-    <ul>
-        <li><a href="docelement.html#LIST_INTRO">Introduction to lists</a></li>
-        <li><a href="docelement.html#LIST">LIST</a></li>
-        <li><a href="docelement.html#ITEM">ITEM</a></li>
-        <li><a href="docelement.html#SHIFT_LIST">SHIFT_LIST</a></li>
-        <li><a href="docelement.html#RESET_LIST">RESET_LIST</a></li>
-        <li><a href="docelement.html#PAD_LIST_DIGITS">PAD_LIST_DIGITS</a></li>
-    </ul>
+<div id="goodies-macros-mini-toc" style="margin-top: -1em; font-size: 95%;">
+<div class="mini-toc-col-1">
+<ul class="no-enumerator">
+<li class="list-head-goodies"><a href="#alias">ALIAS</a> <span class="normal-smaller">&ndash; rename macros</span></li>
+<li class="list-head-goodies"><a href="#silent">SILENT</a> <span class="normal-smaller">&ndash; &#8220;hide&#8221; input lines from output</span></li>
+<li class="list-head-goodies"><a href="#trap">TRAP</a> <span class="normal-smaller">&ndash; suspend/re-invoke traps</span></li>
+<li class="list-head-goodies"><a href="#smartquotes">SMARTQUOTES</a> <span class="normal-smaller">&ndash; convert typewriter doublequotes to proper doublequotes</span></li>
+<li class="list-head-goodies"><a href="#caps">CAPS</a> <span class="normal-smaller">&ndash; convert to upper case</span></li>
+<li class="list-head-goodies"><a href="#string">STRING</a> <span class="normal-smaller">&ndash; user-definable strings</span></li>
+<li class="list-head-goodies"><a href="#esc-char">ESC_CHAR</a> <span class="normal-smaller">&ndash; change the escape character to something other than a backslash</span></li>
+<li class="list-head-goodies"><a href="#sizespecs">SIZESPECS</a> <span class="normal-smaller">&ndash; get cap-height, x-height and descender depth of a font</span></li>
+<li class="list-head-goodies no-anchor"><span style="font-size: 90%;">Underscoring/underlining</span>
+<ul class="sublist">
+  <li class="list-head-goodies text-color"><a href="#underscore">UNDERSCORE</a> <span class="normal-smaller">&ndash; single underscore</span>
+  <ul class="sublist sub">
+    <li class="list-head-goodies text-color"><a href="#underscore-weight">Controlling the weight of underscores</a></li>
+    <li class="list-head-goodies text-color"><a href="#underscore-color">Colorizing underscores</a></li>
+  </ul></li>
+  <li class="list-head-goodies text-color"><a href="#underscore2">UNDERSCORE2</a> <span class="normal-smaller">&ndash; double underscore</span></li>
+  <li class="list-head-goodies text-color"><a href="#underline">UNDERLINE</a>
+  <ul class="sublist sub">
+    <li class="list-head-goodies text-color"><a href="#ul">\*[UL]</a> <span class="normal-sub-sub">&ndash; inline escape to underline</span></li>
+  </ul></li>
+</ul></li>
+<li class="list-head-goodies no-anchor"><span style="font-size: 90%;">Padding</span>
+<ul class="sublist">
+  <li class="list-head-goodies text-color"><a href="#pad">PAD</a> <span class="normal-smaller">&ndash; insert equalized space into lines</span>
+  <ul class="sublist sub">
+    <li class="list-head-goodies text-color"><a href="#pad-marker">PAD_MARKER</a> <span class="normal-sub-sub">&ndash; change/set the marker used with PAD</span></li>
+  </ul></li>
+</ul></li>
 </ul>
+</div>
+<div class="mini-toc-col-2">
+<ul class="no-enumerator">
+<li class="list-head-goodies no-anchor"><span style="font-size: 90%;">Leaders</span>
+<ul class="sublist">
+  <li class="list-head-goodies text-color"><a href="#leader">\*[LEADER]</a> <span class="normal-smaller">&ndash; inline escape to add leaders to a line</span></li>
+  <li class="list-head-goodies text-color"><a href="#leader-character">LEADER_CHARACTER</a> <span class="normal-smaller">&ndash; change/set the leader character</span></li>
+</ul></li>
+<li class="list-head-goodies no-anchor"><span style="font-size: 90%;">Drop caps</span>
+<ul class="sublist">
+  <li class="list-head-goodies text-color"><a href="#dropcap">DROPCAP</a> <span class="normal-smaller">&ndash; set a drop cap</span></li>
+  <li class="list-head-goodies text-color" style="list-style-type: none;"><a href="#dropcap-support"><span class="normal-smaller" style="font-weight: bold;">Support macros for DROPCAP</span></a>
+  <ul class="sublist sub">
+    <li class="list-head-goodies text-color"><a href="#dropcap-family">DROPCAP_FAMILY</a> <span class="normal-sub-sub">&ndash; change drop cap family</span></li>
+    <li class="list-head-goodies text-color"><a href="#dropcap-font">DROPCAP_FONT</a> <span class="normal-sub-sub">&ndash; change drop cap font</span></li>
+    <li class="list-head-goodies text-color"><a href="#dropcap-adjust">DROPCAP_ADJUST</a> <span class="normal-sub-sub">&ndash; alter size of drop cap</span></li>
+    <li class="list-head-goodies text-color"><a href="#dropcap-color">DROPCAP_COLOR</a> <span class="normal-sub-sub">&ndash; change colour of drop cap</span></li>
+    <li class="list-head-goodies text-color"><a href="#dropcap-gutter">DROPCAP_GUTTER</a> <span class="normal-sub-sub">&ndash; change space between drop cap and running text</span></li>
+  </ul></li>
+</ul></li>
+<li class="list-head-goodies text-color no-anchor"><span style="font-size: 90%;">Superscripts</span>
+<ul class="sublist">
+  <li class="list-head-goodies text-color"><a href="#sup">\*[SUP]</a> <span class="normal-smaller">&ndash; inline escape to set superscripts</span>
+  <ul class="sublist sub">
+    <li class="list-head-goodies text-color"><a href="#sup-raise">SUPERSCRIPT_RAISE_AMOUNT</a> <span class="normal-sub-sub">(control superscript raise amount</span></li>
+    <li class="list-head-goodies text-color"><a href="#cond-or-ext-sup">\*[CONDSUP]</a> <span class="normal-sub-sub">&ndash; condensed superscripts</span></li>
+    <li class="list-head-goodies text-color"><a href="#cond-or-ext-sup">\*[EXTSUP]</a> <span class="normal-sub-sub">&ndash; extended superscripts</span></li>
+  </ul></li>
+</ul></li>
+</ul>
+</div>
+</div>
 
-<!-- -ALIAS- -->
+<div class="rule-medium" style="padding-bottom: 1em;"><hr/></div>
 
-<hr width="66%" align="left"/>
+<!-- -ALIAS- -->
 
-<a name="ALIAS"><h3><u>Rename macros</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="alias" class="macro-id">Rename macros</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>ALIAS</b> <kbd class="macro-args">&lt;new name&gt; &lt;old name&gt;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>ALIAS</strong> <kbd>&lt;new name&gt; &lt;old name&gt;</kbd></nobr>
-</p>
-
-<p>
-The <strong>ALIAS</strong> macro may well be your best friend.
-With it, you can change the name of a macro to anything you
-like (provided the new name is not already being used by
-<strong>mom</strong>; see the
-<a href="reserved.html#RESERVED">list of reserved words</a>).
+The ALIAS macro may well be your best friend.  With it, you can
+change the name of a macro to anything you like (provided the new
+name is not already being used by mom; see the
+<a href="reserved.html#reserved">list of reserved words</a>).
 </p>
 
 <p>
 Groff has always been a bit intimidating for new users because
-its standard macro packages use very terse macro names.
-<strong>Mom</strong> doesn't like people to feel intimidated;
-she wants them to feel welcome.  Consequently, she tries
-for easy-to-grasp, self-explanatory macro names.  However,
-<strong>mom</strong> knows that people have their own ways of
-thinking, their own preferences, their own habits.  Some of her
-macro names may not suit you; they might be too long, or aren't what
-you automatically think of when you want to do a particular thing,
-or might conflict with habits you've developed over the years.
-</p>
-
-<p>
-If you don't like one of <strong>mom</strong>'s macro names,
-say, PAGEWIDTH, change it, like this:
-
-<pre>
-    .ALIAS PW PAGEWIDTH
-           |      |
-      new__|      |__official
-     name            name
-</pre>
+its standard macro packages use very terse macro names.  Mom
+doesn&#8217;t like people to feel intimidated; she wants them
+to feel welcome.  Consequently, she tries for easy-to-grasp,
+self-explanatory macro names.  However, mom knows that people have
+their own ways of thinking, their own preferences, their own habits.
+Some of her macro names may not suit you; they might be too long,
+or aren&#8217;t what you automatically think of when you want to
+do a particular thing, or might conflict with habits you&#8217;ve
+developed over the years.
 </p>
 
 <p>
-The first argument to <strong>ALIAS</strong> is the new name you
-want for a macro.  The second is the &quot;official&quot; name by
-which the macro is normally invoked.  After <strong>ALIAS</strong>,
-either can be used.
-</p>
-
-<p>
-Note that in <strong>ALIAS</strong>, you do NOT include the period
-(dot) that precedes the macro when it's a
-<a href="definitions.html#TERMS_CONTROLLINES">control line</a>.
+If you don&#8217;t like one of mom&#8217;s macro names, say,
+PAGEWIDTH, change it, like this:
+<br/>
+<span class="pre-in-pp">
+  .ALIAS PW PAGEWIDTH
+         |      |
+    new--+      +--official
+    name             name
+</span>
+The first argument to ALIAS is the new name you want for a macro.
+The second is the &#8220;official&#8221; name by which the macro is
+normally invoked.  After ALIAS, either can be used.
 </p>
 
 <p>
-<strong>NOTE:</strong> If you use <strong>ALIAS</strong> a lot, and
-always for the same things, consider creating an aliases file of the
-form
-
-<pre>
-    .ALIAS &lt;new name&gt; &lt;old name&gt;
-    .ALIAS &lt;new name&gt; &lt;old name&gt;
-    .ALIAS &lt;new name&gt; &lt;old name&gt;
-    ...etc
-</pre>
-
+Note that in ALIAS, you do NOT include the period (dot) that
+precedes the macro when it&#8217;s a
+<a href="definitions.html#controllines">control line</a>.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+A particularly good candidate for ALIAS is the macro,
+<a href="typesetting.html#ps">PT_SIZE</a>.
+A more natural name for it (at least to old-school phototypesetters)
+would simply be PS, but PS conflicts with the <b>eqn</b> equation
+preprocessor and thus mom uses the longer form.  However, if
+you&#8217;re not using <b>eqn</b>, you can happily rename PT_SIZE to
+PS:
+<br/>
+<span class="pre-in-pp">
+  .ALIAS PS PT_SIZE
+</span>
+</p>
+</div>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you use ALIAS a lot, and always for the same things, consider
+creating an aliases file of the form
+<br/>
+<span class="pre-in-pp">
+  .ALIAS &lt;new name&gt; &lt;old name&gt;
+  .ALIAS &lt;new name&gt; &lt;old name&gt;
+  .ALIAS &lt;new name&gt; &lt;old name&gt;
+  ...etc
+</span>
 Put the file someplace convenient and source it (include it) at the
 beginning of your documents with the
-<a href="docprocessing.html#INCLUDE">INCLUDE</a>
-macro.  Assuming that you've created an aliases file
-called <kbd>mom_aliases</kbd> in your home directory under
-a directory called <kbd>Mom</kbd>, you'd source it by placing
-
-<pre>
-    .INCLUDE /home/&lt;username&gt;/Mom/mom_aliases
-</pre>
-
+<a href="docprocessing.html#include">INCLUDE</a>
+macro.  Assuming that you&#8217;ve created an aliases file called
+<b>mom-aliases</b> in your home directory under a directory called
+<b>Mom</b>, you&#8217;d source it by placing
+<br/>
+<span class="pre-in-pp">
+  .INCLUDE /home/&lt;username&gt;/Mom/mom-aliases
+</span>
 at the top of your documents.
 </p>
 
-<p>
+<p class="tip-bottom">
 If you share documents that make use of an alias file, remember that
-other people don't have the file!  Paste the whole thing at the top
-of your documents, please.
+other people don&#8217;t have the file.  Paste the whole thing at
+the top of your documents, please.
 </p>
+</div>
 
-<p>
-<strong>EXPERTS:</strong> <strong>ALIAS</strong> is an alias
-of <kbd>.als</kbd>.  You can use either, or mix 'n' match with
-impunity.
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span>
+ALIAS is an alias of <kbd>.als</kbd>.  You can use either, or mix
+'n' match with impunity.
 </p>
+</div>
 
-<!-- -SILENT- -->
-
-<hr width="33%" align="left"/>
+<!-- -SILENT- --> 
+<div class="macro-id-overline">
+<h3 id="silent" class="macro-id">Hide input lines from output</h3>
+</div>
 
-<a name="SILENT"><h3><u>Hide input lines from output</u></h3></a>
+<div class="box-macro-args">
+ Macro: <b>SILENT</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>SILENT</strong> <kbd>toggle</kbd></nobr>
-<br/>
-
-Alias: <strong>COMMENT</strong>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>COMMENT</b>
 </p>
 
 <p>
-Sometimes, you want to &quot;hide&quot;
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
+Sometimes, you want to &#8220;hide&#8221;
+<a href="definitions.html#inputline">input lines</a>
 from final output.  This is most likely to be the case when setting
 up string tabs (see the
-<a href="typesetting.html#STRING_TABS_TUT">quickie tutorial on string tabs</a>
-for an example), but there are other places where you might want input
-lines to be invisible as well.  Any place you don't want input lines
-to appear in the output, use the <strong>SILENT</strong> macro.
+<a href="typesetting.html#string-tabs-tut">quickie tutorial on string tabs</a>
+for an example), but there are other places where you might want
+input lines to be invisible as well.  Any place you don&#8217;t want
+input lines to appear in the output, use the SILENT macro.
 </p>
 
 <p>
-<strong>SILENT</strong> is a toggle.  Invoking it without an argument
-turns it on; any argument turns it off.  E.g.,
-
-<pre>
-    .SILENT
-    A line of text
-    .SILENT OFF
-</pre>
-</p>
-
-<p>
-The line &quot;A line of text&quot; will not appear in the
+SILENT is a toggle.  Invoking it without an argument turns it on;
+any argument turns it off.  E.g.,
+<br/>
+<span class="pre-in-pp">
+  .SILENT
+  A line of text
+  .SILENT OFF
+</span>
+The line &#8220;A line of text&#8221; will not appear in the
 output copy.
 </p>
 
 <p>
-<strong>SILENT</strong> is aliased as <strong>COMMENT</strong>.
-If you want to insert non-printing comments into your documents,
-you may prefer this.
+SILENT is aliased as COMMENT.  If you want to insert non-printing
+comments into your documents, you may prefer this.
 </p>
 
-<p>
-<strong>NOTE: SILENT</strong> does not automatically break an
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+SILENT does not automatically break an
+<a href="definitions.html#inputline">input line</a>
 (see
-<a href="typesetting.html#BR">BR</a>)
-when you're in one of the
-<a href="definitions.html#TERMS_FILLED">fill modes</a>
-(<a href="typesetting.html#JUSTIFY">JUSTIFY</a>
+<a href="typesetting.html#br">BR</a>)
+when you&#8217;re in one of the
+<a href="definitions.html#filled">fill modes</a>
+(<a href="typesetting.html#justify">JUSTIFY</a>
 or
-<a href="typesetting.html#QUAD">QUAD L | R | C | J</a>).
+<a href="typesetting.html#quad">QUAD L | R | C | J</a>).
 The same applies to tabs
-(<a href="typesetting.html#TAB_SET">typesetting</a>
+(<a href="typesetting.html#tab-set">typesetting</a>
 or
-<a href="typesetting.html#ST">string</a>)
-to which you've passed the <strong>J</strong> or
-<strong>QUAD</strong> argument.  You must insert <kbd>.BR</kbd>
-yourself, or risk a portion of your text disappearing into a black
-hole.
+<a href="typesetting.html#st">string</a>)
+to which you&#8217;ve passed the J or QUAD argument.  You must
+insert <kbd>.BR</kbd> yourself, or risk a portion of your text
+disappearing into a black hole.
 </p>
+</div>
 
 <!-- -TRAP- -->
 
-<hr width="33%" align="left"/>
-
-<a name="TRAP"><h3><u>Suspend/re-invoke traps</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>TRAP</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="trap" class="macro-id">Suspend/re-invoke traps</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TRAP</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 Traps are vertical positions on the output page at which you or
-<strong>mom</strong> have instructed groff to start doing something
-automatically.  Commonly, this is near the bottom of the page, where
-automatic behind-the-scenes processing is needed in order for one
-page to finish and another to start.
+mom have instructed groff to start doing something automatically.
+Commonly, this is near the bottom of the page, where automatic
+behind-the-scenes processing is needed in order for one page to
+finish and another to start.
 </p>
 
 <p>
-Sometimes, traps get sprung when you don't want them.  If this
+Sometimes, traps get sprung when you don&#8217;t want them.  If this
 happens, surround just the offending macros and input lines with
-
-<pre>
+<br/>
+<span class="pre-in-pp">
     .TRAP OFF
     ...
     .TRAP
-</pre>
-</p>
-
-<p>
-<strong>TRAP</strong> is a toggle, therefore any argument 
-turns it off (i.e. suspends the trap), and no argument turns it
-(back) on.
+</span>
+TRAP is a toggle, therefore any argument turns it off (i.e. suspends
+the trap), and no argument turns it (back) on.
 </p>
 
 <!-- -SMARTQUOTES- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SMARTQUOTES"><h3><u>Convert typewriter doublequotes to proper doublequotes</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>SMARTQUOTES</strong> <kbd>[&lt;off&gt;] [ ,, | &gt;&gt; | &lt;&lt; ]</kbd></nobr>
-<br/>
-
-or
-<br/>
-
-<nobr>Macro: <strong>SMARTQUOTES</strong> <kbd>DA | DE | ES | FR | IT | NL | NO | PT | SV</kbd></nobr>
-</p>
-
-<p>
-If you invoke <strong>SMARTQUOTES</strong> without an argument,
-<strong>mom</strong> converts all instances of the inch-mark,
-(<kbd>"</kbd> &mdash; also called a &quot;doublequote&quot;), into
-the appropriate instances of true Anglo-American open-and
-close-doublequotes.  (See
-<a href="#SQ_INTERNATIONAL">Internationalization</a>
+<div class="macro-id-overline">
+<h3 id="smartquotes" class="macro-id">Convert typewriter doublequotes to proper doublequotes</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SMARTQUOTES</b> <kbd class="macro-args">[&lt;off&gt;] [ ,, | &gt;&gt; | &lt;&lt; ]</kbd>
+</div>
+
+<span style="margin-left: .5em">or</span>
+
+<div class="box-macro-args">
+Macro: <b>SMARTQUOTES</b> <kbd class="macro-args">DA | DE | ES | FR | IT | NL | NO | PT | SV</kbd>
+</div>
+
+<p>
+If you invoke SMARTQUOTES without an argument, mom converts all
+instances of the inch-mark, (<kbd>"</kbd>), also called
+a doublequote, into the appropriate instances of true Anglo-American
+open-and close-doublequotes.  (See
+<a href="#sq-international">Internationalization</a>
 for how to get SMARTQUOTES to behave correctly for non-English
 quoting styles.)
 </p>
 
 <p>
 Typographically, there is a difference between the inch-mark and
-doublequotes &mdash; a BIG difference.  Sadly, typewriters and computer
+quotation marks&mdash;a BIG difference.  Sadly, typewriters and computer
 keyboards supply only one: the inch-mark.  While using inches for
 doublequotes is, and always has been, acceptable in typewriter-style
 copy, it has never been, and, God willing, never will be acceptable in
 typeset copy.  Failure to turn inches into quotes is the first thing
 a professional typesetter notices in documents prepared by amateurs.
-And you don't want to look like an amateur, do you?
-</p>
-
-<a name="SQ_INTERNATIONAL"><h3><u>Internationalization</u></h3></a>
-
-<p>
-If you invoke <strong>SMARTQUOTES</strong> with one of the
-optional arguments (<kbd>,,</kbd> or <kbd>&gt;&gt;</kbd>
-or <kbd>&lt;&lt;</kbd>) you can use <kbd>&quot;</kbd> as
-&quot;cheap&quot; open-and close-quotes when inputting text in a
-language other than English, and have <strong>mom</strong> convert
-them, on output, into the chosen open-and close-quote style.
-</p>
-
-<p>
-<kbd>,,</kbd> opens quotes with &quot;lowered doublequotes&quot; and
-closes them with &quot;raised doublequotes&quot;, as in this ascii
-approximation:
-
-<pre>
-    ,,Hilfe !``
-</pre>
-
-<kbd>&gt;&gt;</kbd> opens quotes with guillemets pointing to the
-right, and closes them with guillemets pointing to the left, as in
-this ascii approximation:
-
-<pre>
-    &gt;&gt;Zurück !&lt;&lt;
-</pre>
+And you don&#8217;t want to look like an amateur, do you?
 </p>
 
+<h3 id="sq-international" class="docs">Internationalization</h3>
 <p>
-<kbd>&lt;&lt;</kbd> opens quotes with guillemets pointing to the
-left, and closes them with guillemets pointing to the right, as in
-this ascii approximation:
-
-<pre>
-    &lt;&lt;Mais monsieur! Je ne suis pas ce genre de fille!&gt;&gt;
-</pre>
+If you invoke SMARTQUOTES with one of the optional arguments
+(<kbd>,,</kbd> or <kbd>&gt;&gt;</kbd>
+or <kbd>&lt;&lt;</kbd>) you can use
+<kbd>&quot;</kbd> (i.e. the inch-mark/doublequotes key)
+as &#8220;cheap&#8221; open-and close-quotes when inputting text in
+a language other than English, and have mom convert them, on output,
+into the chosen open-and close-quote style.
 </p>
 
 <p>
-Please note: the above arguments to <strong>SMARTQUOTES</strong>
-are literal ASCII characters. <kbd>,,</kbd> is two commas,
-<kbd>&lt;&lt;</kbd> is two less-than signs and <kbd>&gt;&gt;</kbd>
-is two greater-than signs.
+<kbd>,,</kbd> opens quotes with &#8220;lowered
+doublequotes&#8221; and closes them with &#8220;raised
+doublequotes&#8221;, as in this ascii approximation:
+<br/>
+<span class="pre-in-pp">
+  ,,Hilfe !``
+</span>
+
+<kbd>&gt;&gt;</kbd> opens quotes with guillemets
+pointing to the right, and closes them with guillemets pointing to
+the left, as in this ascii approximation:
+<br/>
+<span class="pre-in-pp">
+  &gt;&gt;Zurück !&lt;&lt;
+</span>
+<kbd>&lt;&lt;</kbd> opens quotes with guillemets
+pointing to the left, and closes them with guillemets pointing to
+the right, as in this ascii approximation:
+<br/>
+<span class="pre-in-pp">
+  &lt;&lt;Mais monsieur! Je ne suis pas ce genre de fille!&gt;&gt;
+</span>
+Please note: the above arguments to SMARTQUOTES are literal
+ASCII characters. <kbd>,,</kbd> is two commas;
+<kbd>&lt;&lt;</kbd> is two less-than signs;
+<kbd>&gt;&gt;</kbd> is two greater-than signs.
 </p>
 
 <p>
-Alternatively, you can pass <strong>SMARTQUOTES</strong> the
-two-letter, ISO 639 abbreviation for the language you're writing in,
-and <strong>mom</strong> will output the correct quotes.
-
-<pre>
-    .SMARTQUOTES DA     = Danish      &gt;&gt;text&lt;&lt;
-    .SMARTQUOTES DE     = German      ,,text``
-    .SMARTQUOTES ES     = Spanish     ``text´´
-    .SMARTQUOTES FR     = French      &lt;&lt; text &gt;&gt;
-    .SMARTQUOTES IT     = Italian     &lt;&lt; text &gt;&gt;
-    .SMARTQUOTES NL     = Dutch       ´´text´´
-    .SMARTQUOTES NO     = Norwegian   &lt;&lt;text&gt;&gt;
-    .SMARTQUOTES PT     = Portuguese  &lt;&lt;text&gt;&gt;
-    .SMARTQUOTES SV     = Swedish     &gt;&gt;text&gt;&gt;
-</pre>
+Alternatively, you can pass SMARTQUOTES the two-letter, ISO 639
+abbreviation for the language you&#8217;re writing in, and mom will
+output the correct quotes.
+<br/>
+<span class="pre-in-pp">
+  .SMARTQUOTES DA     = Danish      &gt;&gt;text&lt;&lt;
+  .SMARTQUOTES DE     = German      ,,text``
+  .SMARTQUOTES ES     = Spanish     ``text´´
+  .SMARTQUOTES FR     = French      &lt;&lt; text &gt;&gt;
+  .SMARTQUOTES IT     = Italian     &lt;&lt; text &gt;&gt;
+  .SMARTQUOTES NL     = Dutch       ´´text´´
+  .SMARTQUOTES NO     = Norwegian   &lt;&lt;text&gt;&gt;
+  .SMARTQUOTES PT     = Portuguese  &lt;&lt;text&gt;&gt;
+  .SMARTQUOTES SV     = Swedish     &gt;&gt;text&gt;&gt;
+</span>
 </p>
 
 <p>
-Turn <strong>SMARTQUOTES</strong> off by passing it any argument
-<em>not</em> in the argument list (e.g. <strong>OFF</strong>,
-<strong>QUIT</strong>, <strong>X</strong>, etc.)
+Turn SMARTQUOTES off by passing it any argument not in the argument
+list (e.g. OFF, QUIT, X, etc.)
 </p>
 
 <p>
-If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>,
-<strong>SMARTQUOTES</strong> is on by default (in the Anglo-American
-style); with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-it's off by default (and should probably stay that way).
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPESET</a>,
+SMARTQUOTES is on by default (in the Anglo-American style); with
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+it&#8217;s off by default (and should probably stay that way).
 </p>
 
 <p>
-Finally, if you're fussy about the kerning of quote marks in
+Finally, if you&#8217;re fussy about the kerning of quote marks in
 relation to the text they surround, or have special quoting needs,
-you have to enter quote marks by hand using groff's native
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-for special characters (see <kbd>man groff_char</kbd> for a complete
-list of special characters).  Entering quote marks this way allows
-you to use <strong>mom</strong>'s
-<a href="inlines.html#INLINE_KERNING_MOM">inline kerning escapes</a>
+you have to enter quote marks by hand using groff&#8217;s native
+<a href="definitions.html#inlines">inline escapes</a>
+for special characters (see <kbd>man groff-char</kbd>
+for a complete list of special characters).  Entering quote marks
+this way allows you to use mom&#8217;s
+<a href="inlines.html#inline-kerning-mom">inline kerning escapes</a>
 to fine-tune the look of quotes.
 </p>
 
-<p>
-<strong>NOTE:</strong> <strong>SMARTQUOTES</strong> does not work on
-single quotes, which most people input with the apostrophe (found
-at the right-hand end of the &quot;home row&quot; on a QWERTY
-keyboard).  Groff will interpret all instances of the apostrophe as
-an apostrophe, making the symbol useless as an open-single-quote.
-For open single quotes, input the backtick character typically
-found under the tilde on most keyboards.  (Pour nous autres,
-&quot;backtick&quot; veut dire l'accent grave.)  Here's an example
-of correct input copy with single quotes:
-
-<pre>
-    "But she said, `I don't want to!'"    
-</pre>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+SMARTQUOTES does not work on single quotes, which most people
+input with the apostrophe (found at the right-hand end of the
+&#8220;home row&#8221; on a QWERTY keyboard).  Groff will interpret
+all instances of the apostrophe as an apostrophe, making the symbol
+useless as an open-single-quote.  For open single quotes, input
+the backtick character typically found under the tilde on most
+keyboards.  (Pour nous autres, &#8220;backtick&#8221; veut dire
+l&#8217;accent grave.)  Here&#8217;s an example of correct input
+copy with single quotes:
+<br/>
+<span class="pre-in-pp">
+  "But she said, `I don&#8217;t want to!'"    
+</span>
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Whether or not you have
-<strong>SMARTQUOTES</strong> turned on, get into the habit of
+<p class="tip-bottom" style="margin-top: -1em;">
+<span class="additional-note">Additional note:</span>
+Whether or not you have SMARTQUOTES turned on, get into the habit of
 entering the foot-and inch-marks, when you need them, with the
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-<kbd>\*[FOOT]</kbd> and <kbd>\*[INCH]</kbd>, instead of <kbd>'</kbd>
-and <kbd>"</kbd>.
+<a href="definitions.html#inlines">inline escapes</a>
+<kbd>\*[FOOT]</kbd> and
+<kbd>\*[INCH]</kbd>, instead of
+<kbd>'</kbd> and <kbd>"</kbd>.
 </p>
+</div>
 
 <!-- -CAPS- -->
 
-<hr width="33%" align="left"/>
-
-<a name="CAPS"><h3><u>Convert to upper case</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>CAPS</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="caps" class="macro-id">Convert to upper case</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>CAPS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<strong>CAPS</strong> converts all lower case letters to upper case.
-Primarily, it's a support macro used by the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>,
-but you may find it helpful on occasion. <strong>CAPS</strong> is
-a toggle, therefore no argument turns it on, any argument
-(<strong>OFF, QUIT, X,</strong> etc.) turns it
-off.
-
-<pre>
-    .CAPS
-    All work and no play makes Jack a dull boy.
-    .CAPS OFF
-</pre>
+CAPS converts all lower case letters to upper case.
+Primarily, it&#8217;s a support macro used by the
+<a href="docprocessing.html#docprocessing">document processing macros</a>,
+but you may find it helpful on occasion. CAPS is a toggle, therefore
+no argument turns it on, any argument (OFF, QUIT, X, etc.) turns
+it off.
+<br/>
+<span class="pre-in-pp">
+  .CAPS
+  All work and no play makes Jack a dull boy.
+  .CAPS OFF
+</span>
 
 produces, on output
-
-<pre>
-    ALL WORK AND NO PLAY MAKES JACK A DULL BOY.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  ALL WORK AND NO PLAY MAKES JACK A DULL BOY.
+</span>
 If you wish to capitalise a section of type inline, use the
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
-<a href="inlines.html#UC_LC"><kbd>\*[UC]...\*[LC]</kbd></a>
+<a href="definitions.html#inlines">inline escapes</a>,
+<a href="inlines.html#uc-lc"><kbd>\*[UC]...\*[LC]</kbd></a>
 like this:
-
-<pre>
-    All work \*[UC]and\*[LC] no play makes Jack a dull boy.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  All work \*[UC]and\*[LC] no play makes Jack a dull boy.
+</span>
 
 The above produces, on output
-
-<pre>
-    All work AND no play makes Jack a dull boy.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  All work AND no play makes Jack a dull boy.
+</span>
 </p>
 
 <!-- -STRING- -->
 
-<hr width="33%" align="left"/>
-
-<a name="STRING"><h3><u>User-defined strings</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>STRING</strong> <kbd>&lt;name&gt; &lt;what you want in the string&gt;</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="string" class="macro-id">User-defined strings</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>STRING</b> <kbd class="macro-args">&lt;name&gt; &lt;what you want in the string&gt;</kbd>
+</div>
 
 <p>
 You may find sometimes that you have to type out portions of text
-repeatedly.  If you'd like not to wear out your fingers, you can
-define a &quot;string&quot; that, whenever you call it by name,
-outputs whatever you put into it.
+repeatedly.  If you&#8217;d like not to wear out your fingers, you can
+define a string that, whenever you call it by name, outputs whatever
+you put into it.
 </p>
 
 <p>
-For example, say you're creating a document that repeatedly uses
-the phrase &quot;the Montreal/Windsor corridor&quot;.  Instead of
-typing all that out every time, you could define a string, like
+For example, say you&#8217;re creating a document that repeatedly uses
+the phrase &#8220;the Montreal/Windsor corridor&#8221;.  Instead
+of typing all that out every time, you could define a string, like
 this:
-
-<pre>
-    .STRING mw the Montreal/Windsor corridor
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .STRING mw the Montreal/Windsor corridor
+</span>
 Once a string is defined, you can call it any time with the
-<a href="definitions.html#INLINES">inline escape</a>
-<kbd>\*[&lt;stringname&gt;]</kbd>.  Using the example string above
-
-<pre>
-    The schedule for trains along \*[mw]:
-</pre>
-
+<a href="definitions.html#inlines">inline escape</a>
+<kbd>\*[&lt;stringname&gt;]</kbd>.  Using the example
+string above
+<br/>
+<span class="pre-in-pp">
+  The schedule for trains along \*[mw]:
+</span>
 produces, on output
-
-<pre>
-    The schedule for trains along the Montreal/Windsor corridor:
-</pre>
-</p>
-
-<p>
-<strong>NOTE:</strong> Be very careful not to put any spaces at the
-ends of strings you're defining, unless you want them.  Everything
-after the name argument you pass to <strong>STRING</strong> goes
-into the string, including trailing spaces.
+<br/>
+<span class="pre-in-pp">
+  The schedule for trains along the Montreal/Windsor corridor:
+</span>
 </p>
 
-<p>
-<strong>Experts: STRING</strong> is an alias for <strong>ds</strong>.
-You can use either, or mix 'n' match with impunity.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Be very careful not to put any spaces at the ends of strings
+you&#8217;re defining, unless you want them.  Everything after
+the name argument you pass to STRING goes into the string,
+including trailing spaces.  It&#8217;s a good idea to get into the
+habit of using groff&#8217;s native commenting mechanism, <kbd
+class="bold">\"</kbd>, immediately following any string definition
+in order to avoid spaces you can&#8217;t see, like this
+<br/>
+<span class="pre-in-pp">
+  .STRING mw the Montreal/Windsor corridor\"
+</span>
+</p>
+</div>
+
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span>
+STRING is an alias for
+<b>ds</b>.  You can use either, or mix 'n' match with impunity.
 </p>
+</div>
 
 <!-- -ESC_CHAR- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="esc-char" class="macro-id">Change the escape character</h3>
+</div>
 
-<a name="ESC_CHAR"><h3><u>Change the escape character</u></h3></a>
+<div class="box-macro-args">
+Macro: <b>ESC_CHAR</b> <kbd class="macro-args">&lt;new character&gt; | &lt;anything&gt;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>ESC_CHAR</strong> <kbd>&lt;new character&gt; | &lt;anything&gt;</kbd></nobr>
+Groff&#8217;s and mom&#8217;s default escape character is
+the backslash.  Sometimes, you may want to include a literal
+backslash in your document.  There are two ways to accomplish
+this.  One is simply to double the backslash character (<kbd
+class="bold">\\</kbd>), which is convenient if you don&#8217;t have
+a lot of backslashes to input.  If you need to input a whole batch
+of backslashes (say, when including code snippets in your document),
+you can use ESC_CHAR to make the change permanent (until you decide
+to restore the escape character to its default, the backslash).
 </p>
 
 <p>
-<strong>Groff</strong>'s and <strong>mom</strong>'s default escape
-character is the backslash.  Sometimes, you may want to include
-a literal backslash in your document.  There are two ways to
-accomplish this.  One is simply to double the backslash character
-<nobr>(<kbd>\\</kbd>),</nobr> which is convenient if you don't have a
-lot of backslashes to input.  If you need to input a whole batch of
-backslashes (say, when including code snippets in your document),
-you can use <strong>ESC_CHAR</strong> to make the change permanent
-(until you decide to restore the escape character to its default,
-the backslash).
+ESC_CHAR with a single character argument changes the escape
+character to whatever the argument is.  ESC_CHAR with no argument
+restores the escape character to the backslash.
 </p>
 
-<p>
-<strong>ESC_CHAR</strong> with a single character argument
-changes the escape character to whatever the argument is.
-<strong>ESC_CHAR</strong> with no argument restores the escape
-character to the backslash.
-</p>
 
-<p>
-<strong>Experts</strong>: <strong>ESC_CHAR</strong> is an alias of
-<kbd>.ec</kbd>.  Mix 'n' match the two with impunity.
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span>
+ESC_CHAR is an alias of <kbd>.ec</kbd>.  Mix 'n' match
+the two with impunity.
 </p>
+</div>
 
-<!-- -UNDERSCORE- -->
-
-<hr width="33%" align="left"/>
-
-<a name="UNDERSCORE"><h3><u>Single underscore</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>UNDERSCORE</strong> <kbd>[ &lt;distance below baseline&gt; ] &quot;&lt;string&gt;&quot;</kbd></nobr>
-<br/>
-
-<em>*Optional argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
+<!-- -SIZESPECS- -->
 
-<p>
-By default, <strong>UNDERSCORE</strong> places an underscore 2
-points beneath the required
-<a href="definitions.html#TERMS_STRINGARGUMENT">string argument</a>.
-The string must be enclosed in double-quotes, like this:
+<div class="macro-id-overline">
+<h3 id="sizespecs" class="macro-id">Get cap-height, x-height and descender depth of a font</h3>
+</div>
 
-<pre>
-    .UNDERSCORE "Unmonitored monopolies breed high prices and poor products."
-</pre>
-</p>
+<div class="box-macro-args">
+Macro: <b>SIZESPECS</b>
+</div>
 
 <p>
-If you wish to change the distance of the rule from the
-baseline, use the optional argument <kbd>&lt;distance below
-baseline&gt;</kbd> (with a unit of measure).
-
-<pre>
-    .UNDERSCORE 3p "Unmonitored monopolies breed high prices and poor products."
-</pre>
+Whenever you need to get the
+<a href="definitions.html#capheight">cap-height</a>,
+<a href="definitions.html#xheight">x-height</a>
+or
+<a href="definitions.html#descender">descender</a>
+depth of type at the current point size, invoke <kbd
+class="bold">.SIZESPECS</kbd>, which takes no argument.
+The dimensions are stored in the string registers
+<b>\*[$CAP_HEIGHT]</b>, <b>\*[$X_HEIGHT]</b> and
+<b>\*[$DESCENDER]</b>, respectively, in
+<a href="definitions.html#units">machine units</a>
+to which the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+<b>u</b>, is already appended.
 </p>
 
 <p>
-The above places upper edge of the underscore 3 points below the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>.
+Thus, if you wanted to advance 2 inches from your current position
+on the page plus the cap-height of the current point size of type
+<br/>
+<span class="pre-in-pp">
+  .PT_SIZE &lt;n&gt;
+  .SIZESPECS
+  .ALD 2i+\*[$CAP_HEIGHT]
+</span>
+would do the trick.
 </p>
 
-<a name="UNDERSCORE_WEIGHT"></a>
+<!-- -UNDERSCORE- -->
 
-<h4><u>Controlling the weight of underscores</u></h4>
+<div class="macro-id-overline">
+<h3 id="underscore" class="macro-id">Single underscore</h3>
+</div>
 
-<p>
-(Please note that <strong>UNDERSCORE_WEIGHT</strong> also sets the
-weight of
-<a href="#UNDERSCORE2">double underscores.</a>)
-</p>
+<div class="box-macro-args">
+Macro: <b>UNDERSCORE</b> <kbd class="macro-args">[ &lt;distance below baseline&gt; ] &quot;&lt;string&gt;&quot;</kbd>
+</div>
 
-<p>
-The weight (thickness) of underscores may be controlled with the
-macro, <strong>UNDERSCORE_WEIGHT</strong>.  Thus, if you want
-underscores with a weight of 1-1/2 points, you'd invoke:
-
-<pre>
-    .UNDERSCORE_WEIGHT 1.5
-</pre>
-
-prior to invoking <kbd>.UNDERSCORE</kbd>.  Every subsequent
-instance of <kbd>.UNDERSCORE</kbd> will use this weight.
+<p class="requires">
+&bull;&nbsp;Optional argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>Mom</strong>'s default underscore weight is 1/2 point.
+By default, UNDERSCORE places an underscore 2 points beneath the
+required
+<a href="definitions.html#stringargument">string argument</a>.
+The string must be enclosed in double-quotes, like this:
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE "Unmonitored monopolies breed high prices and poor products."&nbsp;
+</span>
+If you wish to change the distance of the rule from the baseline,
+use the optional argument
+<kbd>&lt;distance&nbsp;below&nbsp;baseline&gt;</kbd>
+(with a unit of measure).
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE 3p "Unmonitored monopolies breed high prices and poor products."&nbsp;
+</span>
+The above places upper edge of the underscore 3 points below the
+<a href="definitions.html#baseline">baseline</a>.
 </p>
 
-<a name="NOTES_UNDERSCORE"></a>
-
-<h4><u>NOTES:</u></h4>
-
-<p>
-<strong>UNDERSCORE</strong> does not work across line breaks in
-output copy, which is to say that you can't underscore a multi-line
-passage simply by putting the text of the whole thing in the string
-you pass to <strong>UNDERSCORE</strong>.  Each
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>
-or portion of an output line you want underscored must be plugged
-separately into <strong>UNDERSCORE</strong>.  Bear in mind, though,
-that underscoring should at best be an occasional effect in typeset
-copy.  If you want to emphasize an entire passage, it's much, much
-better to change fonts (e.g. to italic or bold).
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+UNDERSCORE does not work across line breaks in output copy, which is
+to say that you can&#8217;t underscore a multi-line passage simply
+by putting the text of the whole thing in the string you pass to
+UNDERSCORE.  If you need to several lines of type, use
+<a href="#underline">UNDERLINE</a>.
 </p>
+</div>
 
+<h3 id="underscore-weight" class="docs">Controlling the weight of underscores</h3>
 <p>
-You can easily and successfully underline entire passages in
-simulated typewriter-style copy (i.e. if your font is a monospaced
-one, like Courier, or you're using the document processing macro
-<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>),
-with the
-<a href="#UNDERLINE">UNDERLINE</a>
-macro. <strong>UNDERLINE</strong> is designed specifically for this
-purpose, but works only with the monspaced fonts.
+The weight (thickness) of underscores may be controlled with the
+macro, UNDERSCORE_WEIGHT.  Thus, if you want underscores with a
+weight of 1-1/2 points, you&#8217;d invoke:
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE_WEIGHT 1.5
+</span>
+prior to invoking <kbd>.UNDERSCORE</kbd>.  Every
+subsequent instance of <kbd>.UNDERSCORE</kbd> will use
+this weight.
 </p>
 
 <p>
-<strong>Mom</strong> doesn't always get the position and length
-of the underscore precisely right in
-<a href="definitions.html#TERMS_JUST">justified</a>
-copy, although she's fine with all the other
-<a href="definitions.html#TERMS_FILLED">fill modes</a>,
-as well as with the no-fill modes.  The reason is that when text is
-justified, the word spacing may expand to fill the line, but that
-doesn't happen until <em>after</em> the line has been processed
-in all other respects &mdash; including establishing how long to
-make an underscore.  A workaround is to prepend the backslash
-character <nobr>(<kbd>\</kbd>)</nobr> to each word space in the
-string passed to <strong>UNDERSCORE</strong>.  The word spacing of
-the underscored string <em>may</em> be slightly smaller than the
-word space of the remainder of the line, but in many cases, the
-difference isn't visually noticeable.
+Mom&#8217;s default underscore weight is 1/2 point.
 </p>
 
-<p>
-<strong>UNDERSCORE</strong> tends to confuse
-<strong>gxditview</strong>, even though the output, when
-printed, looks fine.  Generally, I recommend using <strong>gv</strong>
-to preview files anyway.  See the section on
-<a href="using.html#USING_PREVIEWING">previewing</a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+UNDERSCORE_WEIGHT also sets the weight of
+<a href="#UNDERSCORE2">double underscores.</a>
 </p>
+</div>
 
+<h3 id="underscore-color" class="docs">Colorizing underscored text</h3>
 <p>
-<a name="UNDERSCORE_COLOR"><strong>Colorizing underscored text:</strong></a>
 If you want underscored text to be in a different colour from the
 text around it, use the
-<a href="color.html#COLOR">COLOR</a>
+<a href="color.html#color">COLOR</a>
 macro, rather than the
-<a href="color.html#COLOR_INLINE">inline escape for changing color</a>.
+<a href="color.html#color-inline">inline escape for changing color</a>.
 In other words, assuming your prevailing text color is black and
 you want underscored text in red
-
-<pre>
-    .COLOR red
-    .UNDERSCORE "text to underscore"
-    .COLOR black
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .COLOR red
+  .UNDERSCORE "text to underscore"
+  .COLOR black
+</span>
 rather than
-
-<pre>
-    .UNDERSCORE "\*[red]text to underscore\*[black]"
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE "\*[red]text to underscore\*[black]"
+</span>
 The latter will render the text in red, and the underscore in black.
 You can use this to create truly rainbow effects if you want, e.g.
 text in red, underscore in blue, and prevailing type in black:
-
-<pre>
-    .UNDERSCORE "\*[red]text to underscore\*[blue]"
-    .COLOR black
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE "\*[red]text to underscore\*[blue]"
+  .COLOR black
+</span>
 </p>
 
 <!-- -UNDERSCORE2- -->
 
-<hr width="33%" align="left"/>
-
-<a name="UNDERSCORE2"><h3><u>Double underscore</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="underscore2" class="macro-id">Double underscore</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>UNDERSCORE2</strong> [ &lt;distance below baseline&gt; [ &lt;distance between rules&gt; ] ] &quot;&lt;string&gt;&quot;</nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>UNDERSCORE2</b> <kbd class="macro-args">[ &lt;distance below baseline&gt; [ &lt;distance between rules&gt; ] ] &quot;&lt;string&gt;&quot;</kbd>
+</div>
 
-<em>*Optional arguments require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<p class="requires">
+&bull;&nbsp;Optional arguments require a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-By default, <strong>UNDERSCORE2</strong> places a double underscore
-2 points beneath the required
-<a href="definitions.html#TERMS_STRINGARGUMENT">string argument</a>.
+By default, UNDERSCORE2 places a double underscore 2 points beneath
+the required
+<a href="definitions.html#stringargument">string argument</a>.
 The string must be enclosed in double-quotes, like this:
-
-<pre>
-    .UNDERSCORE2 "Unmonitored monopolies breed high prices and poor products."
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE2 "Unmonitored monopolies breed high prices and poor products."
+</span>
 The default distance between the two rules is 2 points, measured
 from the bottom edge of the upper rule to the top edge of the lower
 one.
 </p>
 
 <p>
-If you wish to change the distance of the double underscore from
-the baseline, use the optional argument <kbd>&lt;distance below
-baseline&gt;</kbd> (with a unit of measure), e.g.,
-
-<pre>
-    .UNDERSCORE2 3p "Unmonitored monopolies breed high prices and poor products."
-</pre>
-
+If you wish to change the distance of the double underscore from the
+<a href="definitions.html#baseline">baseline</a>,
+use the optional argument
+<kbd>&lt;distance&nbsp;below&nbsp;baseline&gt;</kbd>
+(with a unit of measure), e.g.,
+<br/>
+<span class="pre-in-pp">
+  .UNDERSCORE2 3p "Unmonitored monopolies breed high prices and poor products."
+</span>
 which places the upper edge of the first rule of the double
-underscore 3 points below the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>.
+underscore 3 points below the baseline.
 </p>
 
 <p>
-If you wish to change the distance between the two rules as
-well, use the second optional argument <kbd>&lt;distance between
-rules&gt;</kbd> (with a unit of measure).  Be aware that you must
-give a value for the first optional argument if you want to use the
-second.  The distance between the two rules is measured from the
-bottom edge of the upper rule to the top edge of the lower one.
+If you wish to change the distance between the two rules as well,
+use the second optional argument
+<kbd>&lt;distance&nbsp;between&nbsp;rules&gt;</kbd>
+(with a unit of measure).  Be aware that you must give a value for
+the first optional argument if you want to use the second.  The
+distance between the two rules is measured from the bottom edge of
+the upper rule to the top edge of the lower one.
 </p>
 
 <p>
 The weight (thickness) of double underscores may be controlled with
 the macro
-<a href="#UNDERSCORE_WEIGHT">UNDERSCORE_WEIGHT</a>
+<a href="#underscore-weight">UNDERSCORE_WEIGHT</a>
 (q.v).
 </p>
 
-<p>
-<strong>NOTE:</strong> the same restrictions and caveats apply
-to <strong>UNDERSCORE2</strong> as to
-<strong>UNDERSCORE</strong>.  See the
-<a href="#NOTES_UNDERSCORE">NOTES</a>
-for <strong>UNDERSCORE</strong>.
-</p>
+<!-- -UNDERLINE- --> 
+<div class="macro-id-overline">
+<h3 id="underline" class="macro-id">Underline</h3>
+</div>
 
-<!-- -UNDERLINE- -->
-
-<hr width="33%" align="left"/>
-
-<a name="UNDERLINE"><h3><u>Underline text &mdash; monospaced fonts only</u></h3></a>
+<div class="box-macro-args">
+Macro: <b>UNDERLINE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>UNDERLINE</strong> <kbd>toggle</kbd></nobr>
+The distinction between underscoring and underlining is that
+underscoring is suitable for occasional effects (a word here, a word
+there), whereas underlining underlines whole passages of type.
+Furthermore, you cannot colorize underlining, and there&#8217;s a
+special macro,
+<a href="#underline-specs">UNDERLINE_SPECS</a>,
+to control the weight and distance from the baseline of the
+underline.
 </p>
 
 <p>
-If your font is monospaced, like Courier, or you're using the
-document processing macro
-<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<strong>UNDERLINE</strong> allows you to underline words and
-passages that, in typeset copy, would be italicized.  You invoke
-<kbd>.UNDERLINE</kbd> as you do with all toggle macros &mdash; by
-itself (i.e. with no argument) to initiate underlining, and with any
-argument (<strong>OFF, QUIT, X,</strong> etc) to turn underlining
-off.
+UNDERLINE is a toggle macro, therefore you invoke it by itself (i.e.
+with no argument) to initiate underlining, and with any argument
+(<kbd>OFF, QUIT, X,</kbd> etc) to turn it off.
 </p>
 
-<p>
-When on, <strong>UNDERLINE</strong> underlines letters, words
-and numbers, but not punctuation or spaces.  This makes for more
-readable copy than a solid underline.
-</p>
-
-<p>
-<strong>NOTE:</strong> Underlining may also be turned on and off
-<a href="definitions.html#TERMS_INLINES">inline</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+Underlining may also be turned on and off
+<a href="definitions.html#inlines">inline</a>
 with the escapes
-<a href="#UL"><kbd>\*[UL]...\*[ULX]</kbd></a>.
+<kbd><a href="#ul">\*[UL]...\*[ULX]</a></kbd>.
 </p>
 
-<!-- -UL- -->
-
-<hr width="33%" align="left"/>
-
-<a name="UL"><h3><u>Inline escape for underlining &mdash; monospaced fonts only</u></h3></a>
-
-<p>
-Inline: <kbd>\*[UL]...\*[ULX]</kbd>
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+Neither <kbd>.UNDERLINE</kbd> nor <kbd>\*[UL]</kbd> persist past the
+current document element tag.  For example, if you turn underlining
+on in a paragraph
+(<kbd><a href="docelement.html#pp">.PP</a></kbd>),
+your next paragraph will not be underlined (nor your next head,
+subhead, etc), regardless of whether you explicitly turn underlining
+off.
 </p>
+</div>
 
-<p>
-If your font is a monospaced one, like Courier, or you're using the
-document processing macro
-<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<kbd>\*[UL]...\*[ULX]</kbd> underlines words and
-passages that, in typeset copy, would be italicized.
-</p>
+<h4 id="underline-specs" class="docs">UNDERLINE_SPECS</h4>
 
 <p>
-<kbd>\*[UL]</kbd> underlines all letters, words and numbers
-following it, but not punctuation or spaces.  This makes for more
-readable copy than a solid underline.  When you no longer want
-underlining, <kbd>\*[ULX]</kbd> turns underlining off.
+The weight of underlining and the distance from the baseline is
+set with
+<br/>
+<span class="pre-in-pp">
+  .UNDERLINE_SPECS &lt;weight&gt; &lt;distance&gt;
+</span>
+The <kbd>&lt;weight&gt;</kbd> argument can be expressed in any
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+you like, but points is the most usual.  Mom&#8217;s default is 1/2 point
+(.5p).  The same holds for the <kbd>&lt;distance&gt;</kbd> argument;
+mom&#8217;s default is 1-1/4 points (1.25p).
 </p>
 
-<p>
-The macro
-<a href="#UNDERLINE">UNDERLINE</a>
-and the inline escape <kbd>\*[UL]</kbd> are functionally
-identical, hence
+<!-- -UL- -->
 
-<pre>
-    .FAM     C
-    .FT      R
-    .PT_SIZE 12
-    .LS      24
-    .SS      0
-    .QUAD    LEFT
-    Which should I heed?
-    .UNDERLINE
-    Just do it
-    .UNDERLINE OFF
-    or
-    .UNDERLINE
-    just say no?
-    .UNDERLINE OFF
-</pre>
+<h4 id="ul" class="docs">INLINE ESCAPE FOR UNDERLINING</h4>
 
+<p>
+The macro pair,
+<kbd><a href="#underline">.UNDERLINE</a></kbd> /
+<kbd>.UNDERLINE&nbsp;OFF</kbd>, and the inline escapes,
+<kbd>\*[UL]</kbd> / <kbd>\*[ULX]</kbd>, are functionally identical,
+hence, in
+<a href="definitions.html#filled">fill</a>
+modes
+<br/>
+<span class="pre-in-pp">
+  Which should I heed?
+  .UNDERLINE
+  Just do it
+  .UNDERLINE OFF
+  or
+  .UNDERLINE
+  just say no?
+  .UNDERLINE OFF
+</span>
 produces the same result as
-
-<pre>
-    .FAM     C
-    .FT      R
-    .PT_SIZE 12
-    .LS      24
-    .SS      0
-    .QUAD    LEFT
-    Which should I heed? \*[UL]Just do it\*[ULX] or \*[UL]just say no?\*[ULX]
-</pre>
+<br/>
+<span class="pre-in-pp">
+  Which should I heed? \*[UL]Just do it\*[ULX] or \*[UL]just say no?\*[ULX]
+</span>
 </p>
 
 <!-- -PAD- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="pad" class="macro-id">Insert space into lines</h3>
+</div>
 
-<a name="PAD"><h3><u>Insert space into lines</u></h3></a>
+<div class="box-macro-args">
+Macro: <b>PAD</b> <kbd class="macro-args">&quot;&lt;string with pad markers inserted&gt;&quot; [ NOBREAK ]</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>PAD</strong> <kbd>&quot;&lt;string with pad markers inserted&gt;&quot; [ NOBREAK ]</kbd></nobr>
-</p>
-
-<p>
-With <strong>PAD</strong>, you can insert unspecified amounts of
-whitespace into a line.
-
-<a name="NOBREAK"></a>
-
-The optional <kbd>NOBREAK</kbd> argument tells <strong>mom</strong>
-not to advance on the page after the <strong>PAD</strong> macro has
-been invoked.
+With PAD, you can insert proportional amounts of whitespace into a
+line.  The optional <kbd id="nobreak" class="bold">NOBREAK</kbd>
+argument tells mom not to advance on the page after the PAD macro
+has been invoked.
 </p>
 
 <p>
-<strong>PAD</strong> calculates the difference between the length of
-text on the line and the distance remaining to its end, then inserts
-the difference (as whitespace) at the place(s) you specify.
+PAD calculates the difference between the length of text on the line
+and the distance remaining to its end, then inserts the difference
+(as whitespace) at the place(s) you specify.
 </p>
 
 <p>
 Take, for example, the following relatively common typesetting
 situation, found at the bottom of legal agreements:
-
-<pre>
-    Date             Signature                               |
-</pre>
+<br/>
+<span class="pre">
+  Date             Signature                               |
+</span>
 </p>
 
 <p>
 The person signing the agreement is supposed to fill in the date
-as well as a signature.  Space needs to be left for both, but
-the exact amount is neither known, nor important.  All that
-matters is that there be a little space after Date, and rather
-more space after Signature.  (In the above, | represents
-the end of the line at the prevailing line length.)
+as well as a signature.  Space needs to be left for both, but the
+exact amount is neither known, nor important.  All that matters is
+that there be a little space after Date, and rather more space after
+Signature.  (In the above, <kbd>|</kbd> represents the
+end of the line at the prevailing line length.)
 </p>
 
 <p>
 The
-<a href="goodies.html#PAD_MARKER">pad marker</a>
-(see below) is # (the pound or number sign on your keyboard) and can
-be used multiple times in a line.  With that in mind, here's how
-you'd input the Date/Signature line (assuming a length of 30 picas):
-
-<pre>
-    .LL 30P
-    .PAD "Date#Signature###"
-</pre>
+<a href="goodies.html#pad-marker">pad marker</a>
+(see below) is <kbd>#</kbd> (the pound or number sign
+on your keyboard) and can be used multiple times in a line.  With
+that in mind, here&#8217;s how you&#8217;d input the Date/Signature line
+(assuming a length of 30 picas):
+<br/>
+<span class="pre">
+  .LL 30P
+  .PAD "Date#Signature###"
+</span>
 </p>
 
 <p>
@@ -968,440 +969,420 @@
 remainder is inserted after Signature.
 </p>
 
-<a name="PAD_EXAMPLE"></a>
-
-<p>
-One rarely wants merely to insert space in a line; one usually
-wants to fill it with something, hence <strong>PAD</strong> is
-particularly useful in conjunction with
-<a href="typesetting.html#STRING_TABS">string tabs</a>.
-The following uses the Date/Signature example above, but adds
+<div class="examples-container">
+<h3 id="pad-example" class="docs notes">Example of PAD usage</h3>
+<p style="margin-top: .5em;">
+One rarely wants merely to insert space in a line; one usually wants
+to fill it with something, hence PAD is particularly useful in
+conjunction with
+<a href="typesetting.html#string-tabs">string tabs</a>.
+The following uses the Date/Signature example, above, but adds
 rules into the whitespace through the use of string tabs and
-<strong>mom</strong>'s
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<a href="inlines.html#INLINE_RULE_MOM"><kbd>\*[RULE]</kbd></a>.
-(Instead of <kbd>\*[RULE]</kbd>,
-groff's line drawing function,
-<a href="inlines.html#INLINE_LINEDRAWING_GROFF"><kbd>\l</kbd></a>
+mom&#8217;s
+<a href="definitions.html#inlines">inline escape</a>
+<kbd><a href="inlines.html#inline-rule-mom">\*[RULE]</a></kbd>.
+(Instead of <kbd>\*[RULE]</kbd>, groff&#8217;s line
+drawing function,
+<kbd><a href="inlines.html#inline-linedrawing-groff">\l'&lt;distance&gt;'</a></kbd>
 could be used.)
-
-<pre>
-    .LL 30P
-    .PAD "Date \*[ST1]#\*[ST1X] Signature \*[ST2]###\*[ST2X]" NOBREAK
-    .ST 1 J
-    .ST 2 J
-    .TAB 1
-    \*[RULE]
-    .TN
-    \*[RULE]
-    .TQ
-</pre>
-</p>
-
-<p>
-If you're not a typesetter, and if you're new to groff, the
-example probably looks like gibberish.  My apologies.  However,
-remember that typesetting is a craft, and without having studied
-the craft, it takes a while to grasp its concepts.
+<br/>
+<span class="pre-in-pp">
+  .LL 30P
+  .PAD "Date \*[ST1]#\*[ST1X] Signature \*[ST2]###\*[ST2X]" NOBREAK
+  .ST 1 J
+  .ST 2 J
+  .TAB 1
+  \*[RULE]
+  .TN
+  \*[RULE]
+  .TQ
+</span>
+If you&#8217;re not a typesetter, and if you&#8217;re new to groff,
+the example probably looks like gibberish.  My apologies.  However,
+remember that typesetting is a craft, and without having studied the
+craft, it takes a while to grasp its concepts.
 </p>
 
 <p>
 Basically, what the example does is:
-
-<ol>
-    <li>Pads the Date/Signature line (using the pad marker
-        <kbd>#</kbd>), encloses the padded space with two string
-        tabs markers, and outputs the line without advancing on the
-        page.
-    </li>
-    <li>Sets the two string tabs.
-    </li>
-    <li>Calls the first string tab and draws a rule to its full
-        length.
-    </li>
-    <li>Calls the second tab with
-        <a href="typesetting.html#TN">TN</a>
-        (which moves to tab 2 and stays on the same baseline)
-        then draws a rule to the full length of string tab 2.
-    </li>
-</ol>
 </p>
+<ol style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>Pads the Date/Signature line with a shorter space for Date
+     (<kbd>#</kbd>) and a longer space for Signature
+     (<kbd>###</kbd>), encloses the padded space with string tabs
+     markers, and outputs the line without advancing on the page.
+  </li>
+  <li>Sets the quad for the two string tabs (in this instance, justified).
+  </li>
+  <li>Calls the first string tab and draws a rule to its full
+      length.
+  </li>
+  <li>Calls the second tab with
+      <a href="typesetting.html#tn">TN</a>
+      (which moves to tab 2 and stays on the same baseline)
+      then draws a rule to the full length of string tab 2.
+  </li>
+</ol>
 
 <p>
-Often, when setting up string tabs this way, you don't want the
+Often, when setting up string tabs this way, you don&#8217;t want the
 padded line to print immediately.  To accomplish this, use
-<a href="#SILENT">SILENT</a>.
+<kbd><a href="#silent">SILENT</a></kbd>.
 See the
-<a href="typesetting.html#STRING_TABS_TUT">quickie tutorial on string tabs</a>
+<a href="typesetting.html#string-tabs-tut">quickie tutorial on string tabs</a>
 for an example.
 </p>
+</div>
 
-<p>
-<strong>NOTE:</strong> Because the pound sign
-<nobr>(<kbd>#</kbd>)</nobr> is used as the pad marker, you can't use
-it as a literal part of the pad string.  If you need the sign to
-appear in the text of a padded line, change the pad marker with
-<a href="#PAD_MARKER">PAD_MARKER</a>.
-Also, be aware that <kbd>#</kbd> as a pad marker only applies
-within the <strong>PAD</strong> macro; at all other times it prints
-literally, just as you'd expect.
-</p>
-
-<p>
-Another important consideration when using <strong>PAD</strong> is that
-because the string must be enclosed in double-quotes, you can't use the
-double-quote <nobr>(<kbd>"</kbd>)</nobr> as part of the string.  The
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+Because the pound sign
+(<kbd>#</kbd>) is used as the pad marker, you
+can&#8217;t use it as a literal part of the pad string.  If you need
+the sign to appear in the text of a padded line, change the pad
+marker with
+<kbd><a href="#pad-marker">PAD_MARKER</a></kbd>.
+Also, be aware that <kbd>#</kbd> as a pad marker
+only applies within the PAD macro; at all other times it prints
+literally, just as you&#8217;d expect.
+</p>
+
+<p class="tip-bottom">
+Another important consideration when using PAD is that because the
+string must be enclosed in double-quotes, you can&#8217;t use the
+double-quote (<kbd>"</kbd>) as part of the string.  The
 way to circumvent this is to use the groff
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-<kbd>\(lq</kbd> and <kbd>\(rq</kbd> (leftquote and rightquote
-respectively) whenever double-quotes are required in the string
-passed to <strong>PAD</strong>.
+<a href="definitions.html#inlines">inline escapes</a>
+<kbd>\(lq</kbd> and <kbd>\(rq</kbd>
+(leftquote and rightquote respectively) whenever double-quotes are
+required in the string passed to PAD.
 </p>
+</div>
 
 <!-- -PAD_MARKER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAD_MARKER"><h3><u>Change/set the marker used with PAD</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="pad-marker" class="macro-id">Change/set the marker used with PAD</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>PAD_MARKER</strong> &lt;character to use as the pad marker&gt;</nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>PAD_MARKER</b> <kbd class="macro-args">"&lt;character to use as the pad marker&gt;</kbd>
+</div>
 
 <p>
-If you need to change <strong>mom</strong>'s default pad marker
-<nobr>(<kbd>#</kbd>),</nobr> either because you want a literal # in
+If you need to change mom&#8217;s default pad marker (<kbd
+class="bold">#</kbd>), either because you want a literal # in
 the padded line, or simply because you want to use another character
-instead, use <strong>PAD_MARKER</strong>, whose argument is the new
-pad marker character you want.
-
-<pre>
-    .PAD_MARKER @
-</pre>
-
-changes the pad marker to @.
+instead, use PAD_MARKER, whose argument is the new pad marker
+character you want.
+<br/>
+<span class="pre-in-pp">
+  .PAD_MARKER @
+</span>
+changes the pad marker to <kbd>@</kbd>.
 </p>
 
 <p>
-Once you've changed the pad marker, the new marker remains in
-effect for every instance of
-<a href="#PAD">PAD</a>
+Once you&#8217;ve changed the pad marker, the new marker remains in effect
+for every instance of
+<a href="#pad">PAD</a>
 until you change it again (say, back to the pound sign).
 </p>
 
 <!-- -\*[LEADER]- -->
 
-<hr width="33%" align="left"/>
-
-<a name="LEADER"><h3><u>Inline escape to add leaders to a line</u></h3></a>
-
-<p>
-Inline: <kbd>\*[LEADER]</kbd>
-</p>
+<div class="macro-id-overline">
+<h3 id="leader" class="macro-id">Inline escape to add leaders to a line</h3>
+</div>
+
+<div class="box-macro-args">
+Inline: <b>\*[LEADER]</b>
+</div>
 
 <p>
 Whenever you want to fill a line or tab with
-<a href="definitions.html#TERMS_LEADER">leaders</a>,
+<a href="definitions.html#leader">leaders</a>,
 use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<kbd>\*[LEADER]</kbd>.  The remainder of the line or tab will be
-filled with the leader character. <strong>Mom</strong>'s default
+<a href="definitions.html#inlines">inline escape</a>
+<kbd>\*[LEADER]</kbd>.  The remainder of the line or
+tab will be filled with the leader character. Mom&#8217;s default
 leader character is a period (dot), but you can change it to any
 character you like with
-<a href="#LEADER_CHARACTER">LEADER_CHARACTER</a>.
+<kbd><a href="#leader-character">LEADER_CHARACTER</a></kbd>.
 </p>
 
-<p>
-<strong>NOTE:</strong> <kbd>\*[LEADER]</kbd> fills lines or tabs
-right to their end.  You cannot insert leaders into a line or tab
-and have text following the leader on the same line or in the same
-tab.  Should you wish to achieve such an effect typographically,
-create tabs for each element of the line and fill them appropriately
-with the text and leaders you need.
-<a href="typesetting.html#STRING_TABS">String tabs</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+<kbd>\*[LEADER]</kbd> fills lines or tabs right to
+their end.  You cannot insert leaders into a line or tab and have
+text following the leader on the same line or in the same tab.
+Should you wish to achieve such an effect typographically, create
+tabs for each element of the line and fill them appropriately with
+the text and leaders you need.
+<a href="typesetting.html#string-tabs">String tabs</a>
 are perfect for this.  An example follows.
-
-<pre>
-    .LL 30P
-    .PAD "Date\*[ST1]#\*[ST1X]Signature\*[ST2]###\*[ST2X]"
-    .EL
-    .ST 1 J
-    .ST 2 J
-    .TAB 1
-    \*[LEADER]
-    .TN
-    \*[LEADER]
-    .TQ
-</pre>
-</p>
-
-<p>
-The <strong>PAD</strong> line sets the words Date and Signature,
-and marks string tabs around the pad space inserted in the line.
-The string tabs are then &quot;set&quot;, called, and filled
-with leaders.  The result looks like this:
-
-<pre>
-    Date.............Signature.....................................
-</pre>
+<br/>
+<span class="pre">
+  .LL 30P
+  .PAD "Date\*[ST1]#\*[ST1X]Signature\*[ST2]###\*[ST2X]"
+  .EL
+  .ST 1 J
+  .ST 2 J
+  .TAB 1
+  \*[LEADER]
+  .TN
+  \*[LEADER]
+  .TQ
+</span>
+</p>
+
+<p class="tip-bottom">
+The PAD line sets the words Date and Signature, and marks string
+tabs around the pad space inserted in the line.  The string tabs are
+then &quot;set&quot;, called, and filled with leaders.  The result
+looks like this:
+<br/>
+<span class="pre" style="margin-bottom: -1em;">
+  Date.............Signature.....................................
+</span>
 </p>
+</div>
 
 <!-- -LEADER_CHARACTER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="LEADER_CHARACTER"><h3><u>Change/set the leader character</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="leader-character" class="macro-id">Change/set the leader character</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>LEADER_CHARACTER</b> <kbd class="macro-args">&lt;character&gt;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>LEADER_CHARACTER</strong> <kbd>&lt;character&gt;</kbd></nobr>
-</p>
-
-<p>
-<strong>LEADER_CHARACTER</strong> takes one argument: a single
-character you would like to be used for
-<a href="definitions.html#TERMS_LEADER">leaders</a>.
+LEADER_CHARACTER takes one argument: a single character you would
+like to be used for
+<a href="definitions.html#leader">leaders</a>.
 (See
-<a href="#LEADER"><kbd>\*[LEADER]</kbd></a>
+<kbd><a href="#leader">\*[LEADER]</a></kbd>
 for an explanation of how to fill lines with leaders.)
 </p>
 
 <p>
-For example, to change the leader character from <strong>mom</strong>'s
+For example, to change the leader character from mom&#8217;s
 default (a period) to the underscore character, enter
-
-<pre>
-    .LEADER_CHARACTER _
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .LEADER_CHARACTER _
+</span>
 </p>
 
 <!-- -DROPCAP- -->
 
-<hr width="33%" align="left"/>
-<a name="DROPCAP"><h3><u>Drop caps</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="dropcap" class="macro-id">Drop caps</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>DROPCAP</strong> <kbd>&lt;dropcap letter&gt; &lt;number of lines to drop&gt; [ COND &lt;percentage&gt; | EXT &lt;percentage&gt; ]</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>DROPCAP</b> <kbd class="macro-args">&lt;dropcap letter&gt; &lt;number of lines to drop&gt; [ COND &lt;percentage&gt; | EXT &lt;percentage&gt; ]</kbd>
+</div>
 
 <p>
-The first two arguments to <strong>DROPCAP</strong> are the letter you
-want to be the
-<a href="definitions.html#TERMS_DROPCAP">drop cap</a>
-and the number of lines you want it to drop.  By default,
-<strong>mom</strong> uses the current family and font for the drop
-cap.
+The first two arguments to DROPCAP are the letter you want to be the
+<a href="definitions.html#dropcap">drop cap</a>
+and the number of lines you want it to drop.  By default, mom uses
+the current family and font for the drop cap.
 </p>
 
 <p>
-The optional argument <nobr>(<kbd>COND</kbd> or
-<kbd>EXT</kbd>)</nobr> indicates that you want the drop
-cap condensed (narrower) or extended (wider).  If you use
-<kbd>COND</kbd> or <kbd>EXT</kbd>, you must follow the argument with
-the percentage of the letter's normal width you want it condensed or
-extended.  No percent sign (%) is required.
+The optional argument (<kbd>COND</kbd> or <kbd>EXT</kbd>) indicates
+that you want the drop cap condensed (narrower) or extended (wider).
+If you use <kbd class="bold">COND</kbd> or <kbd>EXT</kbd>, you must
+follow the argument with the percentage of the letter&#8217;s normal
+width you want it condensed or extended.  No percent sign
+(<kbd>%</kbd>) is required.
 </p>
 
 <p>
-<strong>Mom</strong> will do her very best to get the drop cap to
-line up with the first line of text indented beside it, then set the
-correct number of indented lines, and restore your left margin when
-the number of drop cap lines has been reached.
+Mom will do her very best to get the drop cap to line up with the
+first line of text indented beside it, then set the correct number
+of indented lines, and restore your left margin when the number of
+drop cap lines has been reached.
 </p>
 
 <p>
-Beginning a paragraph with a drop cap &quot;T&quot; looks
-like this:
-
-<pre>
-    .DROPCAP T 3 COND 90
-    he thousand injuries of Fortunato I had borne as best I
-    could, but when he ventured upon insult, I vowed revenge.
-    You who so well know the nature of my soul will not suppose,
-    however, that I gave utterance to a threat...
-</pre>
+Beginning a paragraph with a drop cap &#8220;T&#8221; looks like this:
+<br/>
+<span class="pre">
+  .DROPCAP T 3 COND 90
+  he thousand injuries of Fortunato I had borne as best I
+  could, but when he ventured upon insult, I vowed revenge.
+  You who so well know the nature of my soul will not suppose,
+  however, that I gave utterance to a threat...
+</span>
 </p>
 
 <p>
 The drop cap, slightly condensed but in the current family and font,
 will be three lines tall, with whatever text fills those three
 lines indented to the right of the letter.  The remainder of the
-paragraph's text will revert to the left margin.
+paragraph&#8217;s text will revert to the left margin.
 </p>
 
-<p>
-<strong>NOTE:</strong> When using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macro</a>
-<a href="docelement.html#PP">PP</a>,
-<strong>DROPCAP</strong> only works
-
-<ul>
-    <li>with initial paragraphs (i.e. at the start of the document,
-        or after
-        <a href="docelement.html#HEAD">HEAD</a>),</li>
-    <li>when <kbd>.DROPCAP</kbd> comes immediately after <kbd>.PP</kbd>,</li>
-    <li>and when the
-        <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a>
-        is TYPESET.</li>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+When using the
+<a href="docprocessing.html#docprocessing">document processing macro</a>
+<a href="docelement.html#pp">PP</a>,
+DROPCAP only works
+</p>
+<ul style="margin-top: -1em; margin-bottom: 0;">
+  <li>with initial paragraphs (i.e. at the start of the document,
+      or after
+      <a href="docelement.html#head">HEAD</a>),</li>
+  <li>when <kbd>.DROPCAP</kbd> comes immediately after <kbd>.PP</kbd>,</li>
+  <li>the
+      <a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+      is TYPESET.</li>
 </ul>
-
-If these conditions aren't met, <strong>DROPCAP</strong> is silently ignored.
+<p class="tip-bottom">
+If these conditions aren&#8217;t met, DROPCAP is silently ignored.
 </p>
+</div>
 
-<p>
-<strong>WARNING:</strong> <strong>DROPCAP</strong> puts a bit of
-a strain on resource-challenged systems.  If you have such a
-system and use drop caps extensively in a document, be prepared
-for a wait while <strong>mom</strong> does her thing.
+<div class="box-important">
+<p class="tip">
+<span class="important">Warning:</span>
+DROPCAP puts a bit of a strain on resource-challenged systems.  If
+you have such a system and use drop caps extensively in a document,
+be prepared for a wait while mom does her thing.
+</p>
+</div>
+
+<h3 id="dropcap-support" class="docs control-macros-header">Support macros for DROPCAP</h3>
+<p>
+Drop caps are the bane of most typesetters&#8217; existence.
+It&#8217;s very difficult to get the size of the drop cap right
+for the number of drop lines, especially if the drop cap is in a
+different family from the prevailing family of running text.  Not
+only that, but there&#8217;s the gutter around the drop cap to take
+into account, plus the fact that the letter may be too wide or too
+narrow to look anything but odd or misplaced.
 </p>
 
-<h4><a name="DROPCAP_SUPPORT"><u>Support macros for DROPCAP</u></a></h4>
-
 <p>
-Drop caps are the bane of most typesetters' existence.  It's
-very difficult to get the size of the drop cap right for the
-number of drop lines, especially if the drop cap is in a
-different family from the prevailing family of running text.
-Not only that, but there's the gutter around the drop cap to
-take into account, plus the fact that the letter may be too wide
-or too narrow to look anything but odd or misplaced.
-</p>
+Mom solves the last of these problems with the <kbd>COND</kbd> and
+<kbd>EXT</kbd> arguments.  The rest she solves with macros that
+change the default behaviour of DROPCAP, namely
+</p>
+<ul class="no-enumerator" style="margin-top: -.5em; margin-left: -.5em;">
+  <li><a href="#dropcap-family">DROPCAP_FAMILY</a></li>
+  <li><a href="#dropcap-font">DROPCAP_FONT</a></li>
+  <li><a href="#dropcap-color">DROPCAP_COLOR</a></li>
+  <li><a href="#dropcap-adjust">DROPCAP_ADJUST</a></li>
+  <li><a href="#dropcap-gutter">DROPCAP_GUTTER</a></li>
+</ul>
 
-<p>
-<strong>Mom</strong> solves the last of these problems with the
-<kbd>COND</kbd> and <kbd>EXT</kbd> arguments.  The rest she
-solves with macros that change the default behaviour of
-<strong>DROPCAP</strong>, namely
+<p style="margin-top: -.5em;">
+These macros must, of course, come before you invoke DROPCAP.
 </p>
 
-<p>
-<a href="#DROPCAP_FAMILY">DROPCAP_FAMILY</a>
-<br/>
-
-<a href="#DROPCAP_FONT">DROPCAP_FONT</a>
+<h3 id="dropcap-family" class="control-macro">&bull;&nbsp;DROPCAP_FAMILY</h3>
+<p style="margin-left: .66em;">
+Set the drop cap family by giving DROPCAP_FAMILY the name of the
+family you want, e.g.
 <br/>
-
-<a href="#DROPCAP_COLOR">DROPCAP_COLOR</a>
-<br/>
-
-<a href="#DROPCAP_ADJUST">DROPCAP_ADJUST</a>
-<br/>
-
-and
-<br/>
-
-<a href="#DROPCAP_GUTTER">DROPCAP_GUTTER</a>.
-</p>
-
-<p>
-These macros must, of course, come before you invoke
-<strong>DROPCAP</strong>.
-</p>
-
-<h4><a name="DROPCAP_FAMILY"><u>DROPCAP_FAMILY</u></a></h4>
-
-<p>
-Set the drop cap family by giving
-<strong>DROPCAP_FAMILY</strong> the name of the family you want,
-e.g.
-
-<pre>
-    .DROPCAP_FAMILY H
-</pre>
-
+<span class="pre-in-pp">
+  .DROPCAP_FAMILY H
+</span>
 which will set the family to Helvetica for the drop cap only.
 </p>
 
-<h4><a name="DROPCAP_FONT"><u>DROPCAP_FONT</u></a></h4>
-
-<p>
-Set the drop cap font by giving
-<strong>DROPCAP_FONT</strong> the name of the font you want,
-e.g.
-
-<pre>
-    .DROPCAP_FONT I
-</pre>
-
+<h3 id="dropcap-font" class="control-macro">&bull;&nbsp;DROPCAP_FONT</h3>
+<p style="margin-left: .66em;">
+Set the drop cap font by giving DROPCAP_FONT the name of the font
+you want, e.g.
+<br/>
+<span class="pre-in-pp">
+  .DROPCAP_FONT I
+</span>
 which will set the font to italic for the drop cap only.
 </p>
 
-<h4><a name="DROPCAP_ADJUST"><u>DROPCAP_ADJUST</u></a></h4>
-
-<p>
-If the size <strong>mom</strong> calculates for the drop cap
-isn't precisely what you want, you can increase or decrease it
-with <strong>DROPCAP_ADJUST</strong>, like this:
-e.g.
-
-<pre>
-    .DROPCAP_ADJUST +1
-        or
-    .DROPCAP_ADJUST -.75
-</pre>
+<h3 id="dropcap-adjust" class="control-macro">&bull;&nbsp;DROPCAP_ADJUST</h3>
+<p style="margin-left: .66em;">
+If the size mom calculates for the drop cap isn&#8217;t precisely
+what you want, you can increase or decrease it with DROPCAP_ADJUST,
+like this: e.g.
+<br/>
+<span class="pre-in-pp">
+  .DROPCAP_ADJUST +1
+</span>
+or
+<br/>
+<span class="pre">
+  .DROPCAP_ADJUST -.75
+</span>
 </p>
 
-<p>
-<strong>DROPCAP_ADJUST</strong> only understands
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
+<p style="margin-left: .66em;">
+DROPCAP_ADJUST only understands
+<a href="definitions.html#picaspoints">points</a>,
 therefore do not append any
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 to the argument.  And always be sure to prepend the plus or
 minus sign, depending on whether you want the drop cap larger or
 smaller.
 </p>
 
-<h4><a name="DROPCAP_COLOR"><u>DROPCAP_COLOR</u></a></h4>
-
-<p>
-If you'd like your drop cap colourized, simply invoke
-<strong>DROPCAP_COLOR</strong> with the name of a colour you've already
-created (&quot;initialized&quot;) with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
+<h3 id="dropcap-color" class="control-macro">&bull;&nbsp;DROPCAP_COLOR</h3>
+<p style="margin-left: .66em;">
+If you&#8217;d like your drop cap colourized, simply invoke
+<kbd>.DROPCAP_COLOR&nbsp;&lt;color&gt;</kbd> with the name of a
+colour you&#8217;ve already created (&#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
 or
-<a href="color.html#XCOLOR">XCOLOR</a>.  Only the drop cap will be
-colourized; all other text will remain at the current colour
-default (usually black).
+<a href="color.html#xcolor">XCOLOR</a>.
+Only the drop cap will be colourized; all other text will remain at
+the current colour default (usually black).
 </p>
 
-<h4><a name="DROPCAP_GUTTER"><u>DROPCAP_GUTTER</u></a></h4>
-
-<p>
-By default, <strong>mom</strong> puts three points of space
-between the drop cap and the text indented beside it.  If you
-want another value, use <strong>DROPCAP_GUTTER</strong> (with a
-unit of measure), like this:
-
-<pre>
-    .DROPCAP_GUTTER 6p
-</pre>
+<h3 id="dropcap-gutter" class="control-macro">&bull;&nbsp;DROPCAP_GUTTER</h3>
+<p style="margin-left: .66em;">
+By default, mom puts three points of space between the drop cap
+and the text indented beside it.  If you want another value, use
+DROPCAP_GUTTER (with a unit of measure), like this:
+<br/>
+<span class="pre-in-pp">
+  .DROPCAP_GUTTER 6p
+</span>
 </p>
 
 <!-- -\*[SUP]- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="sup" class="macro-id">Superscript</h3>
+</div>
 
-<a name="SUP"><h3><u>Superscript</u></h3></a>
-
-<p>
+<div class="box-macro-args">
 Inlines: <kbd>\*[SUP]...\*[SUPX]</kbd>
-</p>
+</div>
 
 <p>
 Superscripts are accomplished
-<a href="definitions.html#TERMS_INLINES">inline</a>.
+<a href="definitions.html#inlines">inline</a>.
 Whenever you need one, typically for numerals, all you need to do is
 surround the superscript with the inlines above. <kbd>\*[SUP]</kbd>
 begins superscripting; <kbd>\*[SUPX]</kbd> turns it off.
 </p>
 
-<a name="CONDSUP"></a>
-<a name="EXTSUP"></a>
-
-<p>
+<p id="cond-or-ext-sup">
 If your running type is
-<a href="typesetting.html#COND_INLINE">pseudo-condensed</a>
+<a href="typesetting.html#cond-inline">pseudo-condensed</a>
 or
-<a href="typesetting.html#EXT_INLINE">pseudo-extended</a>
+<a href="typesetting.html#ext-inline">pseudo-extended</a>
 and you want your superscripts to be equivalently pseudo-condensed
 or -extended, use <kbd>\*[CONDSUP]...\*[CONDSUPX]</kbd> or
 <kbd>\*[EXTSUP]...\*[EXTSUPX]</kbd>.
@@ -1409,32 +1390,59 @@
 
 <p>
 The superscript inlines are primarily used by the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 for automatic generation of numbered footnotes.  However, you may
 find them useful for other purposes.
 </p>
 
-<p>
-<strong>NOTE:</strong> <strong>Mom</strong> does a pretty fine job of
-making superscripts look good in any font and at any size.  If you're
-fussy, though (and I am), about precise vertical placement, kerning,
-weight, size, and so on, you may want to roll your own solution.
-And sorry, there's no <strong>mom</strong> equivalent for subscripts.
-I'm neither a mathematician nor a chemist, so I don't need them.
-Of course, anyone who wishes to contribute a subscript routine to
-<strong>mom</strong> will receive eternal blessings not only in this
-lifetime, but in all lifetimes to come.
-</p>
-
-<hr/>
-
-<a href="inlines.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="typesetting.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Mom does a pretty fine job of making superscripts look good in any
+font and at any size.  If you&#8217;re fussy, though (and I am),
+about precise vertical placement, kerning, weight, size, and so on,
+you may want to roll your own solution.  And sorry, there&#8217;s
+no mom equivalent for subscripts.  I'm neither a mathematician
+nor a chemist, so I don&#8217;t need them.  Of course, anyone who
+wishes to contribute a subscript routine to mom will receive
+blessings not only in this lifetime, but in all lifetimes to come.
+</p>
+</div>
+
+<h3 id="sup-raise" class="docs">SUPERSCRIPT RAISE AMOUNT</h3>
+<p>
+By default, mom raises superscripts 1/3 of an
+<a href="definitions.html#ems">em</a>
+above the baseline.  If you&#8217;re not happy with this default,
+you can change it by invoking SUPERSCRIPT_RAISE_AMOUNT with the
+amount you want them raised.  A
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+must be appended directly to the amount.  Thus, you want
+superscripts raised by 3
+<a href="definitions.html#picaspoints">points</a>
+instead of 1/3 em, you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  .SUPERSCRIPT_RAISE_AMOUNT 3p
+</span>
+and all subsequent superscripts would be raised by 3 points.
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="inlines.html#top">Next: Inline escapes</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/graphical.html groff-1.21/contrib/mom/momdoc/graphical.html
--- groff-1.20.1/contrib/mom/momdoc/graphical.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/graphical.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,511 +16,501 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Graphical Objects</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Graphical Objects</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
 
-<a name="TOP"></a>
-
-<p>
-<a href="docprocessing.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="color.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<body style="background-color: #f5faff;">
 
-<h1 align="center"><a name="COLOR_INTRO"><u>Graphical objects</u></a></h1>
+<!-- ==================================================================== -->
 
-<p>
-<a href="#INTRO_GRAPHICAL">Introduction to graphical objects</a>
+<div id="top" class="page">
 
-<ul>
-    <li><a href="#BEHAVIOUR">Graphical object behaviour</a></li>
-    <li><a href="#ORDER">Order of arguments</a></li>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="docprocessing.html#top">Next: Document processing</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Graphical objects</h1>
+
+<div style="text-align: center;">
+<ul class="no-enumerator" style="margin-left: -2.5em;">
+  <li><a href="#intro-graphical">Introduction to graphical objects</a></li>
+  <li><a href="#behaviour">Graphical objects behaviour</a></li>
+  <li><a href="#order">Order of arguments</a></li>
+  <li><a href="#index-graphical">Index of graphical objects macros</a></li>
 </ul>
+</div>
 
-<a href="#MACROS_GRAPHICAL">Index of graphical object macros</a>
-</p>
+<div class="rule-medium"><hr/></div>
 
-<a name="INTRO_GRAPHICAL"><h2><u>Introduction to graphical objects</u></h2></a>
+<h2 id="intro-graphical" class="docs">Introduction to graphical objects</h2>
 
 <p>
-<strong>Groff</strong> has a number of
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
+Groff has a number of
+<a href="definitions.html#inlines">inline escapes</a>
 for drawing rules, polygons, ellipses and splines.  All begin with
-<kbd>\D</kbd> (presumably for &quot;Draw&quot;) and are documented
-in the <strong>groff</strong> info manual:
-
-<pre>
-    info groff => Escape index => \D
-</pre>
-</p>
-
-<p>
+<kbd>\D</kbd> (presumably for &#8220;Draw&#8221;) and are documented
+in the groff info manual:
+<br/>
+<span class="pre-in-pp">
+  info groff => Escape index => \D
+</span>
 The escapes allow you to draw just about any simple graphical object
-you can think of, but owing to their syntax, they're not always easy
+you can think of, but owing to their syntax, they&#8217;re not always easy
 to read, which can make tweaking them difficult.  Additionally,
-while they perform in a <em>consistent</em> manner, they don't
-always perform in an <em>expected</em> manner.
+while they perform in a <i>consistent</i> manner, they don&#8217;t
+always perform in an <i>expected</i> manner.
 </p>
 
 <p>
 Experience shows that the most common graphical elements typesetters
 need are rules (horizontal and vertical), boxes, and circles (or
-ellipses).  For this reason, <strong>mom</strong> provides macros
+ellipses).  For this reason, mom provides macros
 to draw these objects in an easy-to-understand way; the results are
-predictable, and <strong>mom</strong>'s syntax makes fixes or tweaks
+predictable, and mom&#8217;s syntax makes fixes or tweaks
 painless.
 </p>
 
-<a name="GRAPHICAL_EXAMPLE"></a>
-
-<p>
+<p id="graphical-example">
 For example, if you want to draw a 2-inch square outline box at the left
-margin using <strong>groff</strong>'s <kbd>\D</kbd> escapes, it looks like this:
-
-<pre>
-              back up
-                by
-               weight
-             +-------+
-             |       |
-    \D't 500'\h'-500u'\D'p 2i 0 0 2i -2i 0 0 -2i'
-   |       |          |                        |
-   +-------+          +------------------------+
-    set rule          draw box, 1 line at a time
-     weight
-</pre>
+margin using groff&#8217;s <kbd>\D</kbd> escapes, it looks like this:
+<br/>
+<span class="pre-in-pp">
+             back up
+               by
+             weight
+            +-------+
+            |       |
+   \D't 500'\h'-500u'\D'p 2i 0 0 2i -2i 0 0 -2i'
+  |       |          |                        |
+  +-------+          +------------------------+
+   set rule          draw box, 1 line at a time
+    weight
+</span>
 
-Obviously, this isn't very efficient for something as simple as a
+Obviously, this isn&#8217;t very efficient for something as simple as a
 box.
 </p>
 
 <p>
-Here's the same box, drawn with <strong>mom</strong>'s box drawing
+Here&#8217;s the same box, drawn with mom&#8217;s box drawing
 macro,
-<a href="#DBX">DBX</a>:
-
-<pre>
-left margin indent-+  +-box width
-                   |  |
-          .DBX .5  0  2i  2i
-                |         |
-   rule weight--+         +-box depth
-   (in points)
-</pre>
+<kbd><a href="#dbx">DBX</a></kbd>:
+<br/>
+<span class="pre-in-pp">
+  left margin indent--+  +--box width
+                      |  |
+             .DBX .5  0  2i  2i
+                  |          |
+     rule weight--+          +--box depth
+     (in points)
+</span>
 </p>
 
 <p>
-<strong>Mom</strong>'s graphical object macros allow &mdash; in fact,
-require &mdash; giving the rule weight (&quot;thickness&quot;) for the
-object (or saying that you want it filled), an indent from the left
-margin where the object begins, the dimensions of the object, and
-optionally a colour for the object.
+Mom&#8217;s graphical object macros allow&mdash;in fact,
+require&mdash;giving the rule weight (&#8220;thickness&#8221;) for
+the object (or saying that you want it filled), an indent from the
+left margin where the object begins, the dimensions of the object,
+and optionally a colour for the object.
 </p>
 
 <p>
-There are no defaults for the arguments to <strong>mom</strong>'a
-graphical object macros, which means you must supply the arguments
-every time you invoke them.
+There are no defaults for the arguments to mom'a graphical object
+macros, which means you must supply the arguments every time you
+invoke them.
 </p>
 
-<p>
-<strong>NOTE:</strong> As stated above, <strong>mom</strong> only
-provides macros for commonly-used graphical objects (rules, boxes,
-circles) only.  More complex objects (polygons, non-straight lines,
-splines) must be drawn using <strong>groff</strong>'s <kbd>\D</kbd>
-escapes.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+As stated above, mom only provides macros for commonly-used
+graphical objects (rules, boxes, circles).  More complex objects
+(polygons, non-straight lines, splines) must be drawn using
+groff&#8217;s <kbd>\D</kbd> escapes.
 </p>
+</div>
 
-<a name="BEHAVIOUR"><h3><u>Graphical object behaviour</u></h3></a>
+<h3 id="behaviour" class="docs">Graphical object behaviour</h3>
 
 <p>
-<strong>Mom</strong>'s graphical object macros all behave in the
-following, carved-in-stone ways:
-
-<ol>
-     <li>Objects are drawn from the
-         <a href="definitions.html#TERMS_BASELINE">baseline</a>
-         down, including horizontal rules.</li>
-     <li>Objects begin precisely at the left indent supplied as
-         an argument to the macro.</li>
-     <li>Objects are drawn from left to right.</li>
-     <li>Enclosed objects (boxes, circles) are drawn from the
-         perimeter <em>inward</em>.</li>
-     <li>Objects return to their horizontal/vertical point of origin.</li>
+Mom&#8217;s graphical object macros all behave in the following,
+carved-in-stone ways:
+</p>
+<ol style="margin-top: -.5em; margin-bottom: -.5em;">
+   <li>Objects are drawn from the
+       <a href="definitions.html#baseline">baseline</a>
+       down, including horizontal rules.</li>
+   <li>Objects begin precisely at the left indent supplied as
+       an argument to the macro.</li>
+   <li>Objects are drawn from left to right.</li>
+   <li>Enclosed objects (boxes, circles) are drawn from the
+       perimeter <i>inward</i>.</li>
+   <li>Objects return to their horizontal/vertical point of origin.</li>
 </ol>
 
+<p>
 The consistency means that once you've mastered the very simple
 order of arguments that applies to invoking graphical object
 macros, you can draw objects with full confidence that you know
-exactly where they're placed and how much room they occupy.
-Furthermore, because all return to their point of origin, you'll
-know exactly where you are on the page.
+exactly where they&#8217;re placed and how much room they
+occupy.  Furthermore, because all return to their point of origin,
+you&#8217;ll know exactly where you are on the page.
 </p>
 
-<a name="ORDER"><h3><u>Order of arguments</u></h3></a>
+<h3 id="order" class="docs">Order of arguments</h3>
 
 <p>
 The order of arguments to the graphical object macros is the same
 for every macro:
-
-<ul>
-    <li>the <strong>Weight</strong> of the rule</li>
-    <ul>
-        <li>if the object is enclosed (i.e. is a box or circle), the
-            weight of the rule if you want the object outlined</li>
-        <li>the single word <kbd>SOLID</kbd> may be used in place
-            of the <strong>weight</strong> argument if you want the
-            object filled</li>
-    </ul>
-    <li>the <strong>Indent</strong> from the current left margin at
-        which to begin the object</li>
-    <li>the <strong>Length</strong> of the object, if applicable</li>
-    <li>the <strong>Depth</strong> of the object, if applicable</li>
-    <li>the <strong>Colour</strong> of the object (optional)</li>
-</ul>
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>the <kbd><span style="text-decoration: underline">W</span></kbd>eight of the rule
+  <ul style="margin-left: -.75em;">
+    <li>if the object is enclosed (i.e. is a box or circle), the
+        weight of the rule if you want the object outlined</li>
+    <li>the single word, <kbd>SOLID</kbd>, may be used in place
+        of the <b>weight</b> argument if you want the
+        object filled</li>
+  </ul></li>
+  <li>the <kbd><span style="text-decoration: underline">I</span></kbd>ndent from the current left margin at
+      which to begin the object</li>
+  <li>the <kbd><span style="text-decoration: underline">L</span></kbd>ength of the object, if applicable</li>
+  <li>the <kbd><span style="text-decoration: underline">D</span></kbd>epth of the object, if applicable</li>
+  <li>the <kbd><span style="text-decoration: underline">C</span></kbd>olour of the object (optional)</li>
+</ul>
 
 <p>
-A simple mnemonic for the order of arguments is &quot;WILD C&quot;.
-If you fix the mnemonic in your brain and apply a little judicious
-reasoning, you'll always remember how to draw graphical objects.
-The &quot;judicious reasoning&quot; means that, for example,
-horizontal rules don't require a depth and vertical rules don't
-require a length.  Thus, in the case of drawing a horizontal rule,
-you supply the macro,
-<a href="#DRH">DRH</a>,
-with only the arguments (from the mnemonic) that apply: W-I-L (and
-possibly C).
-</p>
-
-<a name="MACROS_GRAPHICAL"><h3><u>Index of graphical object macros</u></h3></a>
-
-<ul>
-    <li><a href="#DRH">DRH</a>
-        &mdash; horizontal rule</li>
-    <li><a href="#DRV">DRV</a>
-        &mdash; vertical rule</li>
-    <li><a href="#DBX">DBX</a>
-        &mdash; box</li>
-    <li><a href="#DCL">DCL</a>
-        &mdash; circle or ellipse</li>
+A simple mnemonic for the order of arguments is &#8220;<b>WILD
+C</b>ard&#8221;.  If you fix the mnemonic in your brain and apply
+a little judicious reasoning, you&#8217;ll always remember how to
+draw graphical objects.  The &#8220;judicious reasoning&#8221; means
+that, for example, horizontal rules don&#8217;t require a depth and
+vertical rules don&#8217;t require a length.  Thus, in the case of
+drawing a horizontal rule, you supply the macro,
+<kbd><a href="#drh">DRH</a></kbd>,
+with only the arguments (from the mnemonic) that apply: <b>W-I-L</b> (and
+possibly <b>C</b>).
+</p>
+
+<div class="macro-list-container">
+<h3 id="index-graphical" class="macro-list">Graphical objects macros</h3>
+
+<ul class="macro-list">
+  <li><a href="#drh">DRH</a>
+      &ndash; horizontal rules</li>
+  <li><a href="#drv">DRV</a>
+      &ndash; vertical rules</li>
+  <li><a href="#dbx">DBX</a>
+      &ndash; box</li>
+  <li><a href="#dcl">DCL</a>
+      &ndash; circles or ellipses</li>
 </ul>
+</div>
 
 <!-- -DRH- -->
 
-<hr width="66%" align="left"/>
-
-<a name="DRH"><h3><u>Drawing horizontal rules</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>DRH</strong> <kbd>&lt;none&gt; | &lt;rule weight&gt;  &lt;indent&gt; &lt;length&gt; [&lt;colour&gt;]</kbd></nobr>
-<br/>
-
-<em>*The argument to</em> <kbd>&lt;rule weight&gt;</kbd> <em>is
-in</em>
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
-<em>but do </em> NOT <em>append the</em>
-<a href="definitions.html#TERMS_UNITSOFMEASURE">unit of
-measure</a>, <kbd>p</kbd>.
+<div class="macro-id-overline">
+<h3 id="drh" class="macro-id">Drawing horizontal rules</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DRH</b> <kbd class="macro-args">&lt;none&gt; | &lt;weight&gt;  &lt;indent&gt; &lt;length&gt; [&lt;colour&gt;]</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;The argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
+<a href="definitions.html#picaspoints" class="normal">points</a>,
+but do <span class="normal">NOT</span> append the
+<a href="definitions.html#unitsofmeasure">unit of measure</a>,
+<kbd class="normal">p</kbd>.
 <br/>
-
-<em>*The arguments,</em> <kbd>&lt;indent&gt;</kbd> <em>and</em>
-<kbd>&lt;length&gt;</kbd>, <em>require a unit of measure.</em>
+&bull;&nbsp;The arguments, <kbd class="normal">&lt;indent&gt;</kbd> and
+<kbd class="normal">&lt;length&gt;</kbd>, require a unit of measure.
 </p>
 
 <p>
 If all you want is to draw a rule from your current left
 margin to your current right margin (in other words, a &quot;full
 measure&quot; rule), you may invoke <kbd>.DRH</kbd> without any
-arguments.  (Note that <strong>DRH</strong> is the only graphical
-object macro that may be invoked without arguments.)  The weight of
-the rule is determined by the argument you last gave the macro,
-<a href="inlines.html#RULE_WEIGHT">RULE_WEIGHT</a>.
-<strong>DRH</strong>, used this way, is exactly equivalent to
-entering the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<a href="inlines.html#INLINE_RULE_MOM"><kbd>\*[RULE]</kbd></a>.
+arguments.
 </p>
-
-<p>
-To draw horizontal rules of a specified length, you must, at a
-minimum, supply
-<strong>DRH</strong> with the arguments
-<kbd><nobr>rule weight,</nobr> indent</kbd> (measured from the
-current left margin) and <kbd>length</kbd>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+DRH is the only graphical object macro that may be invoked
+without arguments.  The weight (&#8220;thickness&#8221;) of
+the rule is determined by the argument you last gave the
+macro, <a href="inlines.html#rule-weight">RULE_WEIGHT</a>.
+DRH, used this way, is exactly equivalent to entering the
+<a href="definitions.html#inlines">inline escape</a>, <a
+href="inlines.html#inline-rule-mom"><kbd>\*[RULE]</kbd></a>.
+</p>
+</div>
+
+<p style="margin-top: -.5em;">
+To draw horizontal rules of a specified length, you must, at
+a minimum, supply DRH with the arguments <kbd>weight,</kbd>
+<kbd>indent</kbd> (measured from the current left margin) and
+<kbd>length</kbd>.
 </p>
 
 <p>
-Optionally, you may give a <kbd>colour</kbd> argument.
-The colour may be either one defined with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>,
+Optionally, you may give a <kbd>colour</kbd> argument.  The colour
+may be either one defined with
+<a href="color.html#newcolor">NEWCOLOR</a>,
 or a named X-colour inititialized with
-<a href="color.html#XCOLOR">XCOLOR</a>,
-or an X-colour alias (again, initialized with
-<strong>XCOLOR</strong>).
+<a href="color.html#xcolor">XCOLOR</a>,
+or an X-colour alias (again, initialized with XCOLOR).
 </p>
 
 <p>
 Say, for example, you want to draw a 1-1/4 point horizontal rule
 that starts 2 picas from the current left margin and runs for 3
 inches.  To do so, you'd invoke <kbd>.DRH</kbd> like this:
-
-<pre>
-         weight length
-           |      |
-    .DRH 1.125 2P 3i
-               |
-             indent
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+      weight  length
+         |      |
+  .DRH 1.25 2P 3i
+            |
+          indent
+</span>
 (Note that the rule weight argument, which is expressed in points,
 must NOT have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
 <p>
 If, in addition, you want the rule blue:
-
-<pre>
-    .DRH 1.125 2P 3i blue
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .DRH 1.25 2P 3i blue
+</span>
 </p>
 
-<h3><u>How mom handles the positioning of horizontal rules</u></h3>
+<h3 class="docs">How mom handles the positioning of horizontal rules</h3>
 
 <p>
 Horizontal rules are drawn from left to right, and from the baseline
-down. &quot;From the baseline down&quot; means that if you request
+down. &#8220;From the baseline down&#8221; means that if you request
 a rule with a weight of four points, the four points of rule fall
 entirely below the baseline.
 </p>
 
 <p>
-Furthermore, after the rule is drawn, <strong>mom</strong> returns
-you to the current left margin, at the same vertical position on
-the page as when <strong>DRH</strong> was invoked.  In other words,
-<strong>DRH</strong> causes no movement on the page, either
-horizontal or vertical.
+Furthermore, after the rule is drawn, mom returns you to the current
+left margin, at the same vertical position on the page as when DRH
+was invoked.  In other words, DRH causes no movement on the page,
+either horizontal or vertical.
 </p>
 
 <!-- -DRV- -->
 
-<hr width="33%" align="left"/>
-
-<a name="DRV"><h3><u>Drawing vertical rules</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>DRV</strong> <kbd>&lt;rule weight&gt;  &lt;indent&gt; &lt;depth&gt; [&lt;colour&gt;]</kbd></nobr>
-<br/>
-
-<em>*The argument to</em> <kbd>&lt;rule weight&gt;</kbd> <em>is
-in</em>
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
-<em>but do </em> NOT <em>append the</em>
-<a href="definitions.html#TERMS_UNITSOFMEASURE">unit of
-measure</a>, <kbd>p</kbd>.
+<div class="macro-id-overline">
+<h3 id="drv" class="macro-id">Drawing vertical rules</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DRV</b> <kbd class="macro-args">&lt;weight&gt;  &lt;indent&gt; &lt;depth&gt; [&lt;colour&gt;]</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;The argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
+<a href="definitions.html#picaspoints" class="normal">points</a>,
+but do <span class="normal">NOT</span> append the
+<a href="definitions.html#unitsofmeasure">unit of measure</a>,
+<kbd class="normal">p</kbd>.
 <br/>
-
-<em>*The arguments,</em> <kbd>&lt;indent&gt;</kbd> <em>and</em>
-<kbd>&lt;depth&gt;</kbd>, <em>require a unit of measure.</em>
+&bull;&nbsp;The arguments, <kbd class="normal">&lt;indent&gt;</kbd> and
+<kbd class="normal">&lt;depth&gt;</kbd>, require a unit of measure.
 </p>
 
 <p>
-To draw vertical rules of a specified length, you must, at a
-minimum, supply
-<strong>DRV</strong> with the arguments
-<kbd><nobr>rule weight,</nobr> indent</kbd> (measured from the
-current left margin) and <kbd>depth</kbd>.
+To draw vertical rules of a specified length, you must, at
+a minimum, supply DRV with the arguments <kbd>weight,</kbd>
+<kbd>indent</kbd> (measured from the current left margin) and
+<kbd>depth</kbd>.
 </p>
 
 <p>
-Optionally, you may give a <kbd>colour</kbd> argument.
-The colour may be either one defined with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>,
+Optionally, you may give a <kbd>colour</kbd> argument.  The colour
+may be either one defined with
+<a href="color.html#newcolor">NEWCOLOR</a>,
 or a named X-colour inititialized with
-<a href="color.html#XCOLOR">XCOLOR</a>,
-or an X-colour alias (again, initialized with
-<strong>XCOLOR</strong>).
+<a href="color.html#xcolor">XCOLOR</a>,
+or an X-colour alias (again, initialized with XCOLOR).
 </p>
 
 <p>
 Say, for example, you want to draw a 3/4-point vertical rule that
 starts 19-1/2 picas from the current left margin and has a depth of
 6 centimeters.  To do so, you'd invoke <kbd>.DRV</kbd> like this:
-
-<pre>
-         weight   depth
-           |        |
-    .DRV .75 19P+6p 6c
-               |
-             indent
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+       weight   depth
+         |        |
+  .DRV .75 19P+6p 6c
+             |
+           indent
+</span>
 (Note that the rule weight argument, which is expressed in points,
 must NOT have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
 <p>
 If, in addition, you want the rule red:
-
-<pre>
-    .DRV .75 19P+6p 6c red
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .DRV .75 19P+6p 6c red
+</span>
 </p>
 
-<h3><u>How mom handles the positioning of vertical rules</u></h3>
+<h3 class="docs">How mom handles the positioning of vertical rules</h3>
 
 <p>
 Vertical rules are drawn from the baseline down, and from left to
 right. &quot;Left to right&quot; means that if you request a rule
 with a weight of four points, the four points of rule fall entirely
-to the left of the indent given to <strong>DRV</strong>.
+to the left of the indent given to DRV.
 </p>
 
 <p>
-Furthermore, after the rule is drawn, <strong>mom</strong> returns
-you to the current left margin, at the same vertical position
-on the page as when <strong>DRV</strong> was invoked.  In other
-words, <strong>DRV</strong> causes no movement on the page, either
-horizontal or vertical.
+Furthermore, after the rule is drawn, mom returns you to the current
+left margin, at the same vertical position on the page as when DRV
+was invoked.  In other words, DRV causes no movement on the page,
+either horizontal or vertical.
 </p>
 
 <!-- -DBX- -->
 
-<hr width="33%" align="left"/>
-
-<a name="DBX"><h3><u>Drawing boxes</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>DBX</strong> <kbd>&lt; &lt;rule weight&gt; | SOLID &gt; &lt;indent&gt; &lt;length&gt; &lt;depth&gt; [&lt;colour&gt;]</kbd></nobr>
+<div class="macro-id-overline">
+<h3 id="dbx" class="macro-id">Drawing boxes</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DBX</b> <kbd class="macro-args">&lt; &lt;weight&gt; | SOLID &gt; &lt;indent&gt; &lt;length&gt; &lt;depth&gt; [&lt;colour&gt;]</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;The argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
+<a href="definitions.html#picaspoints" class="normal">points</a>,
+but do <span class="normal">NOT</span> append the
+<a href="definitions.html#unitsofmeasure">unit of measure</a>,
+<kbd class="normal">p</kbd>.
 <br/>
-
-<em>*The argument to</em> <kbd>&lt;rule weight&gt;</kbd> <em>is
-in</em>
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
-<em>but do </em> NOT <em>append the</em>
-<a href="definitions.html#TERMS_UNITSOFMEASURE">unit of
-measure</a>, <kbd>p</kbd>.
-<br/>
-
-<em>*The arguments,</em> <kbd>&lt;indent&gt;</kbd><em>,</em>
-<kbd>&lt;length&gt;</kbd> <em>and</em> <kbd>&lt;depth&gt;</kbd>
-<em>require a unit of measure.</em>
+&bull;&nbsp;The arguments, <kbd class="normal">&lt;indent&gt;</kbd>,
+<kbd class="normal">&lt;length&gt;</kbd> and
+<kbd class="normal">&lt;depth&gt;</kbd>, require a unit of measure.
 </p>
 
 <p>
 To draw boxes of specified dimensions, you must, at a minimum,
-supply <strong>DBX</strong> with the arguments <kbd><nobr>rule
-weight</nobr></kbd> or <kbd>SOLID</kbd>, <kbd>indent</kbd>
-(measured from the current left margin), <kbd>length</kbd> and
-<kbd>depth</kbd>.
+supply DBX with the arguments <kbd>weight</kbd> or <kbd>SOLID</kbd>,
+<kbd>indent</kbd> (measured from the current left margin),
+<kbd>length</kbd> and <kbd>depth</kbd>.
 </p>
 
 <p>
-Optionally, you may give a <kbd>colour</kbd> argument.
-The colour may be either one defined with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>,
+Optionally, you may give a <kbd>colour</kbd> argument.  The colour
+may be either one defined with
+<a href="color.html#newcolor">NEWCOLOR</a>,
 or a named X-colour inititialized with
-<a href="color.html#XCOLOR">XCOLOR</a>,
-or an X-colour alias (again, initialized with
-<strong>XCOLOR</strong>).
+<a href="color.html#xcolor">XCOLOR</a>,
+or an X-colour alias (again, initialized with XCOLOR).
 </p>
 
 <p>
 Say, for example, you want to draw a 1/2 point outline box that
 starts one inch from the current left margin and has the dimensions 
 12 picas x 6 picas.  To do so, you'd invoke <kbd>.DBX</kbd> like this:
-
-<pre>
-           indent   depth
-             |        |
-    .DBX .5  1i  12P  6P
-          |       |
-       weight   length
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+         indent   depth
+           |        |
+  .DBX .5  1i  12P  6P
+        |       |
+     weight   length
+</span>
 (Note that the box weight argument, which is expressed in points,
 must NOT have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
-If you want the same box, but solid (&quot;filled&quot;) rather
-than drawn as an outline:
-
-<pre>
-    .DBX SOLID 1i 12P 6P
-</pre>
-
 <p>
+If you want the same box, but solid (&#8220;filled&#8221;) rather
+than drawn as an outline:
+<br/>
+<span class="pre-in-pp">
+  .DBX SOLID 1i 12P 6P
+</span>
 Additionally, if you want the box green:
-
-<pre>
-    .DBX .5 1i 12P 6P green
-     or
-    .DBX SOLID 1i 12P 6P green
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .DBX .5 1i 12P 6P green
+   or
+  .DBX SOLID 1i 12P 6P green
+</span>
 </p>
 
-<h3><u>How mom handles the positioning of boxes</u></h3>
+<h3 class="docs">How mom handles the positioning of boxes</h3>
 
 <p>
 Boxes are drawn from the baseline down, from left to right, and
-from the perimeter <em>inward</em>. &quot;From the perimeter
-inward&quot; means that if you request a box weight of six points,
+from the perimeter <i>inward</i>. &#8220;From the perimeter
+inward&#8221; means that if you request a box weight of six points,
 the 6-point rules used to draw the outline of the box fall entirely
-<em>within</em> the dimensions of the box.
+<i>within</i> the dimensions of the box.
 </p>
 
 <p>
-Furthermore, after the box is drawn, <strong>mom</strong> returns
-you to the current left margin, at the same vertical position
-on the page as when <strong>DBX</strong> was invoked.  In other
-words, <strong>DBX</strong> causes no movement on the page, either
-horizontal or vertical.
+Furthermore, after the box is drawn, mom returns you to the current
+left margin, at the same vertical position on the page as when DBX
+was invoked.  In other words, DBX causes no movement on the page,
+either horizontal or vertical.
 </p>
 
 <!-- -DCL- -->
 
-<hr width="33%" align="left"/>
-
-<a name="DCL"><h3><u>Drawing circles (ellipses)</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>DCL</strong> <kbd>&lt; &lt;rule weight&gt; | SOLID &gt; &lt;indent&gt; &lt;length&gt; &lt;depth&gt; [&lt;colour&gt;]</kbd></nobr>
+<div class="macro-id-overline">
+<h3 id="dcl" class="macro-id">Drawing circles (ellipses)</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>DCL</b> <kbd class="macro-args">&lt; &lt;weight&gt; | SOLID &gt; &lt;indent&gt; &lt;length&gt; &lt;depth&gt; [&lt;colour&gt;]</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;The argument to <kbd class="normal">&lt;weight&gt;</kbd> is in
+<a href="definitions.html#picaspoints" class="normal">points</a>,
+but do <span class="normal">NOT</span> append the
+<a href="definitions.html#unitsofmeasure">unit of measure</a>,
+<kbd class="normal">p</kbd>.
 <br/>
-
-<em>*The argument to</em> <kbd>&lt;rule weight&gt;</kbd> <em>is
-in</em>
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
-<em>but do </em> NOT <em>append the</em>
-<a href="definitions.html#TERMS_UNITSOFMEASURE">unit of
-measure</a>, <kbd>p</kbd>.
-<br/>
-
-<em>*The arguments,</em> <kbd>&lt;indent&gt;</kbd><em>,</em>
-<kbd>&lt;length&gt;</kbd> <em>and</em> <kbd>&lt;depth&gt;</kbd>
-<em>require a unit of measure.</em>
+&bull;&nbsp;The arguments, <kbd class="normal">&lt;indent&gt;</kbd>,
+<kbd class="normal">length</kbd> and
+<kbd class="normal">&lt;depth&gt;</kbd>, require a unit of measure.
 </p>
 
 <p>
 To draw circles of specified dimensions, you must, at a minimum,
-supply <strong>DCL</strong> with the arguments <kbd><nobr>rule
-weight</nobr></kbd> or <kbd>SOLID</kbd>, <kbd>indent</kbd>
-(measured from the current left margin), <kbd>length</kbd> and
-<kbd>depth</kbd>.
+supply DCL with the arguments <kbd>weight</kbd> or <kbd>SOLID</kbd>,
+<kbd>indent</kbd> (measured from the current left margin),
+<kbd>length</kbd> and <kbd>depth</kbd>.
 </p>
 
 <p>
-Optionally, you may give a <kbd>colour</kbd> argument.
-The colour may be either one defined with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>,
+Optionally, you may give a <kbd>colour</kbd> argument.  The colour
+may be either one defined with
+<a href="color.html#newcolor">NEWCOLOR</a>,
 or a named X-colour inititialized with
-<a href="color.html#XCOLOR">XCOLOR</a>,
-or an X-colour alias (again, initialized with
-<strong>XCOLOR</strong>).
+<a href="color.html#xcolor">XCOLOR</a>,
+or an X-colour alias (again, initialized with XCOLOR).
 </p>
 
 <p>
@@ -528,66 +518,67 @@
 (ellipse, actually, in this case) that starts one inch from the
 current left margin and has the dimensions 6 centimeters x 3
 centimeters.  To do so, you'd invoke <kbd>.DCL</kbd> like this:
-
-<pre>
-           indent  depth
-             |       |
-    .DCL .5  1i  6c  3c
-          |      |
-       weight   ength
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+         indent  depth
+           |       |
+  .DCL .5  1i  6c  3c
+        |      |
+     weight   ength
+</span>
 (Note that the box weight argument, which is expressed in points,
 must NOT have the unit of measure <kbd>p</kbd> appended to it.)
 </p>
 
-If you want the same box, but solid (&quot;filled&quot;) rather
-than drawn as an outline:
-
-<pre>
-    .DCL SOLID 1i 6c 3c
-</pre>
-
 <p>
+If you want the same box, but solid (&#8220;filled&#8221;) rather
+than drawn as an outline:
+<br/>
+<span class="pre-in-pp">
+  .DCL SOLID 1i 6c 3c
+</span>
 Additionally, if you want the circle yellow:
-
-<pre>
-    .DCL .5 1i 6c 3c yellow
-     or
-    .DCL SOLID 1i 6c 3c yellow
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .DCL .5 1i 6c 3c yellow
+   or
+  .DCL SOLID 1i 6c 3c yellow
+</span>
 </p>
 
-<h3><u>How mom handles the positioning of circles (ellipses)</u></h3>
+<h3 class="docs">How mom handles the positioning of circles (ellipses)</h3>
 
 <p>
 Circles (ellipses) are drawn from the baseline down, from left
-to right, and from the perimeter <em>inward</em>. &quot;From the
-perimeter inward&quot; means that if you request a box weight of six
-points, the 6-point rule used to draw the outline of the circle or
-ellipse falls entirely <em>within</em> the dimensions of the circle
-or ellipse.
+to right, and from the perimeter <i>inward</i>. &#8220;From the
+perimeter inward&#8221; means that if you request a circle weight of
+six points, the 6-point rule used to draw the outline of the circle
+or ellipse falls entirely <i>within</i> the dimensions of the
+circle or ellipse.
 </p>
 
 <p>
-Furthermore, after the circle is drawn, <strong>mom</strong> returns
-you to the current left margin, at the same vertical position
-on the page as when <strong>DCL</strong> was invoked.  In other
-words, <strong>DCL</strong> causes no movement on the page, either
-horizontal or vertical.
+Furthermore, after the circle is drawn, mom returns you to the
+current left margin, at the same vertical position on the page as
+when DCL was invoked.  In other words, DCL causes no movement on the
+page, either horizontal or vertical.
 </p>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="docprocessing.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="color.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="docprocessing.html#top">Next: Document processing</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/headfootpage.html groff-1.21/contrib/mom/momdoc/headfootpage.html
--- groff-1.20.1/contrib/mom/momdoc/headfootpage.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/headfootpage.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,206 +16,222 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Document processing: headers, footers and pagination</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Document processing, page headers/footers and pagination</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="rectoverso.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="docelement.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
-
-<a name="HEADFOOTPAGE"><h1 align="center"><u>Page headers, footers, and pagination</u></h1></a>
-
-<ul>
-    <li><a href="#HEADFOOTPAGE_INTRO">Introduction &mdash; VERY IMPORTANT; read me!</a></li>
-    <ul>
-        <li><a href="#PAGINATION_NOTE">An important note on pagination</a></li>
-    </ul>
-    <li><a href="#DESCRIPTION_GENERAL">General description of headers/footers</a></li>
-    <li><a href="#HEADER_STYLE">Default specs for headers/footers</a></li>
-    <li><a href="#VERTICAL_SPACING">Vertical placement and spacing of headers/footers</a></li>
-    <li><a href="#HEADFOOT_MANAGEMENT">Managing headers/footers</a> &mdash; see also <a href="#HEADFOOT_TOC">Control macros for headers/footers</a></li>
-    <ul>
-        <li><a href="#HEADERS">HEADERS</a> &mdash; on or off</li>
-        <li><a href="#FOOTERS">FOOTERS</a> &mdash; on or off</li>
-        <li><a href="#FOOTER_ON_FIRST_PAGE">FOOTER_ON_FIRST_PAGE</a></li>
-        <li><a href="#USERDEF_HDRFTR">User-defined, single string recto/verso headers/footers</a></li>
-        <ul>
-            <li><a href="#USERDEF_HDRFTR_INTRO">Introduction</a></li>
-            <li><a href="#HDRFTR_RECTOVERSO">HEADER_RECTO, HEADER_VERSO</a></li>
-            <li><a href="#RESERVED_STRINGS">Using mom's &quot;reserved&quot; strings in header/footer definitions</a>
-                (title, author, etc.)
-            </li>
-        </ul>
-        <li><a href="#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>
-            &mdash; putting both headers and footers on document pages
-        </li>
-    </ul>
-    <a name="HEADFOOT_TOC"></a>
-    <li><a href="#HEADFOOT_CONTROL">Control macros for headers/footers</a></li>
-    <ul>
-        <li><a href="#HDRFTR_STRINGS">Header/footer strings</a></li>
-        <ul>
-            <li><a href="#RESERVED_STRINGS">Using mom's &quot;reserved&quot; strings in header/footer definitions</a>
-                (title, author, etc.)
-            </li>
-        </ul>
-        <li><a href="#HDRFTR_STYLE">Header/footer style</a></li>
-        <ul>
-            <li><a href="#HDRFTR_STYLE_GLOBAL">Global style control</a></li>
-            <li><a href="#HDRFTR_STYLE_PART">Part-by-part style control</a></li>
-        </ul>
-        <li><a href="#HDRFTR_VERTICAL">Vertical placement and spacing of headers/footers</a></li>
-        <ul>
-            <li><a href="#HDRFTR_MARGIN">HEADER_MARGIN</a></li>
-            <li><a href="#HDRFTR_GAP">HEADER_GAP</a></li>
-        </ul>
-        <li><a href="#HDRFTR_SEPARATOR">The header/footer separator rule</a></li>
-        <ul>
-            <li><a href="#HDRFTR_RULE">HEADER_RULE</a> &mdash; on or off</li>
-            <li><a href="#HDRFTR_RULE_WEIGHT">HEADER_RULE_WEIGHT</a> &mdash; weight of the rule</li>
-            <li><a href="#HDRFTR_RULE_GAP">HEADER_RULE_GAP</a> &mdash; distance of rule from header/footer</li>
-            <li><a href="#HDRFTR_RULE_COLOR">HEADER_RULE_COLOR</a> &mdash; colour of the header/footer rule</li>
-        </ul>
-    </ul>
-    <li><a href="#PAGINATION">Pagination</a></li>
-    <ul>
-        <li><a href="#INDEX_PAGINATION">Pagination control macros</a></li>
-    </ul>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="rectoverso.html#top">Next: Recto/verso printing, collating</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Page headers/footers, pagination</h1>
+
+<div style="text-align: center;">
+<ul class="no-enumerator" style="margin-left: -2.5em;">
+  <li><a href="#headfootpage-intro">Introduction &ndash; VERY IMPORTANT; read me!</a></li>
+  <li> <a href="#pagination-note">An important note on pagination</a></li>
+  <li><a href="#description-general">General description of headers/footers</a></li>
+  <li><a href="#header-style">Default specs for headers/footers</a></li>
+  <li><a href="#vertical-spacing">Vertical placement and spacing of headers/footers</a></li>
 </ul>
+</div>
 
-<a name="HEADFOOTPAGE_INTRO"><h2><u>Introduction</u></h2></a>
+<div class="rule-medium"><hr/></div>
 
-<p>
-<a href="definitions.html#TERMS_HEADER">Headers</a>
-and
-<a href="definitions.html#TERMS_FOOTER">footers</a>,
-as defined in the section
-<a href="definitions.html#TERMS_MOM">Mom's Document Processing Terms</a>,
-are those parts of a document that contain information about the document
-itself which appear in the margins either above or below
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-They are, in all respects but two, identical.  The differences are:
+<h2 id="toc-doc-head-foot-page" class="docs" style="text-align: center;">Table of contents</h2>
 
-<ol>
-    <li>headers appear in the margin <em>above</em> running text while
-        footers appear in the margin <em>beneath</em> running text;
-    </li>
-    <li>the (optional) rule that separates headers from running
-        text appears <em>below</em> the header while
-        the (optional) rule that separates footers from running
-        text appears <em>above</em> the footer.
-    </li>
-</ol>
-</p>
+<h3 class="toc toc-docproc-header" style="margin-top: 1em;"><a class="header-link" href="#headfoot-management">Managing page headers and footers</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#headers">HEADERS</a> &ndash; on or off</li>
+  <li><a href="#footers">FOOTERS</a> &ndash; on or off</li>
+  <li><a href="#footer-on-first-page">FOOTER_ON_FIRST_PAGE</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#headfoot-control">Control macros for headers/footers</a></h3>
+  <ul class="toc-docproc" style="margin-top: .5em;">
+    <li><a href="#index-headfoot-control">Header/footer control macros and defaults</a>
+  <ul class="toc-docproc">
+    <li><a href="#hdrftr-strings">Header/footer strings</a>
+    <ul class="toc-docproc">
+      <li><a href="#reserved-strings">Using mom&#8217;s reserved strings in header/footer definitions</a> (TITLE, AUTHOR, etc.)</li>
+    </ul></li>
+    <li><a href="#hdrftr-style">Header/footer style</a>
+    <ul class="toc-docproc">
+      <li><a href="#hdrftr-style-global">Global changes</a></li>
+      <li><a href="#hdrftr-style-part">Part-by-part changes</a></li>
+    </ul></li>
+    <li><a href="#hdrftr-vertical">Vertical placement and spacing of headers/footers</a>
+    <ul class="toc-docproc">
+      <li><a href="#hdrftr-margin">HEADER_MARGIN&nbsp;/&nbsp;FOOTER_MARGIN</a>
+      <ul class="toc-docproc no-enumerator" style="margin-left: -2em;">
+        <li>&ndash;&nbsp;<a href="#footer-margin">Important: FOOTER_MARGIN and bottom margins</a></li>
+      </ul></li>
+    </ul></li>
+    <li><a href="#hdrftr-separator">The header/footer separator rule</a>
+    <ul class="toc-docproc">
+      <li><a href="#hdrftr-rule">HEADER_RULE</a> &ndash; on or off</li>
+      <li><a href="#hdrftr-rule-weight">HEADER_RULE_WEIGHT</a> &ndash; weight of the rule</li>
+      <li><a href="#hdrftr-rule-gap">HEADER_RULE_GAP</a> &ndash; distance of rule from header/footer</li>
+      <li><a href="#hdrftr-rule-color">HEADER_RULE_COLOR</a> &ndash; colour of the header/footer rule</li>
+    </ul></li>
+  </ul></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#userdef-hdrftr-rv">User-defined, single string recto/verso headers/footers</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#hdrftr-recto">HEADER_RECTO, HEADER_VERSO</a>
+  <ul style="margin-left: -.5em">
+    <li><a href="#userdef-hdrftr">User-defined, single string headers/footers (no recto/verso)</a></li>
+    <li><a href="#padding-hdrftr">Padding the header-recto/header-verso string</a></li>
+  </ul></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#headers-and-footers-intro">Headers and footers on the same page</a></h3>
+<h3 class="toc toc-docproc-header" style="margin-top: .75em;"><a class="header-link" href="#pagination-intro">Pagination</a></h3>
+<ul class="toc-docproc" style="margin-top: .5em;">
+  <li><a href="#index-pagination">Pagination macros</a></li>
+  <li><a href="#index-pagination-control">Pagination control macros and defaults</a></li>
+</ul>
+<h3 class="toc toc-docproc-header"><a class="header-link" href="#blank-pages">Inserting blank pages into a document</a></h3>
 
-<a name="HEADERFOOTER"></a>
+<div class="rule-medium" style="margin-top: 1.5em;"><hr/></div>
 
-<p>
+<h2 id="headfootpage-intro" class="macro-group">Managing page headers and footers</h2>
+
+<div id="headerfooter" class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
 Because headers and footers are virtually identical, this
 documentation addresses itself only to headers.  In all cases,
-unless otherwise noted, descriptions of headers describe footers
-as well.
+unless otherwise noted, descriptions of headers describe footers as
+well.
 </p>
 
-<p>
+<p class="tip-bottom">
 Furthermore, any
-<a href="definitions.html#TERMS_CONTROLMACRO">control macro</a>
-that begins with <strong>HEADER_</strong> may be used to control
-footers, simply by replacing <strong>HEADER_</strong> with
-<strong>FOOTER_</strong>.
+<a href="definitions.html#controlmacro">control macro</a>
+that begins with HEADER_ may be used to control footers, simply by
+replacing HEADER_ with FOOTER_.
 </p>
+</div>
 
-<p>
-<strong>Author's note:</strong> Left to their own devices (i.e. if
-you're happy with the way <strong>mom</strong> does things by default),
-headers are something you never have to worry about.  You can skip
-reading this section entirely.  But if you want to change them, be
-advised that headers have more macros to control their appearance than
-any other document element.  The text of this documentation becomes
-correspondingly dense at this point.
+<p style="margin-top: -.75em;">
+<a href="definitions.html#header">Headers</a>
+and
+<a href="definitions.html#footer">footers</a>,
+as defined in the section
+<a href="definitions.html#mom">Mom&#8217;s Document Processing Terms</a>,
+are those parts of a document that contain information about the document
+itself which appear in the margins either above or below
+<a href="definitions.html#running">running text</a>.
+They are, in all respects but two, identical.  The differences are:
 </p>
+<ol style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>headers appear in the margin <i>above</i> running text while
+      footers appear in the margin <i>beneath</i> running text;
+  </li>
+  <li>the (optional) rule that separates headers from running
+      text appears <i>below</i> the header while
+      the (optional) rule that separates footers from running
+      text appears <i>above</i> the footer.
+  </li>
+</ol>
 
-<a name="PAGINATION_NOTE"></a>
-
-<p>
-<strong>NOTE:</strong> While the single page number that
-<strong>mom</strong> generates in either the top or bottom margin
-above or below running text is technically a kind of header/footer,
-<strong>mom</strong> and this documentation treat it as a
-separate page element.
+<div id="pagination-note" class="box-tip" style="margin-top: 1.5em;">
+<p class="tip">
+<span class="note">Note:</span>
+While the single page number that mom generates in either the top
+or bottom margin above or below running text is technically a kind
+of header/footer, mom and this documentation treat it as a separate
+page element.
+</p>
+</div>
+
+<div id="author-note" class="box-tip">
+<p class="tip">
+<span class="note">Author's note:</span>
+Left to their own devices (i.e. if you&#8217;re happy with the way
+mom does things by default), headers are something you never have to
+worry about.  You can skip reading this section entirely.  But if
+you want to change them, be advised that headers have more macros to
+control their appearance than any other document element.  The text
+of this documentation becomes correspondingly dense at this point.
 </p>
+</div>
 
-<a name="DESCRIPTION_GENERAL"><h3><u>General description of headers/footers</u></h3></a>
+<h3 id="description-general" class="docs">General description of headers/footers</h3>
 
 <p>
 Headers comprise three distinct parts: a left part, a centre part,
-and a right part.  Each part contains text (a &quot;string&quot;)
+and a right part.  Each part contains text (a &#8220;string&#8221;)
 that identifies some aspect of the document as a whole.
 </p>
 
 <p>
-The left part (&quot;header left&quot;) lines up with the document's
-left margin.  The centre part (&quot;header centre&quot;) is
-centred on the document's line length.  The right part (&quot;header
-right&quot;) lines up with the document's right margin.  Not all parts
-need contain a string, and if you don't want headers at all, you can
-turn them off completely.
-</p>
-
-<p>
-<strong>A note to groff experts:</strong> Although
-<strong>mom</strong>'s headers resemble the three-part titles
-generated by <kbd>.tl</kbd>, they're in no way related to
-it, nor based upon it. <kbd>.tl</kbd> is not used at all in
-<strong>mom</strong>.
-</p>
-
-<p>
-Normally, <strong>mom</strong> fills headers with strings appropriate
-to the document type selected with
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>.
-You can, however, supply whatever strings you like &mdash; including
-page numbers &mdash; to go in any part of headers.  What's more,
+&#8221;The left part (&#8220;header-left) lines up with the
+document&#8217;s left margin.  The centre part (&#8220;header
+centre&#8220;) is centred on the document&#8217;s line length.
+&#8221;The right part (&#8220;header-right) lines up with the
+document&#8217;s right margin.  Not all parts need contain a string,
+and if you don&#8217;t want headers at all, you can turn them off
+completely.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note to groff experts:</span>
+Although mom&#8217;s headers resemble the three-part titles
+generated by <kbd>.tl</kbd>, they&#8217;re in no way related to it,
+nor based upon it. <kbd>.tl</kbd> is not used at all in mom.
+</p>
+</div>
+
+<p>
+Normally, mom fills headers with strings appropriate to the document
+type selected with
+<a href="docprocessing.html#doctype">DOCTYPE</a>.
+You can, however, supply whatever strings you like&mdash;including
+page numbers&mdash;to go in any part of headers.  What&#8217;s more,
 you can set the family, font, size, colour and capitalization style
 (caps or caps/lower-case) for each header part individually.
 </p>
 
 <p>
-By default, <strong>mom</strong> prints a horizontal rule beneath
-headers to separate them visually from running text.  In the case of
-footers, the rule is <em>above</em> running text.  You can increase
-or decrease the space between the header and the rule if you like
-(with
-<a href="#HDRFTR_RULE_GAP">HEADER_RULE_GAP</a>),
+By default, mom prints a horizontal rule beneath headers to separate
+them visually from running text.  In the case of footers, the rule
+is above.  You can increase or decrease the space between the header
+and the rule if you like (with
+<kbd><a href="#hdrftr-rule-gap">HEADER_RULE_GAP</a></kbd>),
 or remove it completely.
 </p>
 
-<a name="HEADER_STYLE"><h3><u>Default specs for headers/footers</u></h3></a>
+<h3 id="header-style" class="docs">Default specs for headers/footers</h3>
 
 <p>
-<strong>Mom</strong> makes small type adjustments to each part of
-the header (left, centre, right) to achieve an aesthetically
-pleasing result.  The defaults are listed below.  (The strings
-<strong>mom</strong> puts by default in each part are explained in
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>.)
+Mom makes small type adjustments to each part of the header (left,
+centre, right) to achieve an aesthetically pleasing result.  The
+defaults are listed below.  (The strings mom puts by default in each
+part are explained in
+<a href="docprocessing.html#doctype">DOCTYPE</a>.)
 </p>
 
-<p>
-<strong>NOTE:</strong> Except for capitalization (all caps or
-caps/lower-case), these defaults apply only to
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>.
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px; padding-bottom: 6px; text-align: center;">
+<i>Note:</i> Except for capitalization (all caps or caps/lower-case),
+these defaults apply only to
+<a href="docprocessing.html#printstyle">PRINTSTYLE&nbsp;<kbd>TYPESET</kbd></a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 TYPE SPEC    HEADER LEFT         HEADER CENTER       HEADER RIGHT
 ---------    -----------         -------------       ------------
 Family       document default    document default    document default
@@ -226,204 +242,213 @@
             (-2 if all caps)    (-2 if all caps)    (-.5 if not all caps)
 
 *Relative to the point size of type in paragraphs
-</pre>
+</span>
+</div>
 
-<p>
+<p style="margin-top: -1.5em;">
 You can, of course, change any of the defaults using the appropriate
 control macros.  And should you wish to design headers from the
-ground up, <strong>mom</strong> has a special macro,
-<a href="#HDRFTR_PLAIN">HEADER_PLAIN</a>,
+ground up, mom has a special macro,
+<a href="#hdrftr-plain">HEADER_PLAIN</a>,
 that removes all type adjustments to headers.  The straightforward
 type specs for paragraphs are used instead, providing a simple
 reference point for any alterations you want to make to the family,
 font, size and capitalization style of any header part.
 </p>
 
-<a name="VERTICAL_SPACING"><h3><u>Vertical placement and spacing of headers/footers</u></h3></a>
+<h3 id="vertical-spacing" class="docs">Vertical placement and spacing of headers/footers</h3>
 
 <p>
-As explained in the section on
-<a href="typemacdoc.html">typesetting macros in document processing</a>,
-the top and bottom margins of a <strong>mom</strong> document
-are the vertical start and end positions of
-<a href="definitions.html#TERMS_RUNNING">running text</a>,
+As explained in the section,
+<a href="docprocessing.html#behaviour">Typesetting macros during document processing</a>,
+the top and bottom margins of a mom document are the vertical start
+and end positions of
+<a href="definitions.html#running">running text</a>,
 not the vertical positions of headers or footers, which, by definition,
-appear in the margins <em>above</em> (or below) running text.
+appear in the margins above (or below) running text.
 </p>
 
 <p>
-The vertical placement of headers
-is controlled by the macro
-<a href="#HDRFTR_MARGIN">HEADER_MARGIN</a>,
+The vertical placement of headers is controlled by the macro
+<a href="#hdrftr-margin">HEADER_MARGIN</a>,
 which establishes the
 <a href="definitions.html">baseline</a>
-position of headers relative to the <em>top</em> edge of the page.
-The header rule, whose position is relative to the header itself,
-is controlled by a separate macro.
-<strong>FOOTER_MARGIN</strong> establishes the baseline position of
-footers relative to the <em>bottom</em> edge of the page.
+position of headers relative to the top edge of the page.  The
+header rule, whose position is relative to the header itself, is
+controlled by a separate macro.
 </p>
 
 <p>
-<a href="#HDRFTR_GAP">HEADER_GAP</a>
-establishes the distance between headers and the <em>start</em>
-of running text (effectively making <strong>HEADER_MARGIN +
-HEADER_GAP</strong> the top margin of running text unless you give
-<strong>mom</strong> a literal top margin (with
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>),
-in which case she ignores <strong>HEADER_GAP</strong> and starts
-running text at whatever top margin you gave.
-<strong>FOOTER_GAP</strong> and
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>
-work similarly, except they determine where running text
-<em>ends</em> on the page.  (See
-<a href="#FOOTER_MARGIN">FOOTER MARGIN AND BOTTOM MARGIN &mdash; VERY IMPORTANT!</a>
+FOOTER_MARGIN is the counterpart to HEADER_MARGIN, and establishes
+the baseline position of footers relative to the bottom edge of the
+page.
+</p>
+
+<p>
+The distance between headers and the start
+of running text can be controlled with the macro,
+<a href="#hdrftr-gap">HEADER_GAP</a>
+(effectively making HEADER_MARGIN + HEADER_GAP the top margin of
+running text unless you give mom a literal top margin (with
+<a href="typesetting.html#t-margin">T_MARGIN</a>),
+in which case she ignores HEADER_GAP and begins the running text at
+whatever top margin you give.
+</p>
+
+<p>
+FOOTER_GAP and
+<a href="typesetting.html#b-margin">B_MARGIN</a>
+work similarly, except they determine where running text <i>ends</i>
+on the page.  (See
+<a href="#footer-margin">Important &ndash; footer margin and bottom margins</a>
 for a warning about possible conflicts between the footer margin and
 the bottom margin.)
 </p>
 
 <p>
-Confused?  <strong>Mom</strong> apologizes.  It's really quite
-simple.  By default, <strong>mom</strong> sets headers 4-1/2
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>
-down from the top of the page and starts running text 3 picas (the
-<strong>HEADER_GAP</strong>) beneath that, which means the effective
-top margin of running text is 7-1/2 picas (visually approx. 1 inch).
-If you give <strong>mom</strong> a literal top margin (with
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>),
-she ignores the <strong>HEADER_GAP</strong> and starts running
-text at whatever top margin you gave.
+Confused?  Mom apologizes.  It&#8217;s really quite simple.  By
+default, mom sets headers 4-1/2
+<a href="definitions.html#picaspoints">picas</a>
+down from the top of the page and begins the running text 3 picas
+(the HEADER_GAP) beneath that, which means the effective top margin
+of the running text is 7-1/2 picas (visually approx. 1 inch).
+However, if you give mom a literal top margin (with
+<a href="typesetting.html#t-margin">T_MARGIN</a>),
+she ignores the HEADER_GAP and starts the running text at whatever
+top margin you give.
 </p>
 
 <p>
-Footers are treated the same way, the only difference being the
-default distances. <strong>Mom</strong> sets footers 3 picas up from
-the bottom of the page, and interrupts the processing of running
-text 3 picas (the <strong>FOOTER_GAP</strong>) above that (again,
-visually approx. 1 inch).  If you give <strong>mom</strong> a
-literal bottom margin (with
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>),
-she ignores the <strong>FOOTER_GAP</strong> and interrupts the
-processing of running text at whatever bottom margin you gave.
+Footers are treated similarly.  Mom sets footers 3 picas up from the
+bottom of the page, and interrupts the processing of running text 3
+picas (the FOOTER_GAP) above that (again, visually approx. 1 inch).
+However, if you give mom a literal bottom margin (with
+<a href="typesetting.html#b-margin">B_MARGIN</a>),
+she ignores the FOOTER_GAP and interrupts the processing of running
+text at whatever bottom margin you give.
 </p>
 
 <p>
-If <strong>mom</strong> is paginating your document (she
-does, by default, at the bottom of each page), the vertical
-spacing and placement of page numbers, whether at the top
-or the bottom of the page, is managed exactly as if the
-page numbers were headers (or footers), and are controlled
-by the same macros.  See
-<a href="#PAGINATION">Pagination control</a>.
+If mom is paginating your document (she does, by default, at the
+bottom of each page), the vertical spacing and placement of page
+numbers, whether at the top or the bottom of the page, is managed
+exactly as if the page numbers were headers (or footers), and are
+controlled by the same macros.  See
+<a href="#pagination">Pagination control</a>.
 </p>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ======================================================================== -->
 
-<a name="HEADFOOT_MANAGEMENT"><h2><u>Managing headers/footers</u></h2></a>
-
-<h3><u>Macro list</u></h3>
-
-<ul>
-    <li><a href="#HEADERS">HEADERS</a> &mdash; on or off</li>
-    <li><a href="#FOOTERS">FOOTERS</a> &mdash; on or off</li>
-    <li><a href="#FOOTER_ON_FIRST_PAGE">FOOTER_ON_FIRST_PAGE</a></li>
-    <li><a href="#USERDEF_HDRFTR">User-defined, single string recto/verso headers/footers</a></li>
-    <ul>
-        <li><a href="#USERDEF_HDRFTR_INTRO">Introduction</a></li>
-        <li><a href="#HDRFTR_RECTOVERSO">HEADER_RECTO, HEADER_VERSO</a></li>
-        <li><a href="#RESERVED_STRINGS">Using mom's &quot;reserved&quot; strings in header/footer definitions</a>
-            (title, author, etc.)
-        </li>
-    </ul>
-    <li><a href="#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>
-        &mdash; putting both headers and footers on document pages
-    </li>
-    <li><a href="#HEADFOOT_CONTROL">Header and footer control macros</a></li>
-</ul>
+<h2 id="headfoot-management" class="macro-group">Managing headers/footers</h2>
 
 <p>
 The following are the basic macros for turning
-<a href="definitions.html#TERMS_HEADER">headers</a>
+<a href="definitions.html#header">headers</a>
 or
-<a href="definitions.html#TERMS_FOOTER">footers</a>
+<a href="definitions.html#footer">footers</a>
 on or off.  They should be invoked prior to
-<a href="docprocessing.html#START">START</a>.
+<a href="docprocessing.html#start">START</a>.
 </p>
 
 <p>
-By default, <strong>mom</strong> prints page headers.  If you turn
-them off, she will begin
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+By default, mom prints page headers.  If you turn
+them off, she will begin the
+<a href="definitions.html#running">running text</a>
 on each page with a default top margin of 6
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>
+<a href="definitions.html#picaspoints">picas</a>
 unless you have requested a different top margin (with
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>)
+<a href="typesetting.html#t-margin">T_MARGIN</a>)
 prior to
-<a href="docprocessing.html#START">START</a>.
+<a href="docprocessing.html#start">START</a>.
 </p>
 
-<p>
-Please note that
-<a href="#HEADERS">HEADERS</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<a href="#headers">HEADERS</a>
 and
-<a href="#FOOTERS">FOOTERS</a>
-are mutually exclusive.  If headers are on, footers (but NOT
+<a href="#footers">FOOTERS</a>
+are mutually exclusive.  If headers are on, footers (but not
 bottom-of-page numbering) are automatically turned off.  Equally,
-if footers are on, headers (but NOT top-of-page numbering) are
-automatically turned off.  Thus, if you'd prefer footers in a
+if footers are on, headers (but not top-of-page numbering) are
+automatically turned off.  Thus, if you&#8217;d prefer footers in a
 document, you need only invoke
-<a href="#FOOTERS"><kbd>.FOOTERS</kbd></a>;
-there's no need to turn headers off first.
+<kbd><a href="#footers">.FOOTERS</a></kbd>;
+there&#8217;s no need to turn headers off first.
 </p>
+</div>
 
 <p>
-If you need both headers and footers, there's a special macro,
-<a href="#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-that allows you to set this up.
-</p>
+If you need both headers and footers, there&#8217;s a special macro,
+<a href="#headers-and-footers">HEADERS_AND_FOOTERS</a>,
+that allows you to set it up.
+</p>
+
+<div class="macro-list-container">
+<h3 id="index-hdrftr" class="macro-list">Header/footer macros</h3>
+<ul class="macro-list">
+  <li><a href="#headers">HEADERS</a> &ndash; on or off</li>
+  <li><a href="#footers">FOOTERS</a> &ndash; on or off</li>
+  <li><a href="#footer-on-first-page">FOOTER_ON_FIRST_PAGE</a></li>
+  <li><a href="#userdef-hdrftr-rv">User-defined, single string recto/verso headers/footers</a>
+  <ul>
+    <li><a href="#hdrftr-rectoverso">HEADER_RECTO, HEADER_VERSO</a>
+    <ul style="margin-left: -.5em;">
+      <li><a href="#userdef-hdrftr">User-defined, single string headers/footers (no recto/verso)</a></li>
+    </ul></li>
+    <li><a href="#reserved-strings">Using mom&#8217;s reserved strings in header/footer definitions</a>
+        (title, author, etc.)
+    </li>
+  </ul></li>
+  <li><a href="#headers-and-footers-intro">HEADERS_AND_FOOTERS</a> &ndash;
+       putting both headers and footers on document pages
+  </li>
+  <li><a href="#headfoot-control">Header and footer control macros</a></li>
+</ul>
+</div>
 
 <!-- -HEADERS- -->
 
-<hr width="66%" align="left"/>
-
-<a name="HEADERS"></a>
-
-<p>
-<nobr>Macro: <strong>HEADERS</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 class="macro-id">Headers</h3>
+</div>
+
+<div id="headers" class="box-macro-args">
+Macro: <b>HEADERS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<a href="definitions.html#TERMS_HEADER">Page headers</a>
-are on by default.  If you don't want them, turn them off by
-invoking <kbd>.HEADERS</kbd> with any argument (<strong>OFF, QUIT,
-END, X...</strong>), e.g.
-
-<pre>
+<a href="definitions.html#header">Page headers</a>
+are on by default.  If you don&#8217;t want them, turn them off by
+invoking <kbd>.HEADERS</kbd> with any argument (<b>OFF, QUIT,
+END, X...</b>), e.g.
+<br/>
+<span class="pre-in-pp">
     .HEADERS OFF
-</pre>
+</span>
 </p>
 
 <p>
-<strong>NOTE:</strong> <strong>HEADERS</strong> automatically
+<b>NOTE:</b> HEADERS automatically
 disables 
-<a href="definitions.html#TERMS_FOOTER">footers</a>
-(you can't have both), but not the page numbers that normally
+<a href="definitions.html#footer">footers</a>
+(you can&#8217;t have both), but not the page numbers that normally
 appear at the bottom of the page.
 </p>
 
 <p>
-<strong>ADDITIONAL NOTE:</strong> If <strong>HEADERS</strong>
-are <strong>OFF</strong>, <strong>mom</strong>'s normal top
+<b>ADDITIONAL NOTE:</b> If HEADERS
+are OFF, mom&#8217;s normal top
 margin for
-<a href="definitions.html#TERMS_RUNNING">running text</a>
+<a href="definitions.html#running">running text</a>
 (7.5
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>)
+<a href="definitions.html#picaspoints">picas</a>)
 changes to 6 picas (visually approx. 1 inch).  This does NOT apply
 to the situation where footers have been explicitly turned on
 (with
-<a href="#FOOTERS">FOOTERS</a>).
+<kbd><a href="#footers">FOOTERS</a></kbd>).
 Explicitly invoking footers moves page numbering to the
 top of the page, where its placement and spacing are the same as
 for headers.  (I.e. the top margin of running text remains 7.5
@@ -432,1825 +457,1731 @@
 
 <!-- -FOOTERS- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="footers" class="macro-id">Footers</h3>
+</div>
 
-<a name="FOOTERS"></a>
+<div class="box-macro-args">
+Macro: <b>FOOTERS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>FOOTERS</strong> <kbd>toggle</kbd></nobr>
-</p>
-
-<p>
-<a href="definitions.html#TERMS_FOOTER">Page footers</a>
+<a href="definitions.html#footer">Page footers</a>
 are off by default.  If you want them instead of
-<a href="definitions.html#TERMS_HEADER">headers</a>
-(you can't have both), turn them on by invoking
+<a href="definitions.html#header">headers</a>
+(you can&#8217;t have both), turn them on by invoking
 <kbd>.FOOTERS</kbd> without an argument, e.g.
-
-<pre>
+<br/>
+<span class="pre-in-pp">
     .FOOTERS
-</pre>
+</span>
 </p>
 
 <p>
-<strong>FOOTERS</strong> automatically disables headers, and
-<strong>mom</strong> shifts the placement of page numbers from their
+FOOTERS automatically disables headers, and
+mom shifts the placement of page numbers from their
 normal position at page bottom to the top of the page.
 </p>
 
 <p>
-<strong>NOTE:</strong> By default, when footers are on,
-<strong>mom</strong> does not print a page number on the first
+<b>NOTE:</b> By default, when footers are on,
+mom does not print a page number on the first
 page of a document, nor on first pages after
-<a href="rectoverso.html#COLLATE">COLLATE</a>.
-If you don't want this behaviour, you can change it with
-<a href="#PAGENUM_ON_FIRST_PAGE">PAGENUM_ON_FIRST_PAGE</a>.
+<a href="rectoverso.html#collate">COLLATE</a>.
+If you don&#8217;t want this behaviour, you can change it with
+<kbd><a href="#pagenum-on-first-page">PAGENUM_ON_FIRST_PAGE</a></kbd>.
 </p>
 
 <!-- -FOOTER_ON_FIRST_PAGE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="FOOTER_ON_FIRST_PAGE"></a>
-
-<p>
-<nobr>Macro: <strong>FOOTER_ON_FIRST_PAGE</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="footer-on-first-page" class="macro-id">Footer on first page</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>FOOTER_ON_FIRST_PAGE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 If you invoke
-<a href="#FOOTERS"><kbd>.FOOTERS</kbd></a>,
-<strong>mom</strong>, by default, does not print a footer on the
+<a href="#footers"><kbd>.FOOTERS</kbd></a>,
+mom, by default, does not print a footer on the
 first page of the document.  (The
 <a href="definitions.html">docheader</a>
 on page 1 makes it redundant.)  However, should you wish a footer on
 page 1, invoke <kbd>.FOOTER_ON_FIRST_PAGE</kbd> without any argument.
 </p>
 
-<hr/>
-
-<!-- -USERDEF_HDRFTR- -->
-
-<a name="USERDEF_HDRFTR"><h2><u>User-defined, single string recto/verso headers/footers</u></h2></a>
+<div class="rule-short"><hr/></div>
 
-<a name="USERDEF_HDRFTR_INTRO"><h3><u>Introduction</u></h3></a>
+<h2 id="headfoot-control" class="macro-group">Control macros for headers/footers</h2>
 
 <p>
-Sometimes, you'll find you can't get <strong>mom</strong>'s handling
-of 3-part headers or footers to do exactly what you want in the
-order you want.  This is most likely happen when you want the
-information contained in the headers/footers split over two pages,
-as is often the case with recto/verso documents.
+Virtually every part of headers (and footers; see the note on how
+<a href="#headerfooter">&#8220;headers&#8221; means &#8220;footers&#8221;</a>
+in the
+<a href="#headfootpage-intro">Introduction</a>
+to headers/footers) can be designed to your own specifications.
 </p>
 
-<p>
-Say, for example, you want recto page headers to contain a
-document's author, centred, and verso page headers to contain the
-document's title, also centred, like this:
+<div class="macro-list-container">
+<h3 id="index-headfoot-control" class="macro-list">Header/footer control macros and defaults</h3>
 
-<pre>
-    +------------------------+   +------------------------+     
-    |         Author         |   |         Title          |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    +------------------------+   +------------------------+     
-</pre>
-</p>
+<ol style="margin-top: -1.5em; padding-bottom: 6px;">
+  <li><a href="#hdrftr-strings">Header/footer strings</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#hdrftr-left">HEADER_LEFT</a></li>
+    <li><a href="#hdrftr-centre">HEADER_CENTER</a>
+    <ul style="margin-left: -.5em;">
+      <li><a href="#hdrftr-centre-pad">Padding the header-centre string</a></li>
+    </ul></li>
+    <li><a href="#hdrftr-right">HEADER_RIGHT</a></li>
+    <li><a href="#reserved-strings">Using mom&#8217;s reserved strings in header/footer definitions</a>
+        (e.g. <kbd>\E*[$TITLE]</kbd> when you want
+        <br/>
+        the title, <kbd>\E*[$AUTHOR]</kbd> when you want the author, etc.)
+    </li>
+    <li><a href="#page-number-symbol">Replacing header-left, centre or right with the page number</a></li>
+    <li><a href="#page-number-incl">Including the  page number in header-left, centre or right</a></li>
+  </ul></li>
+  <li><a href="#hdrftr-style">Header/footer style</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#hdrftr-style-global">Global changes</a>
+    <ul style="margin-left: -.5em;">
+      <li><a href="#hdrftr-global-family">HEADER_FAMILY</a> &ndash; family for entire header</li>
+      <li><a href="#hdrftr-global-size">HEADER_SIZE</a> &ndash; size for entire header</li>
+      <li><a href="#hdrftr-plain">HEADER_PLAIN</a> &ndash; disable default adjustments to header parts</li>
+      <li><a href="#hdrftr-color">HEADER_COLOR</a> &ndash; colourize the header</li>
+    </ul></li>
+    <li><a href="#hdrftr-style-part">Part-by-part changes</a>
+    <ul style="margin-left: -.5em;">
+      <li><a href="#_family">_FAMILY</a> &ndash; left, centre or right family</li>
+      <li><a href="#_font">_FONT</a> &ndash; left, centre or right font</li>
+      <li><a href="#_size">_SIZE</a> &ndash; left, centre or right size</li>
+      <li><a href="#_caps">_CAPS</a> &ndash; left, centre or right all caps</li>
+      <li><a href="#_color">_COLOR</a> &ndash; left, centre or right colour</li>
+    </ul></li>
+  </ul></li>
+  <li><a href="#hdrftr-vertical">Header/footer vertical placement and spacing</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#hdrftr-margin">HEADER_MARGIN</a></li>
+    <li><a href="#hdrftr-gap">HEADER_GAP</a></li>
+  </ul></li>
+  <li><a href="#hdrftr-separator">Header/footer separator rule</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#hdrftr-rule">HEADER_RULE</a></li>
+    <li><a href="#hdrftr-rule-weight">HEADER_RULE_WEIGHT</a></li>
+    <li><a href="#hdrftr-rule-gap">HEADER_RULE_GAP</a></li>
+    <li><a href="#hdrftr-rule-color">HEADER_RULE_COLOR</a></li>
+  </ul></li>
+</ol>
+</div>
 
-<p>
-With <strong>mom</strong>'s standard 3-part headers, this isn't
-possible, even when
-<a href="rectoverso.html#RECTO_VERSO">RECTO_VERSO</a>
-is enabled.  <strong>RECTO_VERSO</strong> switches the left and
-right parts of headers on alternate pages, but the centre
-part remains unchanged.
-</p>
+<!-- -HDRFTR_STRINGS- -->
 
-<p>
-Any time you need distinctly different headers on alternate
-pages, <strong>mom</strong> has macros that let you manually
-design and determine what goes into headers on recto pages, and
-what goes into headers on verso pages.  The macros are
-<a href="#HDRFTR_RECTOVERSO">HEADER_RECTO</a>
-and
-<a href="#HDRFTR_RECTOVERSO">HEADER_VERSO</a>.
-Both allow you to state whether the header is flush left, centred,
-or flush right, and both take a single
-<a href="definitions.html#TERMS_STRINGARGUMENT">string argument</a>
-with which, by combining text and
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
-you can make the headers come out just about any way you want.
-Use of the <kbd>\*[PAGE#]</kbd> escape is permitted in the string
-argument (see
-<a href="#PAGE_NUMBER_INCL">Including the page number in header-left, -centre or -right</a>),
-and as an added bonus, <strong>mom</strong> provides a special
-mechanism whereby it's possible to &quot;pad&quot; the string as
-well.
-</p>
+<h4 id="hdrftr-strings" class="docs">1. Header/footer strings</h4>
 
-<!-- -HDRFTR_RECTOVERSO- -->
+<div id="hdrftr-left" class="box-macro-args" style="margin-top: 1em;">
+&#8221;Macro: <b>HEADER_LEFT</b> <kbd class="macro-args">&#8220;&lt;text of header-left&gt; | #</kbd>
+</div>
 
-<hr width="66%" align="left"/>
+<div id="hdrftr-centre" class="box-macro-args" style="margin-top: 1em;">
+&#8221;Macro: <b>HEADER_CENTER</b> <kbd class="macro-args">&#8220;&lt;text of header-centre&gt; | #</kbd>
+</div>
 
-<a name="HDRFTR_RECTOVERSO"></a>
+<div id="hdrftr-right" class="box-macro-args" style="margin-top: 1em;">
+&#8221;Macro: <b>HEADER_RIGHT</b> <kbd class="macro-args">&#8220;&lt;text of header-right&gt; | #</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>HEADER_RECTO</strong> <kbd>LEFT | CENTER | RIGHT [ CAPS ] &quot;&lt;header recto string&gt;&quot;</kbd></nobr>
-<br/>
-
-<nobr>Macro: <strong>HEADER_VERSO</strong> <kbd>LEFT | CENTER | RIGHT [ CAPS ] &quot;&lt;header verso string&gt;&quot;</kbd></nobr>
+To change the text (the &#8220;string&#8221;) of the left, centre,
+or right part of headers, invoke the appropriate macro, above,
+with the string you want.  For example, mom, by default, prints
+the document&#8217;s author in the header-left position.  If your
+document has, say, two authors, and you want both their names to
+appear header-left, change HEADER_LEFT like this:
 <br/>
+<span class="pre-in-pp">
+  .HEADER_LEFT "R. Stallman, E. Raymond"
+</span>
 </p>
 
 <p>
-<strong>HEADER_RECTO</strong> and <strong>HEADER_VERSO</strong>
-behave identically, hence all references to
-<strong>HEADER_RECTO</strong> in this section also
-refer to <strong>HEADER_VERSO</strong>.  Furthermore,
-<strong>FOOTER_</strong> can be used instead of
-<strong>HEADER_</strong> to set up recto/verso footers.
+Because the arguments to HEADER_LEFT, _CENTER,
+and _RIGHT are
+<a href="definitions.html#stringargument">string arguments</a>,
+they must be enclosed in double-quotes.
 </p>
 
-<p>
-The first argument to <strong>HEADER_RECTO</strong> is the
-direction in which you want the header
-<a href="definitions.html#TERMS_QUAD">quadded</a>.
-<kbd>L, C</kbd> and <kbd>R</kbd> may be used in place of <kbd>LEFT,
-CENTER</kbd> and <kbd>RIGHT</kbd>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Replace HEADER_, above, with FOOTER_ to change the strings in
+footers.
+</p>
+</div>
 
-<p>
-The second argument (optional) tells <strong>mom</strong> to
-capitalize the text of the header.  <strong>Please note:</strong>
-Do NOT attempt to use
-<a href="inlines.html#UC_LC">\*[UC]...\*[LC]</a>
-inside the string passed to <strong>HEADER_RECTO</strong>.
+<h3 id="hdrftr-centre-pad" class="docs">Padding the header/footer centre string</h3>
+
+<div class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>HEADER_CENTER_PAD</b> <kbd class="macro-args">LEFT | RIGHT &lt;amount of space by which to pad centre string left or right&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-The final argument is a string, surrounded by
-double-quotes, containing what you want in the header.
-<strong>HEADER_RECTO</strong> disables <strong>mom</strong>'s normal
-3-part headers, therefore anything you want in the headers must be
-entered by hand in the string, including colours (via the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<a href="color.html#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a>).
+By default, mom centres the header-centre string on the line length
+in effect for page headers.
 </p>
 
 <p>
-By default, <strong>HEADER_RECTO</strong> is set at the same
-size, and in the same family and font, as paragraph text.  The
-control macros
-<a href="#HDRFTR_GLOBAL_FAMILY">HEADER_FAMILY</a>
-and
-<a href="#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a>
-may be used to change the default family and size.  Changes to
-the font(s) within the string must be accomplished with the
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-<kbd>\*[ROM], \*[IT], \*[BD], \*[BDI]</kbd> and
-<kbd>\*[PREV]</kbd> (see
-<a href="inlines.html#INLINE_FONTS_MOM">Changing fonts</a>).
-Additional refinements to the style of the header-recto string,
-including horizontal spacing and/or positioning, can also be made
-with inline escapes.
+In some cases, notably when the header-left or header-right
+strings are particularly long, the effect isn&#8217;t pretty.  The
+offendingly long header-left or right crowds, or even overprints,
+the header-centre.  That&#8217;s where HEADER_CENTER_PAD comes
+in.  With a bit of experimentation (yes, you have to preview the
+document), you can use HEADER_CENTER_PAD to move the header-centre
+string left or right until it looks acceptably centred between the
+two other strings.
 </p>
 
 <p>
-To include the current page number in the string, use the
-<kbd>\*[PAGE#]</kbd>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>.
+For example, say your document is an outline for a novel called
+<i>By the Shores of Lake Attica</i>.  You&#8217;ve told mom you want
+<br/>
+<span class="pre-in-pp">
+  .DOCTYPE NAMED "Outline"
+</span>
+but when you preview your work, you see that &#8220;Outline&#8221;,
+in the centre of the page header, is uncomfortably close to the
+title, which is to the right.  By invoking
+<br/>
+<span class="pre-in-pp">
+  .HEADER_CENTER_PAD RIGHT 3P
+</span>
+you can scoot the word "Outline" over three
+<a href="definitions.html#picaspoints">picas</a>
+<i>to the left</i> (because the padding is added onto the right of the
+string) so that your head looks nicely spaced out.  Invoking
+<kbd>.HEADER_CENTER_PAD</kbd> with the <kbd>LEFT</kbd> argument puts
+the padding on the left side of the string so that it scoots
+right.
 </p>
 
-<a name="PADDING_HDRFTR"><h4>*<u>Padding the HEADER_RECTO/HEADER_VERSO string</u></h4></a>
-
 <p>
-You can &quot;pad&quot; the header-recto string, a convenience
-you'll appreciate in circumstances such as the following.
-
-<pre>
-               VERSO                       RECTO 
-    +------------------------+   +------------------------+     
-    | Author          Page#  |   | Page#            Title |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    |                        |   |                        |     
-    +------------------------+   +------------------------+     
-</pre>
+Most reassuring of all is that if you use HEADER_CENTER_PAD
+conjunction with
+<a href="rectoverso.html#recto-verso">RECTO_VERSO</a>,
+mom will pad the centre string appropriately left OR right,
+depending on which page you&#8217;re on, without you having to tell
+her to do so.
 </p>
 
+<h3 id="reserved-strings" class="docs">Using mom&#8217;s reserved strings in header/footer definitions</h3>
+
 <p>
-To pad the string argument passed to <strong>HEADER_RECTO</strong>,
-begin and end the string (inside the double-quotes) with the caret
-character (<kbd>^</kbd>).  Enter the pound sign (<kbd>#</kbd>)
-at any point in the string where you want an equalized amount of
-whitespace inserted.  (If you're unsure what padding is, see
-<a href="goodies.html#PAD">Insert space into lines</a>.)
-Note that if you're padding the string, it doesn't matter what quad
-direction you give <strong>HEADER_RECTO</strong> since padding, by
-its nature, justifies text to the left and right margins.
+As pointed out in the
+<a href="#author-note">Author&#8217;s note</a>
+in the introduction to headers/footers, headers and footers are
+something you don&#8217;t normally have to worry much about. Mom
+usually knows what to do.
 </p>
 
 <p>
-The situation depicted above is accomplished like this:
-
-<pre>
-    .HEADER_RECTO LEFT "^\*[PAGE#]#\E*[$TITLE]^"
-    .HEADER_VERSO LEFT "^\E*[$AUTHOR]#\*[PAGE#]^"
-</pre>
+However, situations do arise where you need to manipulate what goes
+in the header/footer strings, setting and resetting them as you go
+along.
 </p>
 
 <p>
-Note that <strong>mom</strong> does not interpret the <kbd>#</kbd>
-in <kbd>\*[PAGE#]</kbd> as a padding marker (i.e. as a place to
-insert whitespace).
+A case where you might want to do this would be if you want to
+output endnotes at the end of each document in a series of
+<a href="rectoverso.html#collate">collated</a>
+documents, and you want the word "Endnotes" to go in the header
+centre position of the endnotes, but want, say, the
+<a href="docprocessing.html#title">TITLE</a>
+to go back into the centre position for the next output document.
 </p>
 
 <p>
-Also, notice that the argument, <kbd>LEFT</kbd>, is used in both
-cases.  When padding a header, it doesn't matter whether you use
-<kbd>LEFT, CENTER</kbd> or <kbd>RIGHT</kbd> as the argument.
+In scenarios like the above, mom has a number of reserved strings
+you can plug into the HEADER_LEFT, _CENTER and _RIGHT macros.  They
+are:
+<br/>
+<span class="pre-in-pp">
+  \E*[$TITLE]          &mdash;the current argument passed to .TITLE
+  \E*[$DOCTITLE]       &mdash;the current argument passed to .DOCTITLE
+  \E*[$AUTHOR]         &mdash;the current first argument passed to .AUTHOR
+  \E*[$AUTHOR_1...9]   &mdash;the current arguments passed to .AUTHOR
+  \E*[$AUTHORS]        &mdash;a comma-separated concatenated string
+                          of all the current arguments passed to .AUTHOR
+                          (i.e. a list of authors)
+  \E*[$CHAPTER_STRING] &mdash;the current argument passed to .CHAPTER_STRING,
+                          if invoked, otherwise, "Chapter"
+  \E*[$CHAPTER]        &mdash;the current argument (typically a number) passed
+                          to .CHAPTER
+  \E*[$CHAPTER_TITLE]  &mdash;the current argument passed to .CHAPTER_TITLE
+</span>
+Returning to the scenario above, first, you&#8217;d define a centre
+string for the endnotes page:
+<br/>
+<span class="pre-in-pp">
+  .HEADER_CENTER "Endnotes"
+</span>
+Then, you&#8217;d output the endnotes:
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTES
+</span>
+Then, you&#8217;d prepare mom for the next document:
+<br/>
+<span class="pre-in-pp">
+  .COLLATE
+  .TITLE "New Doc Title"
+  .AUTHOR "Josephine Blough"
+</span>
+Then, you&#8217;d redefine the header-centre string using the reserved
+string <kbd>\*[$TITLE]</kbd>, like this:
+<br/>
+<span class="pre-in-pp">
+  .HEADER_CENTER "\E*[$TITLE]"
+</span>
+And last, you&#8217;d do:
+<br/>
+<span class="pre-in-pp">
+  .START
+</span>
+Voilà!  Any argument you pass to
+<a href="docprocessing.html#title">TITLE</a>
+from here on in (say, for subsequent documents) is back in the
+header-centre position.  Here&#8217;s the whole routine again:
+<br/>
+<span class="pre-in-pp">
+  .HEADER_CENTER "Endnotes"
+  .ENDNOTES
+  .COLLATE
+  .TITLE         "New Doc Title"
+  .AUTHOR        "Josephine Blough"
+  .HEADER_CENTER "\E*[$TITLE]"
+  .START
+</span>
 </p>
 
 <p>
-Furthermore, should you need a user-defined header of
-the sort provided by <strong>HEADER_RECTO</strong> and
-<strong>HEADER_VERSO</strong> but aren't actually printing
-recto/verso, you can use <strong>HEADER_RECTO</strong> to design the
-header that appears at the top of every page.
+If need be, you can concatenate the strings, as in the following
+example.
+<br/>
+<span class="pre-in-pp">
+  .HEADER_CENTER "\E*[$CHAPTER_STRING] \E*[$CHAPTER]"
+</span>
+which, assuming a <kbd>.CHAPTER_STRING</kbd> of
+<kbd>"Chapter"</kbd> and a <kbd>.CHAPTER</kbd> of
+<kbd>"2"</kbd>, would put &#8220;Chapter 2&#8221; in the
+header-centre position.
 </p>
 
+<h3 id="page-number-symbol" class="docs">Replacing header-left, -centre or -right with the page number</h3>
+
 <p>
-<strong>IMPORTANT:</strong> The
-<a href="goodies.html#PAD_MARKER">PAD_MARKER</a>
-macro, which changes the default pad marker (<kbd>#</kbd>) used by
-<a href="goodies.html#PAD">PAD</a>,
-has no effect on the pad marker used in the
-<strong>HEADER_RECTO</strong> string.  If you absolutely must
-have a literal pound sign in your <strong>HEADER_RECTO</strong>
-string, use the escape sequence for the pound sign
-<nobr>( <kbd>\[sh]</kbd> )</nobr> where you want the pound sign
-to go.
+If you would like to have the current page number appear in the
+header-left, -centre, or -right position instead of a text string,
+invoke the appropriate macro, above, with the single argument
+<kbd>#</kbd> (the &#8220;number&#8221; or &#8220;pound&#8221; sign).
+Do not surround the pound size with double-quotes, as you would
+normally do if the argument to <kbd>.HEADER_CENTER</kbd> were a
+string.  For example,
+<br/>
+<span class="pre-in-pp">
+  .HEADER_CENTER #
+</span> 
+(notice, no double-quotes) will print the current page number in the
+centre part of headers.
 </p>
 
-<!-- -HDRFTR_RECTOVERSO- -->
-
-<hr width="33%" align="left"/>
+<h3 id="page-number-incl" class="docs">Including the page number in header-left, -CENTER or -right</h3>
 
-<a name="HEADERS_AND_FOOTERS"></a>
+<p>
+If you would like to <i>include</i> the current page number in the
+string you pass to HEADER_LEFT, _CENTER, or _RIGHT, (as
+opposed to replacing the string with the page number), use the
+special
+<a href="definitions.html#inlines">inline escape</a>
+<kbd>\*[PAGE#]</kbd> in the string argument.
+</p>
 
 <p>
-<nobr>Macro: <strong>HEADERS_AND_FOOTERS </strong></nobr>
+For example, say you have a document that&#8217;s ten pages long,
+and you want header-right to say &#8220;page &lt;whichever&gt; of
+10&#8221;, invoke <kbd>.HEADER_RIGHT</kbd> as follows:
 <br/>
+<span class="pre-in-pp">
+  .HEADER_RIGHT "page \*[PAGE#] of 10"
+</span>
+The header-right of page two will read &#8220;page 2 of 10&#8221;,
+the header-right of page three will read &#8220;page 3 of 10&#8221;,
+and so on.
+</p>
 
-Invocation:
-<pre>
-    .HEADERS_AND_FOOTERS \
-    &lt;L | C | R&gt; "&lt;recto header string&gt;" \
-    &lt;L | C | R&gt; "&lt;recto footer string&gt;" \
-    &lt;L | C | R&gt; "&lt;verso header string&gt;" \
-    &lt;L | C | R&gt; "&lt;verso footer string&gt;"
+<!-- -HDRFTR_STYLE- -->
 
-or
+<h4 id="hdrftr-style" class="docs">2. Header/footer style</h4>
 
-    .HEADERS_AND_FOOTERS &lt;anything&gt;
-</pre>
-</p>
+<h5 id="hdrftr-style-global" class="docs" style="margin-top: 1em;">Global changes</h5>
 
-<p>
-<strong>HEADERS_AND_FOOTERS</strong> allows you to have both
-headers and footers on the same page.
+<p style="margin-top: .5em;">
+The following macros allow you to make changes that affect all parts
+of the header at once.
 </p>
 
-<p>
-Unlike the macros,
-<a href="#HEADERS">HEADERS</a>
-and
-<a href="#FOOTERS">FOOTERS</a>,
-<strong>HEADERS_AND_FOOTERS</strong> requires that you supply
-the information you want in the headers and footers yourself.
-<strong>Mom</strong> does no automatic generation of things like
-the title and the author in headers and footers when you're using
-<strong>HEADERS_AND_FOOTERS</strong>.  Furthermore, style
-changes &mdash; family, font, pointsize, colour, capitalization, etc
-&mdash; are entirely your responsibility and must be made with
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-in the arguments passed to <kbd>&quot;&lt;recto
-header string&gt;&quot;</kbd>, <kbd>&quot;&lt;recto
-footer string&gt;&quot;</kbd>, etc.  By default,
-<strong>mom</strong> sets the headers and footers created with
-<strong>HEADERS_AND_FOOTERS</strong> in the same family, font,
-point size, capitalization style and colour as
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-</p>
+<div class="macro-list-container">
+<ul style="padding-top: 6px; padding-bottom: 6px; margin-left: -.5em;">
+  <li><a href="#hdrftr-global-family">HEADER_FAMILY</a></li>
+  <li><a href="#hdrftr-global-size">HEADER_SIZE</a></li>
+  <li><a href="#hdrftr-plain">HEADER_PLAIN</a></li>
+  <li><a href="#hdrftr-color">HEADER_COLOR</a></li>
+</ul>
+</div>
+
+<div id="hdrftr-global-family" class="box-macro-args">
+Macro: <b>HEADER_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd>
+</div>
 
 <p>
-The manner of entering what you want is identical to the way you
-input
-<a href="#USERDEF_HDRFTR">single string headers and footers</a>.
-I suggest reading up on them, as well as looking at the entries,
-<a href="#HDRFTR_RECTOVERSO">HEADER_RECTO</a>
-and
-<a href="#RESERVED_STRINGS">Using mom's &quot;reserved&quot; strings in header/footer definitions</a>.
+By default, mom uses the default document family for headers.  If
+you would like her to use another
+<a href="definitions.html#family">family</a>
+in headers, invoke <kbd>.HEADER_FAMILY</kbd> with the identifier
+for the family you want.  The argument is the same as for the
+typesetting macro
+<a href="typesetting.html#family">FAMILY</a>.
 </p>
 
 <p>
-The same
-<a href="#PADDING_HDRFTR">padding mechanism</a>
-used in <strong>HEADER_RECTO</strong> and
-<strong>HEADER_VERSO</strong> is available in the
-<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments</a>
-passed to
-<strong>HEADERS_AND_FOOTERS</strong>, allowing you to simulate
-two- and three-part headers and footers.
+Replace HEADER_, above, with FOOTER_ to change the footer family.
 </p>
 
-<p>
-<nobr><kbd>L | C | R</kbd></nobr> in the arguments to
-<strong>HEADERS_AND_FOOTERS</strong> refers to whether you
-want the specific header or footer set flush left, centered,
-or flush right.  (You can also use the longer forms,
-<kbd>LEFT</kbd>, <kbd>CENTER</kbd> and <kbd>RIGHT</kbd>.)  The
-string you give afterwards is whatever text you want, including
-<strong>mom</strong>'s
-<a href="#RESERVED_STRINGS">&quot;reserved&quot; strings</a>,
-and whatever
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-you need to change things like family and font, pointsize, colour,
-etc. as you go along.
+<div id="hdrftr-global-size" class="box-macro-args">
+Macro: <b>HEADER_SIZE</b> <kbd class="macro-args">&lt;+|-number of points&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Argument is relative to the point size of type in paragraphs.
+See
+<span style="font-style: normal;"><a href="docelement.html#control-macro-args">Arguments to the control macros</a></span>
+for an explanation of how control macros ending in
+_SIZE work.
 </p>
 
 <p>
-Note the backslashes in the invocation, above.  Every set of
-arguments given this way to <strong>HEADERS_AND_FOOTERS</strong>
-<strong><em>except the last one</em></strong> requires a backslash
-after it.  The use of backslashes isn't required if you want to put
-the entire argument list on the same (very long!) line as the macro
-itself; I recommend sticking to the style shown above to keep things
-manageable.
+By default, mom makes small adjustments to the size of each part
+of a header to achieve an aesthetically pleasing result.  If
+you&#8217;d like her to continue to do so, but would like the
+overall appearance of headers to be a little smaller or a little
+larger, invoke <kbd>.HEADER_SIZE</kbd> with + or - the number of <a
+href="definitions.html#picaspoints">points</a> (fractions allowed)
+by which you want her to in/decrease the size of headers.  For
+example,
+<br/>
+<span class="pre-in-pp">
+  .HEADER_SIZE +.75
+</span>
+increases the size of every part of a header by 3/4 of a point while
+respecting mom&#8217;s own little size changes.
 </p>
 
 <p>
-If you want to disable having both headers and footers
-on the same page, invoke <kbd>.HEADERS_AND_FOOTERS</kbd>
-with any argument you want (e.g. <strong>OFF, QUIT, END,
-X...</strong>). <strong>Mom</strong> will restore her default
-behaviour of setting automatically generated page headers,
-with the page number, centered, at the bottom of the page.  If
-you would prefer footers instead of headers after turning
-<strong>HEADERS_AND_FOOTERS</strong> off, just invoke
-<a href="#FOOTERS"><kbd>.FOOTERS</kbd></a>
-afterwards.
+Replace HEADER_, above, with FOOTER_ to change the footer size.
 </p>
 
-<h4><u>Some examples</u></h4>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Normally, macros that control headers have no effect on
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>.
+HEADER_SIZE is an exception.  While all parts of a header in
+PRINTSTYLE&nbsp;<kbd>TYPEWRITE</kbd> are always the same size, you
+can use HEADER_SIZE with PRINTSTYLE&nbsp;<kbd>TYPEWRITE</kbd> to
+reduce the header&#8217;s overall point size.  You&#8217;ll most
+likely require this when the
+<a href="docprocessing.html#copystyle">COPYSTYLE</a>
+is <kbd>DRAFT</kbd>, since portions of the header may overprint if,
+say, the title of your document is very long.
+</p>
+</div>
 
-<h5><u>Example 1</u></h5>
+<div id="hdrftr-color" class="box-macro-args">
+Macro: <b>HEADER_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd>
+</div>
 
 <p>
-If you want the same header and footer on every page, here's how
-you'd do it.
-
-<pre>
-    .HEADERS_AND_FOOTERS \          +-----------------------+
-    C "\E*[$TITLE]" \               |         Title         |
-    L "^\E*[$AUTHOR]#\*[PAGE#]^"    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    |                       |
-                                    | Author          Pg. # |
-                                    +-----------------------+
-</pre>
+If you want your headers in a colour different from the document
+default (usually black), invoke <kbd>.HEADER_COLOR</kbd> with the
+name of a colour pre-defined (or &#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
+or
+<a href="color.html#xcolor">XCOLOR</a>.
 </p>
 
 <p>
-<kbd>\E*[$TITLE]</kbd> and <kbd>\E*[$AUTHOR]</kbd> will print the
-strings you pass to
-<a href="docprocessing.html#TITLE">TITLE</a>
-and
-<a href="docprocessing.html#AUTHOR">AUTHOR</a>;
-<kbd>\*[PAGE#]</kbd> is how you include the page number in a header
-or footer string.  (For a list of special strings you can use in
-headers and footers, see
-<a href="#RESERVED_STRINGS">here</a>.)
+HEADER_COLOR will set all the parts of the header
+plus the header rule in the colour you give it as an argument.  If
+you wish finer control over colour in headers, you can use
+<a href="#_color">HEADER_&lt;POSITION&gt;_COLOR</a>
+to colourize each part of the header separately, as well as
+<a href="#hdrftr-rule-color">HEADER_RULE_COLOR</a>
+to change the colour of the header rule.
 </p>
 
 <p>
-You don't have to use these special strings.  You can type in
-anything you like.  I've only used them here to show that they're
-available.
+Replace HEADER_, above, with FOOTER_ to colourize footers.
 </p>
 
-<h5><u>Example 2</u></h5>
+<div class="box-macro-args">
+Macro: <b>HEADER_PLAIN</b>
+</div>
 
 <p>
-If you want different headers and footers on recto/verso pages,
-here's a recipe:
-
-<pre>
-    .HEADERS_AND_FOOTERS \
-    C "BOOK TITLE" \
-    L "^\*[PAGE#]#\E*[$AUTHOR]^" \
-    C "Story Title" \
-    L "^\E*[$AUTHOR]#\*[PAGE#]^"
-
-    +-----------------------+     +------------------------+
-    |      BOOK TITLE       |     |       Story Title      |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    |                       |     |                        |
-    | Pg. #          Author |     | Author            Pg.# |
-    +-----------------------+     +------------------------+
-</pre>
+By default, mom makes adjustments to the font, size, and
+capitalization style of each part of headers to achieve an
+aesthetically pleasing look.  Should you wish to design your own
+headers from the ground up without worrying how changes to the
+various elements of header style interact with mom&#8217;s defaults,
+invoke <kbd>.HEADER_PLAIN</kbd> by itself, with no argument. Mom
+will disable her default behaviour for headers, and reset all
+elements of header style to the same family, font, point size and
+colour as she uses in paragraphs.
 </p>
 
-<hr/>
-
-<a name="HEADFOOT_CONTROL"><h2><u>Control macros for headers/footers</u></h2></a>
-
 <p>
-Virtually every part of headers (see the paragraph on how
-<a href="#HEADERFOOTER">&quot;headers&quot; means &quot;footers&quot;</a>
-in the
-<a href="#HEADFOOTPAGE_INTRO">introduction to headers/footers</a>)
-can be designed to your own specifications.
+Replace HEADER_, above, with FOOTER_ to disable mom&#8217;s default
+behaviour for the various elements of footer style.
 </p>
 
-<a name="INDEX_REFERENCE"><h3><u>Header/footer control macros</u></h3></a>
+<h4 id="hdrftr-style-part" class="docs">3. Part by part changes</h4>
 
-<ul>
+<p>
+When using the following control &#8221;macros, replace
+&#8220;&lt;POSITION&gt; by <b>LEFT, CENTER,</b> or RIGHT as
+appropriate.
+</p>
 
-    <a name="STRINGS"></a>
-
-    <li><a href="#HDRFTR_STRINGS"><strong>STRINGS</strong></a></li>
-    <ul>
-        <li><a href="#HDRFTR_LEFT">HEADER_LEFT</a></li>
-        <li><a href="#HDRFTR_CENTER">HEADER_CENTER</a></li>
-        <ul>
-            <li><a href="#HDRFTR_CENTER_PAD">HEADER_CENTER_PAD</a> &mdash; stick some space left or right of the centre string</li>
-        </ul>
-        <li><a href="#HDRFTR_RIGHT">HEADER_RIGHT</a></li>
-        <li><a href="#RESERVED_STRINGS">Using mom's &quot;reserved&quot; strings in header/footer definitions</a>
-            (e.g. <kbd>\*[$TITLE]</kbd> when you want the title,
-            <kbd>\*[$AUTHOR]</kbd> when you want the author, etc.)
-        </li>
-        <li><a href="#PAGE_NUMBER_SYMBOL">Replacing header left, centre or right with the page number</a></li>
-        <li><a href="#PAGE_NUMBER_INCL">Including the  page number in header left, centre or right</a></li>
-    </ul>
-
-    <a name="STYLE"></a>
-
-    <li><a href="#HDRFTR_STYLE"><strong>STYLE</strong></a></li>
-    <ul>
-
-    <a name="GLOBAL"></a>
-
-        <li><a href="#HDRFTR_STYLE_GLOBAL"><strong>Global changes</strong></a></li>
-        <li><a href="#HDRFTR_GLOBAL_FAMILY">HEADER_FAMILY</a>&nbsp;&mdash; family for entire header</li>
-        <li><a href="#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a>&nbsp;&nbsp;&nbsp;&mdash; size for entire header</li>
-        <li><a href="#HDRFTR_PLAIN">HEADER_PLAIN</a>&nbsp;&nbsp;&mdash; disable default adjustments to header parts</li>
-        <li><a href="#HDRFTR_COLOR">HEADER_COLOR</a>&nbsp;&nbsp;&mdash; colourize the header</li>
-    </ul>
-    <ul>
-
-    <a name="PART_BY_PART"></a>
-
-        <li><a href="#HDRFTR_STYLE_PART"><strong>Part-by-part changes</strong></a></li>
-        <li><a href="#_FAMILY">_FAMILY</a>&nbsp;&mdash; left, centre or right family</li>
-        <li><a href="#_FONT">_FONT</a>&nbsp;&nbsp;&nbsp;&mdash; left, centre or right font</li>
-        <li><a href="#_SIZE">_SIZE</a>&nbsp;&nbsp;&nbsp;&mdash; left, centre or right size</li>
-        <li><a href="#_CAPS">_CAPS</a>&nbsp;&nbsp;&nbsp;&mdash; left, centre or right all caps</li>
-        <li><a href="#_COLOR">_COLOR</a>&nbsp;&nbsp;&mdash; left, centre or right colour</li>
-    </ul>
-
-    <a name="VERTICAL"></a>
-
-    <li><a href="#HDRFTR_VERTICAL"><strong>VERTICAL PLACEMENT AND SPACING</strong></a></li>
-    <ul>
-        <li><a href="#HDRFTR_MARGIN">HEADER_MARGIN</a></li>
-        <li><a href="#HDRFTR_GAP">HEADER_GAP</a></li>
-    </ul>
-
-    <a name="SEPARATOR_RULE"></a>
-
-    <li><a href="#HDRFTR_SEPARATOR"><strong>SEPARATOR RULE</strong></a></li>
-    <ul>
-        <li><a href="#HDRFTR_RULE">HEADER_RULE</a></li>
-        <li><a href="#HDRFTR_RULE_WEIGHT">HEADER_RULE_WEIGHT</a></li>
-        <li><a href="#HDRFTR_RULE_GAP">HEADER_RULE_GAP</a></li>
-        <li><a href="#HDRFTR_RULE_COLOR">HEADER_RULE_COLOR</a></li>
-    </ul>
+<div class="macro-list-container">
+<ul style="padding-top: 6px; padding-bottom: 6px; margin-left: -.5em;">
+  <li><a href="#_family">HEADER_&lt;POSITION&gt;_FAMILY</a></li>
+  <li><a href="#_font">HEADER_&lt;POSITION&gt;_FONT</a></li>
+  <li><a href="#_size">HEADER_&lt;POSITION&gt;_SIZE</a></li>
+  <li><a href="#_caps">HEADER_&lt;POSITION&gt;_CAPS</a></li>
+  <li><a href="#_color">HEADER_&lt;POSITION&gt;_COLOR</a></li>
 </ul>
+</div>
 
-<!-- -HDRFTR_STRINGS- -->
-
-<hr width="66%" align="left"/>
-
-<a name="HDRFTR_STRINGS"><h3><u>Header/footer strings</u></h3></a>
-
-<a name="HDRFTR_LEFT"></a>
+<div id="_family" class="box-macro-args">
+Macro: <b>HEADER_&lt;POSITION&gt;_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>HEADER_LEFT</strong> <kbd>&quot;&lt;text of header left&gt;&quot; | #</kbd></nobr>
-<br/>
-
-<a name="HDRFTR_CENTER"></a>
-
-<nobr>Macro: <strong>HEADER_CENTER</strong> <kbd>&quot;&lt;text of header centre&gt;&quot; | #</kbd></nobr>
-<br/>
-
-<a name="HDRFTR_RIGHT"></a>
-
-<nobr>Macro: <strong>HEADER_RIGHT</strong> <kbd>&quot;&lt;text of header right&gt;&quot; | #</kbd></nobr>
+Use HEADER_&lt;POSITION&gt;_FAMILY to change the
+<a href="definitions.html#family">family</a>
+of any part of headers.  See
+<a href="docelement.html#control-macro-args">Arguments to the control macros</a>
+for an explanation of how control macros ending in _FAMILY work.
 </p>
 
 <p>
-To change the text (the &quot;string&quot;) of the left, centre, or
-right part of headers, invoke the appropriate macro above with the
-string you want.  For example, <strong>mom</strong>, by default,
-prints the document's author in the header-left position.  If your
-document has, say, two authors, and you want both their names to
-appear header-left, change <strong>HEADER_LEFT</strong> like this:
-
-<pre>
-    .HEADER_LEFT "R. Stallman, E. Raymond"
-</pre>
+Replace HEADER_, above, with FOOTER_ to change a footer part&#8217;s family.
 </p>
 
+<div id="_font" class="box-macro-args">
+Macro: <b>HEADER_&lt;POSITION&gt;_FONT</b> <kbd class="macro-args">&lt;font&gt;</kbd>
+</div>
+
 <p>
-Because the arguments to <strong>HEADER_LEFT, _CENTER,</strong>
-and <strong>_RIGHT</strong> are
-<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments</a>,
-they must be enclosed in double-quotes.
+Use HEADER_&lt;POSITION&gt;_FONT to change the
+<a href="definitions.html#font">font</a>
+of any part of headers.  See
+<a href="docelement.html#control-macro-args">Arguments to the control macros</a>
+for an explanation of how control macros ending in _FONT work.
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change the strings in footers.
+Replace HEADER_, above, with FOOTER_ to change a footer part&#8217;s font.
+</p>
 
-<a name="HDRFTR_CENTER_PAD"><h4>*<u>Padding the header/footer centre string</u></h4></a>
+<div id="_size" class="box-macro-args">
+Macro: <b>HEADER_&lt;POSITION&gt;_SIZE</b> <kbd class="macro-args">&lt;+|-number of points&gt;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>HEADER_CENTER_PAD</strong> <kbd>LEFT | RIGHT &lt;amount of space by which to pad centre string left or right&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+Use HEADER_&lt;POSITION&gt;_SIZE to change the size of any part of
+headers (relative to the point size of type in paragraphs).  See
+<a href="docelement.html#control-macro-args">Arguments to the control macros</a>
+for an explanation of how control macros ending in _SIZE work.
 </p>
 
 <p>
-By default, <strong>mom</strong> centres the header centre string
-literally on the line length in effect for page headers.  In some
-cases, notably when the header left or header right strings are
-particularly long, the effect isn't pretty.  The offendingly long
-header left or right crowds, or even overprints, the header centre.
-That's where <strong>HEADER_CENTER_PAD</strong> comes in.  With a
-bit of experimentation (yes, you have to preview the document), you
-can use <strong>HEADER_CENTER_PAD</strong> to move the header
-centre string left or right until it looks acceptably centred
-between the two other strings.
+Replace HEADER_, above, with FOOTER_ to change a footer part&#8217;s size.
 </p>
 
-<p>
-For example, say your document is an outline for a novel called "By
-the Shores of Lake Attica."  You've told <strong>mom</strong>
-you want
-<br/><br/>
-
-<nobr>&nbsp;&nbsp;&nbsp;&nbsp;<a href="docprocessing.html#DOCTYPE">.DOCTYPE</a> <strong>NAMED</strong> "Outline"</nobr>
-<br/><br/>
-
-but when you preview your work, you see that &quot;Outline&quot;, in
-the centre of the page header, is uncomfortably close to the title,
-which is to the right of it.  By invoking
-
-<pre>
-    .HEADER_CENTER_PAD RIGHT 3P
-</pre>
-</p>
-
-you can scoot the word "Outline" over three
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>
-to the left (the padding's added to the right of the string)
-so that your head looks nicely spaced out.  Invoking
-<kbd>.HEADER_CENTER_PAD</kbd> with the <kbd>LEFT</kbd> argument
-obviously puts the padding on the left side of the string.
-</p>
+<div id="_caps" class="box-macro-args">
+Macro: <b>HEADER_&lt;POSITION&gt;_CAPS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-Most reassuring of all is that if you use
-<strong>HEADER_CENTER_PAD</strong> conjunction with
-<a href="rectoverso.html#RECTO_VERSO">RECTO_VERSO</a>,
-<strong>mom</strong> will pad the centre string appropriately left
-OR right, depending on which page you're on, without you having to
-tell her to do so.
+HEADER_&lt;POSITION&gt;_CAPS is a
+<a href="definitions.html#toggle">toggle macro</a>.
+If you want any part of headers to be set in all caps, regardless of
+the capitalization of that part&#8217;s string as given to the
+<a href="docprocessing.html#reference-macros">reference macros</a>
+or as defined by you with the
+<a href="#hdrftr-strings">header string control macros</a>,
+simply invoke this macro (using the appropriate position) with no
+argument.  If you wish to turn capitalization off (say, for the
+header-right string that mom capitalizes by default), invoke the
+macro with any argument (e.g. <kbd>OFF, QUIT, END, X</kbd>...).
 </p>
 
-<a name="RESERVED_STRINGS"><h4>*<u>Using mom's &quot;reserved&quot; strings in header/footer definitions</u></h4></a>
-
 <p>
-As pointed out in the author's note in the introduction to
-headers/footers, headers and footers are something you don't
-normally have to worry much about. <strong>Mom</strong> usually
-knows what to do.
+Replace HEADER_, above, with FOOTER_ to change a footer part&#8217;s
+capitalization style.
 </p>
 
-<p>
-However, situations do arise where you need to manipulate what goes
-in the header/footer strings, setting and resetting them as you go
-along.  A case where you might want to do this would be if you want
-to output endnotes at the end of each document in a series of
-<a href="rectoverso.html#COLLATE">collated</a>
-documents, and you want the word "Endnotes" to go in the header
-centre position of the endnotes, but want, say, the
-<a href="docprocessing.html#TITLE">TITLE</a>
-to go back into the centre position for the next output document.
-</p>
+<div id="_color" class="box-macro-args">
+Macro: <b>HEADER_&lt;POSITION&gt;_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd>
+</div>
 
 <p>
-In scenarios like the above, <strong>mom</strong> has a number of
-&quot;reserved&quot; strings that you can plug into the
-<strong>HEADER_LEFT, _CENTER</strong> and <strong>_RIGHT</strong>
-macros.  They are:
-
-<pre>
-    \E*[$TITLE]          &mdash; the current argument passed to .TITLE
-    \E*[$DOCTITLE]       &mdash; the current argument passed to .DOCTITLE
-    \E*[$AUTHOR]         &mdash; the current first argument passed to .AUTHOR
-    \E*[$AUTHOR_1...9]   &mdash; the current arguments passed to .AUTHOR
-    \E*[$AUTHORS]        &mdash; a comma-separated concatenated string
-                           of all the current arguments passed to .AUTHOR
-                           (i.e. a list of authors)
-    \E*[$CHAPTER_STRING] &mdash; the current argument passed to .CHAPTER_STRING,
-                           if invoked, otherwise, "Chapter"
-    \E*[$CHAPTER]        &mdash; the current argument (typically a number) passed
-                           to .CHAPTER
-    \E*[$CHAPTER_TITLE]  &mdash; the current argument passed to .CHAPTER_TITLE
-</pre>
+HEADER_&lt;POSITION&gt;_COLOR allows you to set a colour for each of
+the three possible parts of a page header separately.  For example,
+say you want the right part of the header (by default, the document
+title) in red, this is how you&#8217;d get it:
+<br/>
+<span class="pre-in-pp">
+  .HEADER_RIGHT_COLOR red
+</span>
+The other parts of the header will be in the default header colour
+(usually black, but that can be changed with
+<a href="#hdrftr-color">HEADER_COLOR</a>).
 </p>
 
 <p>
-Returning to the scenario above, first, you'd define a centre
-string for the endnotes page:
-
-<pre>
-    .HEADER_CENTER "Endnotes"
-</pre>
-
-Then, you'd output the endnotes:
-
-<pre>
-    .ENDNOTES
-</pre>
-
-Then, you'd prepare <strong>mom</strong> for the next document:
-
-<pre>
-    .COLLATE
-    .TITLE "New Doc Title"
-    .AUTHOR "Josephine Blough"
-</pre>
-
-Then, you'd redefine the header centre string using the reserved
-string <kbd>\*[$TITLE]</kbd>, like this:
-
-<pre>
-    .HEADER_CENTER "\E*[$TITLE]"
-</pre>
+Remember that you have to define (or &#8220;initialize&#8221;) a
+colour with
+<a href="color.html#newcolor">NEWCOLOR</a>
+or
+<a href="color.html#xcolor">XCOLOR</a>
+before you can use the colour.
 </p>
 
 <p>
-And last, you'd do:
-
-<pre>
-    .START
-</pre>
+If you create a
+<a href="#userdef-hdrftr-rv">user-defined header</a>
+with
+<a href="#hdrftr-rectoverso">HEADER_RECTO</a>
+or
+<a href="#hdrftr-rectoverso">HEADER_VERSO</a>,
+and you want various elements within the header to be colourized,
+embed the colours in the string passed to HEADER_RECTO or
+HEADER_VERSO with the
+<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>
+<a href="definitions.html#inlines">inline escape</a>.
 </p>
 
 <p>
-Voilà!  Any argument you pass to <strong>TITLE</strong> from here
-on in (say, for subsequent documents) is back in the header centre
-position.  Here's the whole routine again:
-
-<pre>
-    .HEADER_CENTER "Endnotes"
-    .ENDNOTES
-    .COLLATE
-    .TITLE         "New Doc Title"
-    .AUTHOR        "Josephine Blough"
-    .HEADER_CENTER "\E*[$TITLE]"
-    .START
-</pre>
+Replace HEADER_, above, with FOOTER_ to set the colours for the
+various elements of footers.
 </p>
 
-<p>
-If need be, you can concatenate the strings, as in the following
-example.
-
-<pre>
-    .HEADER_CENTER "\E*[$CHAPTER_STRING] \E*[$CHAPTER]"
-</pre>
-
-which, assuming a <kbd>.CHAPTER_STRING</kbd> of
-<kbd>&quot;Chapter&quot;</kbd> and a <kbd>.CHAPTER</kbd> of
-<kbd>&quot;2&quot;,</kbd> would put &quot;Chapter 2&quot; in the
-header centre position.
-</p>
+<!-- -HDRFTR_VERTICAL- -->
 
-<a name="PAGE_NUMBER_SYMBOL"><h4>*<u>Replacing header-left, -CENTER or -right with the page number</u></h4></a>
+<h4 id="hdrftr-vertical" class="docs">3. Header/footer vertical placement and spacing</h4>
 
 <p>
-If you would like to have the current page number to appear 
-header-left, -center, or -right <em>instead</em> of a text
-string, invoke the appropriate macro, above, with the single
-argument <kbd>#</kbd> (the &quot;number&quot; or
-&quot;pound&quot; sign).  Do <strong>NOT</strong> use
-double-quotes.  For example,
-
-<pre>
-    .HEADER_CENTER #
-</pre> 
-
-will print the current page number in the CENTER part of
-headers.
+See
+<a href="#vertical-spacing">Vertical placement and spacing of headers/footers</a>
+for an explanation of how mom deals with
+headers, footers, and top/bottom page margins.
 </p>
 
-<a name="PAGE_NUMBER_INCL"><h4>*<u>Including the page number in header-left, -CENTER or -right</u></h4></a>
-
-<p>
-If you would like to <em>include</em> the current page number in
-the string you pass to <strong>HEADER_LEFT, _CENTER,</strong> or
-<strong>_RIGHT</strong>, use the special
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<kbd>\*[PAGE#]</kbd> in the string argument.
-</p>
+<div class="macro-list-container">
+<ul style="padding-top: 6px; padding-bottom: 6px; margin-left: -.5em;">
+  <li><a href="#hdftr_margin">HEADER_MARGIN</a></li>
+  <li><a href="#hdftr_gap">HEADER_GAP</a></li>
+</ul>
+</div>
 
-<p>
-For example, say you have a document that's ten pages long, and
-you want header-right to say "page &lt;whichever&gt; of 10",
-invoke <kbd>.HEADER_RIGHT</kbd> as follows:
+<!-- -HDRFTR_MARGIN- -->
 
-<pre>
-    .HEADER_RIGHT "page \*[PAGE#] of 10"
-</pre>
-</p>
+<div id="hdrftr-margin" class="box-macro-args">
+Macro: <b>HEADER_MARGIN</b> <kbd class="macro-args">&lt;distance to baseline of header&gt;</kbd>
+</div>
 
-<p>
-Header-right of page two will read &quot;page 2 of 10&quot;,
-header-right of page three will read &quot;page 3 of 10&quot;,
-and so on.
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
-<!-- -HDRFTR_STYLE- -->
-
-<hr width="66%" align="left"/>
-
-<a name="HDRFTR_STYLE"><h3><u>Header/footer style</u></h3></a>
-
-<a name="HDRFTR_STYLE_GLOBAL"><h4><u>Global changes</u></h4></a>
-
 <p>
-The following macros allow you to make changes that affect all
-parts of the header at once.
+Use HEADER_MARGIN to set the distance from the top edge of the page to the
+<a href="definitions.html#baseline">baseline</a>
+of type in headers.  A unit of measure is required, and decimal
+fractions are allowed.
 </p>
 
 <p>
-Please note that <strong>HEADER_FAMILY</strong> and
-<strong>HEADER_FONT</strong> have no effect on
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>.
+Mom&#8217;s default header margin is 4-1/2
+<a href="definitions.html#picaspoints">picas</a>,
+but if you want a different margin, say, 1/2-inch, do
+<br/>
+<span class="pre-in-pp">
+  .HEADER_MARGIN .5i
+</span>
+If your document uses
+<a href="definitions.html#footer">footers</a>,
+replace HEADER_, above, with FOOTER_.  The argument to FOOTER_MARGIN
+is the distance from the bottom edge of the page to the baseline of
+type in footers.  Mom&#8217;s default footer margin is 3
+<a href="definitions.html#picaspoints">picas</a>.
 </p>
 
-<ul>
-    <li><a href="#HDRFTR_GLOBAL_FAMILY">HEADER_FAMILY</a></li>
-    <li><a href="#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a></li>
-    <li><a href="#HDRFTR_PLAIN">HEADER_PLAIN</a></li>
-    <li><a href="#HDRFTR_COLOR">HEADER_COLOR</a></li>
-</ul>
-
-<hr width="66%" align="left"/>
-
-<a name="HDRFTR_GLOBAL_FAMILY"></a>
-
-<p>
-<nobr>Macro: <strong>HEADER_FAMILY</strong> <kbd>&lt;family&gt;</kbd></nobr>
-</p>
+<h3 class="docs">Header/footer margins and page numbering</h3>
 
 <p>
-By default, <strong>mom</strong> uses the default document family
-for headers.  If you would like her to use another
-<a href="definitions.html#TERMS_FAMILY">family</a>
-in headers, invoke <kbd>.HEADER_FAMILY</kbd> with the identifier
-for the family you want.  The argument is the same as for the
-typesetting macro
-<a href="typesetting.html#FAMILY">FAMILY</a>.
+Mom uses HEADER_MARGIN and FOOTER_MARGIN to establish the baseline
+position of page numbers in addition to the baseline position of
+headers and footers proper.
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change the footer family.
+By default, page numbers appear at the bottom of the page, therefore
+if you want the default position (bottom), but want to change the
+baseline placement, use FOOTER_MARGIN.  Conversely, if page numbers
+are at the top of the page, either because you turned
+<a href="#footers">FOOTERS</a>
+on or because you instructed mom to put them there with
+<a href="#pagenum-pos">PAGENUM_POS</a>,
+you&#8217;d use HEADER_MARGIN to change their baseline placement.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="HDRFTR_GLOBAL_SIZE"></a>
-
-<p>
-<nobr>Macro: <strong>HEADER_SIZE</strong> &lt;+|-number of points&gt;</nobr>
+<div id="footer-margin" class="box-important" style="padding-bottom: 15px;">
+<p class="tip-top">
+<span class="important" style="display: block; margin-bottom: -1em;">Important &ndash; FOOTER_MARGIN and bottom margins</span>
 <br/>
-
-<em>*Argument is relative to the point size of type in paragraphs</em>
-</p>
-
-<p>
-By default, <strong>mom</strong> makes small adjustments to the size
-of each part of a header to achieve an aesthetically pleasing result.
-If you'd like her to continue to do so, but would like the overall
-appearance of headers to be a little smaller or a little larger,
-invoke <kbd>.HEADER_SIZE</kbd> with + or - the number of
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-(fractions allowed) by which you want her to in/decrease the size
-of headers.  For example,
-
-<pre>
-    .HEADER_SIZE +.75
-</pre>
-
-increases the size of every part of a header by 3/4 of a point while
-respecting <strong>mom</strong>'s own little size changes.
+Mom requires a footer margin (i.e. the distance from the bottom of
+the page at which to place footers) for proper operation, hence she
+sets one, even if you don&#8217;t.  As stated above, her default
+footer margin is 3-picas.
 </p>
 
 <p>
-See
-<a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a>
-for an explanation of how control macros ending in
-<strong>_SIZE</strong> work.
+If you use
+<a href="typesetting.html#b-margin">B_MARGIN</a>
+or
+<a href="typesetting.html#page">PAGE</a>,
+to set a bottom margin for your document (prior to
+<a href="docprocessing.html#start">START</a>)
+and the margin&#8217;s too close to mom&#8217;s default
+footer margin (or a footer margin you set yourself with
+FOOTER_MARGIN), mom will not print your footers; additionally,
+she&#8217;ll give you a warning and some advice on standard error.
+When this happens, you must reset either B_MARGIN or FOOTER_MARGIN
+so there&#8217;s an adequate amount of space for mom to print the
+bottom line of running text and the footer.
 </p>
 
-<a name="FOOTER_GLOBAL_SIZE"></a>
-
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change the footer size.
+If you see the warning even when footers and/or bottom-of-page page
+numbering are disabled, set a nominal footer margin of 0 prior to
+<a href="docprocessing.html#start">START</a>,
+as in these examples.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Normally, macros that control headers have no
-effect on
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>.
-<strong>HEADER_SIZE</strong> is an exception.  While all parts of a
-header in <strong>PRINTSTYLE TYPEWRITE</strong> are always the same
-size, you can use <strong>HEADER_SIZE</strong> with <strong>PRINTSTYLE
-TYPEWRITE</strong> to reduce the header's overall point size.
-You'll most likely require this when the
-<a href="docprocessing.html#COPYSTYLE">COPYSTYLE</a>
-is <strong>DRAFT</strong>, since portions of the header may overprint
-if, say, the title of your document is very long.
-</p>
+<div id="examples-footnotes-1" class="examples-container" style="padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0; margin-bottom: -.25em;">Example 1</div>
+<span class="pre">
+  &lt;reference macros, etc&gt;
+  .PAGINATION    OFF
+  .B_MARGIN      .25i
+  .FOOTER_MARGIN O
+  .START
+</span>
+</div>
+
+<div id="examples-footnotes-2" class="examples-container" style="margin-top: 1em; padding-bottom: 1em;">
+<div class="examples" style="margin-top: 0;">Example 2</div>
+<span class="pre">
+  &lt;reference macros, etc&gt;
+  .HEADERS       OFF
+  .PAGENUM_POS   TOP RIGHT
+  .B_MARGIN      .25i
+  .FOOTER_MARGIN O
+  .START
+</span>
+</div>
+</div>
 
-<hr width="33%" align="left"/>
+<!-- -HDRFTR_GAP- -->
 
-<a name="HDRFTR_PLAIN"></a>
+<div id="hdrftr-gap" class="box-macro-args">
+Macro: <b>HEADER_GAP</b> <kbd class="macro-args">&lt;distance from header to start of running text&gt;</kbd>
+</div>
 
-<p>
-Macro: <strong>HEADER_PLAIN</strong>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-By default, <strong>mom</strong> makes adjustments to the
-font, size, and capitalization style of each part of headers
-to achieve an aesthetically pleasing look.  Should you wish to
-design your own headers from the ground up without worrying how
-changes to the various elements of header style interact with
-<strong>mom</strong>'s defaults, invoke <kbd>.HEADER_PLAIN</kbd>
-by itself, with no argument. <strong>Mom</strong> will disable her
-default behaviour for headers, and reset all elements of header
-style to the same family, font, and point size as she uses in
-paragraphs.
+Use HEADER_GAP to set the distance from the
+<a href="definitions.html#baseline">baseline</a>
+of type in headers to the start of
+<a href="definitions.html#running">running text</a>.
+A unit of measure is required, and decimal fractions are allowed.
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above, with
-<strong>FOOTER_</strong> to disable <strong>mom</strong>'s default
-behaviour for the various elements of footer style.
+As explained in
+<a href="#vertical-spacing">Vertical placement and spacing of headers/footers</a>,
+HEADER_MARGIN + HEADER_GAP determine the default vertical starting
+position of running text on the page unless you have given mom your
+own top margin (with
+<a href="typesetting.html#t-margin">T_MARGIN</a>).
+If you give a top margin, mom ignores HEADER_GAP; running text
+starts at your stated top margin.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="HDRFTR_COLOR"></a>
-
 <p>
-<nobr>Macro: <strong>HEADER_COLOR</strong> <kbd>&lt;colorname&gt;</kbd></nobr>
+Mom&#8217;s default header gap is 3
+<a href="definitions.html#picaspoints">picas</a>,
+but if you want a different gap, say, 2 centimetres, do
+<br/>
+<span class="pre-in-pp">
+  .HEADER_GAP 2c
+</span>
 </p>
 
 <p>
-If you want your headers in a colour different from the document
-default (usually black), invoke <kbd>.HEADER_COLOR</kbd> with the
-name of a colour pre-defined (or &quot;initialized&quot;) with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
-or
-<a href="color.html#XCOLOR">XCOLOR</a>.
+If your document uses
+<a href="definitions.html#footer">footers</a>,
+replace HEADER_, above, with FOOTER_.  The argument to FOOTER_GAP
+is the distance from the baseline of type in footers to the last
+baseline of running text on the page.
 </p>
 
 <p>
-<strong>HEADER_COLOR</strong> will set all the parts of the header
-AND the header rule in the colour you give it as an argument.  If
-you wish finer control over colour in headers, you can use
-<a href="#_COLOR">HEADER_&lt;POSITION&gt;_COLOR</a>
-to colourize each part of the header separately, as well as
-<a href="#HDRFTR_RULE_COLOR">HEADER_RULE_COLOR</a>
-to change the colour of the header rule.
+As explained in
+<a href="#vertical-spacing">Vertical placement and spacing of headers/footers</a>,
+FOOTER_MARGIN + FOOTER_GAP determine the default vertical end
+position of running text on the page unless you have given mom a
+bottom margin (with
+<a href="typesetting.html#b-margin">B_MARGIN</a>).
+If you give a bottom margin, mom ignores FOOTER_GAP; running text
+ends at your stated bottom margin, subject to the restriction outlined
+<a href="#footer-margin">here</a>.
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to colourize footers.
+Mom&#8217;s default footer gap is 3 
+<a href="definitions.html#picaspoints">picas</a>.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Mom uses HEADER_GAP and FOOTER_GAP to establish the start and end
+baseline positions of running text with respect to both headers and
+footers AND page numbers.  If you wish to change the gap between the
+last line of running text and a bottom page number, use FOOTER_GAP.
+If page numbers are at the top of the page, change the gap between
+the number and the first line of running text with HEADER_GAP.
 </p>
+</div>
 
-<hr width="66%" align="left"/>
+<!-- -HDRFTR_SEPARATOR- -->
 
-<a name="HDRFTR_STYLE_PART"><h4><u>Part by part changes</u></h4></a>
+<h4 id="hdrftr-separator" class="docs">4. Header/footer separator rule</h4>
 
 <p>
-<strong>NOTE:</strong> When using the following control
-macros, replace &quot;&lt;POSITION&gt;&quot; by <strong>LEFT,
-CENTER,</strong> or <strong>RIGHT</strong> as appropriate.
+The header/footer separator rule is a modest horizontal rule,
+set slightly below the header (or above the footer), that runs
+the length of the
+<a href="definitions.html#header">header</a>
+and helps separate it visually from
+<a href="definitions.html#running">running text</a>.  If
+you don&#8217;t want the rule, you can turn it off.  If you want it,
+but at a different vertical position relative to the header (or
+footer), you can alter its placement.
 </p>
 
-<ul>
-    <li><a href="#_FAMILY">HEADER_&lt;POSITION&gt;_FAMILY</a></li>
-    <li><a href="#_FONT">HEADER_&lt;POSITION&gt;_FONT</a></li>
-    <li><a href="#_SIZE">HEADER_&lt;POSITION&gt;_SIZE</a></li>
-    <li><a href="#_CAPS">HEADER_&lt;POSITION&gt;_CAPS</a></li>
-    <li><a href="#_COLOR">HEADER_&lt;POSITION&gt;_COLOR</a></li>
+<div class="macro-list-container">
+<ul style="padding-top: 6px; padding-bottom: 6px; margin-left: -.5em;">
+  <li><a href="#hdrftr-rule">HEADER_RULE</a> &ndash; on or off</li>
+  <li><a href="#hdrftr-rule-weight">HEADER_RULE_WEIGHT</a> &ndash; weight of the rule</li>
+  <li><a href="#hdrftr-rule-gap">HEADER_RULE_GAP</a> &ndash; distance of rule from header</li>
+  <li><a href="#hdrftr-rule-color">HEADER_RULE_COLOR</a> &ndash; color of rule header</li>
 </ul>
+</div>
 
-<hr width="66%" align="left"/>
-
-<a name="_FAMILY"></a>
+<!-- -HDRFTR_RULE- -->
 
-<p>
-<nobr>Macro: <strong>HEADER_&lt;POSITION&gt;_FAMILY</strong> <kbd>&lt;family&gt;</kbd></nobr>
-</p>
+<div id="hdrftr-rule" class="box-macro-args">
+Macro: <b>HEADER_RULE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-Use <strong>HEADER_&lt;POSITION&gt;_FAMILY</strong> to change the
-<a href="definitions.html#TERMS_FAMILY">family</a>
-of any part of headers.  See
-<a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a>
-for an explanation of how control macros ending in
-<strong>_FAMILY</strong> work.
+By default, mom prints a header separator rule underneath headers
+(or above footers). If you don&#8217;t want the rule, turn it off by
+invoking <kbd>.HEADER_RULE</kbd> with any argument (<kbd>OFF, QUIT,
+END, X...</kbd>), e.g.
+<br/>
+<span class="pre-in-pp">
+  .HEADER_RULE OFF
+</span>
+To turn the rule (back) on, invoke <kbd>.HEADER_RULE</kbd>
+without any argument.
 </p>
 
-<p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change a footer part's family.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Replace HEADER_, above, with FOOTER_ to enable/disable the printing
+of the footer separator rule.  (Most likely, if you&#8217;re using
+<kbd><a href="#footers">FOOTERS</a></kbd>,
+you&#8217;ll want it off.)
 </p>
+</div>
 
-<hr width="33%" align="left"/>
+<!-- -HDRFTR_RULE_WEIGHT- -->
 
-<a name="_FONT"></a>
+<div id="hdrftr-rule-weight" class="box-macro-args">
+Macro: <b>HEADER_RULE_WEIGHT</b> <kbd class="macro-args">&lt;weight in points&gt;</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>HEADER_&lt;POSITION&gt;_FONT</strong> <kbd>&lt;font&gt;</kbd></nobr>
+<p class="requires">
+&bull;&nbsp;Argument must <span class="normal">NOT</span> have a <a href="definitions.html#unitofmeasure">unit of measure</a> appended
 </p>
 
 <p>
-Use <strong>HEADER_&lt;POSITION&gt;_FONT</strong> to change the
-<a href="definitions.html#TERMS_FONT">font</a>
-of any part of headers.  See
-<a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a>
-for an explanation of how control macros ending in
-<strong>_FONT</strong> work.
-</p>
-
-<p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change a footer part's font.
+HEADER_RULE_WEIGHT controls the weight (&#8220;thickness&#8221;) of
+the header rule.  Like
+<a href="inlines.html#rule-weight">RULE_WEIGHT</a>,
+it takes a single argument: the weight of the header rule expressed
+in
+<a href="definitions.html#picaspoints">points</a>
+but without the unit of measure, <kbd>p</kbd>, appended.  The
+argument to HEADER_RULE_WEIGHT must be greater than 0 and less than
+100; decimal fractions are allowed.
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="_SIZE"></a>
-
 <p>
-<nobr>Macro: <strong>HEADER_&lt;POSITION&gt;_SIZE</strong> <kbd>&lt;+|-number of points&gt;</kbd></nobr>
+Say, for example, you want a really strong header separator rule.  
+<br/>
+<span class="pre-in-pp">
+  .HEADER_RULE_WEIGHT 4
+</span>
+which sets the separator rule weight to 4 points, is how you&#8217;d do
+it.
 </p>
 
 <p>
-Use <strong>HEADER_&lt;POSITION&gt;_SIZE</strong> to change the
-size of any part of headers (relative to the point size of type in
-paragraphs).  See
-<a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a>
-for an explanation of how control macros ending in
-<strong>_SIZE</strong> work.
+Mom&#8217;s default header rule weight is 1/2 point.
 </p>
 
-<p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change a footer part's size.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Replace HEADER_, above, with FOOTER_ to set the weight of the footer
+separator rule.
 </p>
+</div>
 
-<hr width="33%" align="left"/>
+<!-- -HDRFTR_RULE_GAP- -->
 
-<a name="_CAPS"></a>
+<div id="hdrftr-rule-gap" class="box-macro-args">
+Macro: <b>HEADER_RULE_GAP</b> <kbd class="macro-args">&lt;distance of rule beneath header&gt;</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>HEADER_&lt;POSITION&gt;_CAPS</strong> <kbd>toggle</kbd></nobr>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>HEADER_&lt;POSITION&gt;_CAPS</strong> is a
-<a href="definitions.html#TERMS_TOGGLE">toggle macro</a>.
-If you want any part of headers to be set in all caps,
-regardless of the capitalization of that part's string as given
-to the
-<a href="docprocessing.html#REFERENCE_MACROS">reference macros</a>
-or as defined by you with the
-<a href="#HDRFTR_STRINGS">header string control macros</a>,
-simply invoke this macro (using the appropriate position) with no
-argument.  If you wish to turn capitalization off (say, for the
-header-right string that <strong>mom</strong> capitalizes by
-default), invoke the macro with any argument (e.g. <strong>OFF,
-QUIT, END, X...</strong>).
+HEADER_RULE_GAP is the distance from the
+<a href="definitions.html#baseline">baseline</a>
+of type in headers to the top edge of the rule underneath.  (If
+FOOTER_RULE_GAP, the gap is the distance from the top of the highest
+<a href="definitions.html#ascender">ascender</a>
+to the bottom edge of the rule.)  A unit of measure is required, and
+decimal fractions are allowed.  Please note that HEADER_RULE_GAP has
+no effect on
+<a href="#hdrftr-gap">HEADER_GAP</a>
+(i.e. HEADER_RULE_GAP is NOT added to HEADER_GAP when mom calculates
+the space between headers and the start of
+<a href="definitions.html#running">running text</a>).
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change a footer part's
-capitalization style.
+By default, the header rule gap is 4
+<a href="definitions.html#picaspoints">points</a>.
+If you&#8217;d like to change it to, say, 1/4
+<a href="definitions.html#em">em</a>, do
+<br/>
+<span class="pre-in-pp">
+  .HEADER_RULE_GAP .25m
+</span>
 </p>
 
-<hr width="33%" align="left"/>
-
-<a name="_COLOR"></a>
-
-<p>
-<nobr>Macro: <strong>HEADER_&lt;POSITION&gt;_COLOR</strong> <kbd>&lt;colorname&gt;</kbd></nobr>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Replace HEADER_, above, with FOOTER_ if you&#8217;re using
+<a href="definitions.html#footer">footers</a>
+and want to change the separator rule gap.  In footers, the gap is
+measured from the top of the tallest
+<a href="definitions.html#ascender">ascender</a>
+in the footer.
 </p>
 
-<p>
-<strong>HEADER_&lt;POSITION&gt;_COLOR</strong> allows you to set a
-colour for each of the three possible parts of a page header
-separately.  For example, say you want the right part of the header
-(by default, the document title) in red, this is how you'd get it:
-
-<pre>
-    .HEADER_RIGHT_COLOR red
-</pre>
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+When using
+<a href="#hdrftr-recto">FOOTER_RECTO</a>
+and
+<a href="#hdrftr-verso">FOOTER_VERSO</a>,
+make sure that the default size for footers
+(<a href="#footer-global-size">FOOTER_SIZE</a>)
+is set to the largest size of type that will be used in the footer
+or mom may not get the rule gap right.  Inline changes to the size
+of type in FOOTER_RECTO and FOOTER_VERSO should always be negative
+(smaller) than the default.
 </p>
+</div>
 
-<p>
-The other parts of the header will be in the default header colour
-(usually black, but that can be changed with
-<a href="#HDRFTR_COLOR">HEADER_COLOR</a>).
-</p>
+<!-- -HDRFTR_RULE_COLOR- -->
 
-<p>
-Remember that you have to define (or &quot;initialize&quot;) a
-colour with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
-or
-<a href="color.html#XCOLOR">XCOLOR</a>
-before you can use the colour.
-</p>
+<div id="hdrftr-rule-color" class="box-macro-args">
+Macro: <b>HEADER_RULE_COLOR</b> <kbd class="macro-args">&lt;colorname&gt;</kbd>
+</div>
 
 <p>
-If you create a
-<a href="#USERDEF_HDRFTR">user-defined header</a>
-with
-<a href="#HDRFTR_RECTOVERSO">HEADER_RECTO</a>
+If you wish to change the colour of the header rule, invoke
+<kbd>.HEADER_RULE_COLOR</kbd> with the name of a colour pre-defined
+(or &#8220;initialized&#8221;) with
+<a href="color.html#newcolor">NEWCOLOR</a>
 or
-<a href="#HDRFTR_RECTOVERSO">HEADER_VERSO</a>,
-and you want various elements within the header to be colourized,
-embed the colours in the string passed to <strong>HEADER_RECTO</strong>
-or <strong>HEADER_VERSO</strong> with the
-<a href="color.html#COLOR_INLINE"><kbd>\*[&lt;colorname&gt;]</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>.
+<a href="color.html#xcolor">XCOLOR</a>.
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to set the colours for the various
-elements of footers.
+HEADER_RULE_COLOR overrides the colour set with
+<a href="#hdrftr-color">HDRFTR_COLOR</a>,
+so it&#8217;s possible to have the heads entirely in, say, blue (set
+with HEADER_COLOR), and the header rule in, say, red.
 </p>
 
-<hr/>
-
-<!-- -HDRFTR_VERTICAL- -->
-
-<a name="HDRFTR_VERTICAL"><h2><u>Header/footer vertical placement and spacing</u></h2></a>
-
-<p>
-See
-<a href="#VERTICAL_SPACING">Vertical placement and spacing of headers/footers</a>
-for an explanation of how <strong>mom</strong> deals with
-headers, footers, and top/bottom page margins.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Replace HEADER_, above, with FOOTER_ to change the colour of the
+footer rule.
 </p>
+</div>
 
-<!-- -HDRFTR_MARGIN- -->
+<div class="rule-short"><hr/></div>
 
-<hr width="66%" align="left"/>
+<!-- -USERDEF_HDRFTR- -->
 
-<a name="HDRFTR_MARGIN"></a>
+<h2 id="userdef-hdrftr-rv" class="macro-group">User-defined, single string recto/verso headers/footers</h2>
 
 <p>
-<nobr>Macro: <strong>HEADER_MARGIN</strong> <kbd>&lt;distance to baseline of header&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+Sometimes, you&#8217;ll find you can&#8217;t get mom&#8217;s
+handling of 3-part headers or footers to do exactly what you want in
+the order you want.  This is most likely happen when you want the
+information contained in the headers/footers split over two pages,
+as is often the case with recto/verso documents.
 </p>
 
 <p>
-Use <strong>HEADER_MARGIN</strong> to set the distance from the
-top edge of the page to the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-of type in headers.  A unit of measure is required, and decimal
-fractions are allowed.
+Say, for example, you want recto page headers to contain a
+document&#8217;s author, centred, and verso page headers to contain
+the document&#8217;s title, also centred, like this:
+<br/>
+<span class="pre-in-pp">
+    +------------------------+   +------------------------+     
+    |         Author         |   |         Title          |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    +------------------------+   +------------------------+     
+</span>
+With mom&#8217;s standard 3-part headers, this isn&#8217;t possible,
+even when
+<a href="rectoverso.html#recto-verso">RECTO_VERSO</a>
+is enabled.  RECTO_VERSO switches the left and right parts of
+headers on alternate pages, but the centre part remains unchanged.
 </p>
 
 <p>
-<strong>Mom</strong>'s default header margin is 4-1/2
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>,
-but if you want a different margin, say, 1/2-inch, do
+Any time you need distinctly different headers on alternate pages,
+mom has macros that let you manually design and determine what goes
+into headers on recto pages, and what goes into headers on verso
+pages.  The macros are
+<a href="#hdrftr-recto">HEADER_RECTO</a>
+and
+<a href="#hdrftr-verso">HEADER_VERSO</a>.
+Both allow you to state whether the header is flush left, centred,
+or flush right, and both take a single
+<a href="definitions.html#stringargument">string argument</a>
+with which, by combining text and
+<a href="definitions.html#inlines">inline escapes</a>,
+you can make the headers come out just about any way you want.
+Use of the <kbd>\*[PAGE#]</kbd> escape is permitted in the string
+argument (see
+<a href="#page-number-incl">Including the page number in header-left, -centre or -right</a>),
+and, as an added bonus, mom provides a special mechanism whereby
+it&#8217;s possible to
+<a href="#padding-hdrftr">pad</a>
+the string as well.  The padding mechanism lets you create headers
+that contain left, centre and right parts like mom's defaults but
+entirely of your own design.
+</p>
+
+<div class="macro-list-container">
+<ul style="padding-top: 6px; padding-bottom: 6px; margin-left: -.5em;">
+  <li><a href="#hdrftr-recto">HEADER_RECTO</a></li>
+  <li><a href="#hdrftr-verso">HEADER_VERSO</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#userdef-hdrftr">User-defined single string headers/footers (no recto/verso)</a></li>
+    <li><a href="#padding-hdrftr">Padding the header-recto/header-verso string</a></li>
+  </ul></li>
+</ul>
+</div>
 
-<pre>
-    .HEADER_MARGIN .5i
-</pre>
-</p>
+<!-- -HDRFTR_RECTOVERSO- -->
 
-<p>
-If your document uses
-<a href="definitions.html#TERMS_FOOTER">footers</a>,
-replace <strong>HEADER_</strong>, above, with
-<strong>FOOTER_</strong>.  The argument to
-<strong>FOOTER_MARGIN</strong> is the distance from the bottom edge
-of the page to the baseline of type in footers.
+<div id="hdrftr-recto" class="box-macro-args">
+Macro: <b>HEADER_RECTO</b> <kbd class="macro-args">LEFT | CENTER | RIGHT [ CAPS ] "&lt;header recto string&gt;"</kbd>
+</div>
+
+<div id="hdrftr-verso" class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>HEADER_VERSO</b> <kbd class="macro-args">LEFT | CENTER | RIGHT [ CAPS ] "&lt;header verso string&gt;"</kbd>
+</div>
+
+<div id="userdef-hdrftr" class="box-tip" style="margin-top: 1.5em; outline: 2px dashed #000089; margin-left: 3px; margin-right: 3px;">
+<p class="tip">
+<span class="tip" style="display: block; margin-bottom: -1.25em; color: #000056; font-size: 105%;">User-defined single string headers/footers (no recto/verso)</span>
+<br/>
+HEADER_RECTO may be used to create user-defined, single string
+headers (or footers, with FOOTER_RECTO), even when recto/verso is
+not enabled (with
+<a href="rectoverso.html#recto-verso">RECTO_VERSO</a>).
+In such cases, the header/footer you create is the one used on
+every page, making HEADER_RECTO your &#8220;I need to design my own
+headers from scratch&#8221; solution.
 </p>
+</div>
 
 <p>
-<strong>Mom</strong>'s default footer margin is 3 
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>.
+HEADER_RECTO and HEADER_VERSO behave identically, hence all
+references to HEADER_RECTO in this section also refer to
+HEADER_VERSO.  Furthermore, FOOTER_ can be used instead of HEADER_
+to set up recto/verso footers.
 </p>
 
-<a name="FOOTER_MARGIN"></a>
-
-<h4><u>FOOTER MARGIN AND BOTTOM MARGIN &mdash; VERY IMPORTANT!</u></h4> 
-
 <p>
-<strong>Mom</strong> requires a footer margin for proper operation,
-hence she sets one, even if you don't.  (As stated above, her default
-footer margin is 3-picas).
+The first argument to HEADER_RECTO is the direction in which you
+want the header
+<a href="definitions.html#quad">quadded</a>.
+<kbd>L, C</kbd> and <kbd>R</kbd> may be used in place of <kbd>LEFT,
+CENTER</kbd> and <kbd>RIGHT</kbd>.
 </p>
 
 <p>
-If you set a bottom margin for your document (with
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>,
-prior to
-<a href="docprocessing.html#START">START</a>)
-and the margin's too close to <strong>mom</strong>'s default
-footer margin (or a footer margin you set yourself
-with <strong>FOOTER_MARGIN</strong>), <strong>mom</strong> will
-not print your footers; additionally, she'll give you a warning
-and some advice on standard error.  When this happens, you must
-reset either <strong>B_MARGIN</strong> or
-<strong>FOOTER_MARGIN</strong> so there's an adequate amount of
-space for <strong>mom</strong> to print the bottom line of running
-text and the footer.
+The second argument (optional) tells mom to capitalize the text of
+the header. <b>Please note:</b> Do not use <kbd><a
+href="inlines.html#uc-lc">\*[UC]...\*[LC]</a></kbd> inside the
+string passed to HEADER_RECTO.
 </p>
 
 <p>
-If you see the warning even when footers and/or bottom-of-page page
-numbering are disabled, set a nominal footer margin of 0 prior to
-<a href="docprocessing.html#START">START</a>,
-as in these examples.
+The final argument is a string, surrounded by double-quotes,
+containing what you want in the header.  HEADER_RECTO disables
+mom&#8217;s normal 3-part headers, therefore anything you want in
+the headers must be entered by hand in the string, including colours
+(via the
+<a href="definitions.html#inlines">inline escape</a>
+<a href="color.html#color-inline"><kbd>\*[&lt;colorname&gt;]</kbd></a>).
 </p>
 
-<h5><u>Example 1</u></h5>
-
-<pre>
-    &lt;reference macros, etc&gt;
-    .PAGINATION    OFF
-    .B_MARGIN      .25i
-    .FOOTER_MARGIN O
-    .START
-</pre>
-
-<h5><u>Example 2</u></h5>
-
-<pre>
-    &lt;reference macros, etc&gt;
-    .HEADERS       OFF
-    .PAGENUM_POS   TOP RIGHT
-    .B_MARGIN      .25i
-    .FOOTER_MARGIN O
-    .START
-</pre>
-
-<h4><u>A note on header/footer margins and page numbering</u></h4>
-
 <p>
-<strong>Mom</strong> uses <strong>HEADER_MARGIN</strong> and
-<strong>FOOTER_MARGIN</strong> to establish the baseline
-position of page numbers in addition to the baseline position of
-headers and footers.
+By default, HEADER_RECTO is set at the same size, and in the same
+family and font, as paragraph text.  The control macros
+<a href="#hdrftr-global-family">HEADER_FAMILY</a>
+and
+<a href="#hdrftr-global-size">HEADER_SIZE</a>
+may be used to change the default family and size.  Changes to the
+font(s) within the string must be accomplished with the
+<a href="definitions.html#inlines">inline escapes</a>
+<kbd>\*[ROM], \*[IT], \*[BD], \*[BDI]</kbd> and
+<kbd>\*[PREV]</kbd> (see
+<a href="inlines.html#inline-fonts-mom">Changing fonts</a>).
+Additional refinements to the style of the header-recto string,
+including horizontal spacing and/or positioning, can also be made
+with inline escapes.
 </p>
 
 <p>
-By default, page numbers appear at the bottom of the page, therefore
-if you want the default position (bottom), but want to change the
-baseline placement, use <strong>FOOTER_MARGIN</strong>.  Conversely,
-if page numbers are at the top of the page, either because you turned
-<a href="#FOOTERS">FOOTERS</a>
-on or because you instructed <strong>mom</strong> to put them
-there with
-<a href="#PAGENUM_POS">PAGENUM_POS</a>,
-you'd use <strong>HEADER_MARGIN</strong> to change their
-baseline placement.
+To include the current page number in the string, use the
+<kbd>\*[PAGE#]</kbd>
+<a href="definitions.html#inlines">inline escape</a>.
 </p>
 
-<!-- -HDRFTR_GAP- -->
-
-<hr width="66%" align="left"/>
-
-<a name="HDRFTR_GAP"></a>
+<h3 id="padding-hdrftr" class="docs">Padding the header-recto/header-verso string</h3>
 
 <p>
-<nobr>Macro: <strong>HEADER_GAP</strong> <kbd>&lt;distance from header to start of running text&gt;</kbd></nobr>
+You can &#8220;pad&#8221; the header-recto string, a convenience
+you&#8217;ll appreciate in circumstances such as the following.
 <br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-Use <strong>HEADER_GAP</strong> to set the distance from the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-of type in headers to the start of
-<a href="definitions.html#TERMS_RUNNING">running text</a>.
-A unit of measure is required, and decimal fractions are allowed.
-</p>
-
-<p>
-As explained in
-<a href="#VERTICAL_SPACING">Vertical placement and spacing of headers/footers</a>,
-<strong>HEADER_MARGIN + HEADER_GAP</strong> determine the default
-vertical starting position of running text on the page UNLESS you
-have given <strong>mom</strong> your own top margin (with
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>).  If you give
-a top margin, <strong>mom</strong> ignores
-<strong>HEADER_GAP</strong>; running text starts at your stated top
-margin.
-</p>
-
-<p>
-<strong>Mom</strong>'s default header gap is 3
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>,
-but if you want a different gap, say, 2 centimetres, do
-
-<pre>
-    .HEADER_GAP 2c
-</pre>
-</p>
-
-<p>
-If your document uses
-<a href="definitions.html#TERMS_FOOTER">footers</a>,
-replace <strong>HEADER_</strong>, above, with
-<strong>FOOTER_</strong>.  The argument to
-<strong>FOOTER_GAP</strong> is the distance from the baseline of
-type in footers to the last baseline of running text on the page.
-</p>
-
-<p>
-As explained in
-<a href="#VERTICAL_SPACING">Vertical placement and spacing of headers/footers</a>,
-<strong>FOOTER_MARGIN + FOOTER_GAP</strong> determine the default
-vertical end position of running text on the page UNLESS you have
-given <strong>mom</strong> a bottom margin (with
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>).  If you give
-a bottom margin, <strong>mom</strong> ignores
-<strong>FOOTER_GAP</strong>; running text ends at your stated bottom
-margin.
-</p>
-
-<p>
-<strong>Mom</strong>'s default footer gap is 3 
-<a href="definitions.html#TERMS_PICASPOINTS">picas</a>.
+<span class="pre-in-pp">
+               VERSO                       RECTO 
+    +------------------------+   +------------------------+     
+    | Author          Page#  |   | Page#            Title |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    |                        |   |                        |     
+    +------------------------+   +------------------------+     
+</span>
 </p>
 
 <p>
-<strong>NOTE:</strong> <strong>Mom</strong> uses
-<strong>HEADER_GAP</strong> and
-<strong>FOOTER_GAP</strong> to establish the start and end baseline
-positions of running text with respect to both headers and footers
-AND page numbers.  If you wish to change the gap between
-the last line of running text and a bottom page number, use
-<strong>FOOTER_GAP</strong>.  If page numbers are at the top of the
-page, change the gap between the number and the first line of running
-text with <strong>HEADER_GAP</strong>.
+There are two steps to padding the string argument passed to HEADER_RECTO
+(if you&#8217;re unsure what padding is, see
+<a href="goodies.html#pad">Insert space into lines</a>).
 </p>
-
-<hr/>
-
-<!-- -HDRFTR_SEPARATOR- -->
-
-<a name="HDRFTR_SEPARATOR"><h2><u>Header/footer separator rule</u></h2></a>
-
-<p>
-The header/footer separator rule is a modest horizontal rule,
-set slightly below the header (or above the footer), that runs
-the length of the
-<a href="definitions.html#TERMS_HEADER">header</a>
-and helps separate it visually from
-<a href="definitions.html#TERMS_RUNNING">running text</a>.  If
-you don't want the rule, you can turn it off.  If you want it,
-but at a different vertical position relative to the header (or
-footer), you can alter its placement.
-</p>
-
-<ul>
-    <li><a href="#HDRFTR_RULE">HEADER_RULE</a> &mdash; on or off</li>
-    <li><a href="#HDRFTR_RULE_WEIGHT">HEADER_RULE_WEIGHT</a> &mdash; weight of the rule</li>
-    <li><a href="#HDRFTR_RULE_GAP">HEADER_RULE_GAP</a> &mdash; distance of rule from header</li>
-    <li><a href="#HDRFTR_RULE_COLOR">HEADER_RULE_COLOR</a> &mdash; color of rule header</li>
-</ul>
-
-<!-- -HDRFTR_RULE- -->
-
-<hr width="66%" align="left"/>
-
-<a name="HDRFTR_RULE"></a>
+<ol style="margin-top: -.5em; margin-left: -.5em; margin-bottom: -.5em;">
+  <li>Begin and end the string (inside the double-quotes) with the caret character (<kbd>^</kbd>).</li>
+  <li>Enter the pound sign (<kbd>#</kbd>) at any point in the string where you want an equalized amount of whitespace inserted.</li>
+</ol>
 
 <p>
-<nobr>Macro: <strong>HEADER_RULE</strong> <kbd>toggle</kbd></nobr>
+The situation depicted above is accomplished like this:
+<br/>
+<span class="pre-in-pp">
+  .HEADER_RECTO LEFT "^\*[PAGE#]#\E*[$TITLE]^"
+  .HEADER_VERSO LEFT "^\E*[$AUTHOR]#\*[PAGE#]^"
+</span>
+Notice that the quad argument, <kbd>LEFT</kbd>, is used in both
+cases.  When padding a header, it doesn&#8217;t matter which
+quad argument you use, although you must be sure to supply
+one.  Also note that mom does not interpret the <kbd>#</kbd> in
+<kbd>\*[PAGE#]</kbd> as a padding marker (i.e. as a place to insert
+whitespace).
+</p>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">Important:</span>
+The
+<a href="goodies.html#pad-marker">PAD_MARKER</a>
+macro, which changes the default pad marker (<kbd>#</kbd>) used by
+<a href="goodies.html#pad">PAD</a>,
+has no effect on the pad marker used in the HEADER_RECTO string.  If
+you absolutely must have a literal pound sign in your HEADER_RECTO
+string, use the escape sequence for the pound sign
+(&nbsp;<kbd>\[sh]</kbd>&nbsp;) where you want the pound sign to go.
 </p>
+</div>
 
-<p>
-By default, <strong>mom</strong> prints a header separator rule
-underneath headers (or above footers). If you don't want the
-rule, turn it off by invoking <kbd>.HEADER_RULE</kbd> with any
-argument (<strong>OFF, QUIT, END, X...</strong>), e.g.
-
-<pre>
-    .HEADER_RULE OFF
-</pre>
-</p>
+<!-- -HDRFTR_RECTOVERSO- -->
 
-<p>
-To turn the rule (back) on, invoke <kbd>.HEADER_RULE</kbd>
-without any argument.
-</p>
+<h2 id="headers-and-footers-intro" class="macro-group">Headers and footers on the same page</h2>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to enable/disable the printing of
-the footer separator rule.  (Most likely, if you're using
-<a href="#FOOTERS">FOOTERS</a>, you'll want it off.)
+Normally, mom prints either a header or a footer, but not both, depending on whether
+<a href="docprocessing.html#header">HEADERS</a>
+or
+<a href="docprocessing.html#footer">FOOTERS</a>
+is enabled.  (Page numbering, whether in the top margin
+or the bottom, is not considered a header or a footer.)
+Should you need both headers and footers on the same page, the
+single macro, HEADERS_AND_FOOTERS, is the way to set it up.
 </p>
 
-<!-- -HDRFTR_RULE_WEIGHT- -->
-
-<hr width="33%" align="left"/>
-
-<a name="HDRFTR_RULE_WEIGHT"></a>
+<div id="headers-and-footers" class="box-macro-args">
+Macro: <b>HEADERS_AND_FOOTERS</b> <kbd class="macro-args">(see Invocation)</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>HEADER_RULE_WEIGHT</strong> <kbd>&lt;weight in points&gt;</kbd></nobr>
+Invocation:
 <br/>
-
-<em>*Argument must</em> NOT <em>have a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> appended</em>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .HEADERS_AND_FOOTERS \
+  &lt;L | C | R&gt; "&lt;header-recto string&gt;" \
+  &lt;L | C | R&gt; "&lt;footer-recto string&gt;" \
+  &lt;L | C | R&gt; "&lt;header-verso string&gt;" \
+  &lt;L | C | R&gt; "&lt;header-verso string&gt;"
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .HEADERS_AND_FOOTERS &lt;anything&gt;
+</span>
 </p>
 
 <p>
-<strong>HEADER_RULE_WEIGHT</strong> controls the weight
-(&quot;thickness&quot;) of the header rule.  Like
-<a href="inlines.html#RULE_WEIGHT">RULE_WEIGHT</a>,
-it takes a single argument: the weight of the header rule expressed
-in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-but <em>without</em> the unit of measure, <kbd>p</kbd>, appended.
-The argument to <strong>HEADER_RULE_WEIGHT</strong> must be
-greater than 0 and less than 100; decimal fractions are allowed.
+Unlike the macros,
+<a href="#headers">HEADERS</a>
+and
+<a href="#footers">FOOTERS</a>,
+which are
+<a href="definitions.html#toggle">toggle</a>
+macros, HEADERS_AND_FOOTERS requires that you supply the information
+you want in the headers and footers yourself.  Mom does no automatic
+generation of things like the title and the author in headers and
+footers when you&#8217;re using HEADERS_AND_FOOTERS.  Furthermore,
+style changes&mdash;family, font, pointsize, colour, capitalization,
+etc &mdash;are entirely your responsibility and must be made with
+<a href="definitions.html#inlines">inline escapes</a>
+in the arguments passed to <kbd>&#8220;&lt;recto
+&#8221;header string&gt;&#8220;</kbd>, <kbd>&lt;recto footer
+string&gt;&#8220;</kbd>, etc.  By default, mom sets the headers and
+footers created with HEADERS_AND_FOOTERS in the same family, font,
+point size, capitalization style and colour as
+<a href="definitions.html#running">running text</a>.
 </p>
 
 <p>
-Say, for example, you want a really strong header separator rule.  
-
-<pre>
-    .HEADER_RULE_WEIGHT 4
-</pre>
-
-which sets the separator rule weight to 4 points, is how you'd do
-it.
+The manner of entering what you want is identical to the way you
+input
+<a href="#userdef-hdrftr-rv">single string headers and footers</a>.
+I suggest reading up on them, as well as looking at the entries,
+<kbd><a href="#hdrftr-rectoverso">HEADER_RECTO</a></kbd>
+and
+<a href="#reserved-strings">Using mom&#8217;s reserved strings in header/footer definitions</a>.
 </p>
 
 <p>
-<strong>Mom</strong>'s default header rule weight is 1/2 point.
+The same
+<a href="#padding-hdrftr">padding mechanism</a>
+used in HEADER_RECTO and HEADER_VERSO is available in the
+<a href="definitions.html#stringargument">string arguments</a>
+passed to HEADERS_AND_FOOTERS, allowing you to simulate two- and
+three-part headers and footers.
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above, with
-<strong>FOOTER_</strong> to set the weight of the footer separator
-rule.
+<kbd>L | C | R</kbd> in the arguments to HEADERS_AND_FOOTERS refers
+to whether you want the specific header or footer set flush left,
+centered, or flush right.  (You can also use the longer forms,
+<kbd>LEFT</kbd>, <kbd>CENTER</kbd> and <kbd>RIGHT</kbd>.)  The
+string you give afterwards is whatever text you want, including
+mom&#8217;s
+<a href="#reserved-strings">reserved strings</a>,
+and whatever
+<a href="definitions.html#inlines">inline escapes</a>
+you need to change things like family and font, pointsize, colour,
+etc. as you go along.
 </p>
 
-<!-- -HDRFTR_RULE_GAP- -->
-
-<hr width="33%" align="left"/>
-
-<a name="HDRFTR_RULE_GAP"></a>
-
 <p>
-<nobr>Macro: <strong>HEADER_RULE_GAP</strong> <kbd>&lt;distance of rule beneath header&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+Note the backslashes in the invocation, above.  Every set of
+arguments given this way to HEADERS_AND_FOOTERS <i>except the
+last</i> requires a backslash after it.  The use of backslashes
+isn&#8217;t required if you want to put the entire argument list on
+the same (very long!) line as the macro itself; I recommend sticking
+to the style shown above to keep things manageable.
 </p>
 
 <p>
-<strong>HEADER_RULE_GAP</strong> is the distance from the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-of type in headers to the top edge of the rule underneath.  (If
-<strong>FOOTER_RULE_GAP</strong>, the gap is the distance from the
-top of the highest
-<a href="definitions.html#TERMS_ASCENDER">ascender</a>
-to the bottom edge of the rule.)  A unit of measure is
-required, and decimal fractions are allowed.  Please note that
-<strong>HEADER_RULE_GAP</strong> has no effect on
-<a href="#HDRFTR_GAP">HEADER_GAP</a>
-(i.e. <strong>HEADER_RULE_GAP</strong> is NOT added to
-<strong>HEADER_GAP</strong> when <strong>mom</strong> calculates the
-space between headers and the start of
-<a href="definitions.html#TERMS_RUNNING">running text</a>).
+If you want to disable having both headers and footers on the same
+page, invoke <kbd>.HEADERS_AND_FOOTERS</kbd> with any argument
+you want (e.g. <kbd>OFF, QUIT, END, X...</kbd>). Mom will restore
+her default behaviour of setting automatically generated page
+headers, with the page number, centered, at the bottom of the
+page.  If you would prefer footers instead of headers after turning
+HEADERS_AND_FOOTERS off, invoke
+<a href="#footers"><kbd>.FOOTERS</kbd></a>
+afterwards.
 </p>
 
-<p>
-By default, the header rule gap is 4
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>.
-If you'd like to change it to, say, 1/4
-<a href="definitions.html#TERMS_EM">em</a>, do
-
-<pre>
-    .HEADER_RULE_GAP .25m
-</pre>
-</p>
+<h4 class="docs" style="margin-bottom: 1em;">Examples of HEADERS_AND_FOOTERS usage</h4>
 
-<p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> if you're using
-<a href="definitions.html#TERMS_FOOTER">footers</a>
-and want to change the separator rule gap.  In footers, the gap
-is measured from the top of the tallest
-<a href="definitions.html#TERMS_ASCENDER">ascender</a>
-in the footer.
-</p>
+<div id="examples-userdef-hdrftr-1" class="examples-container" style="padding-bottom: 0;">
+<div class="examples" style="margin-top: 12px; margin-bottom: 0;">Example 1: Header and footer the same on every page</div>
+<span class="pre">
+.HEADERS_AND_FOOTERS \          +-----------------------+
+C "\E*[$TITLE]" \               |         Title         |
+L "^\E*[$AUTHOR]#\*[PAGE#]^"    |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                |                       |
+                                | Author          Pg. # |
+                                +-----------------------+
+</span>
 
 <p>
-<strong>ADDITIONAL NOTE:</strong> When using
-<a href="#HDRFTR_RECTOVERSO">FOOTER_RECTO</a>
+<kbd>\E*[$TITLE]</kbd> and <kbd>\E*[$AUTHOR]</kbd> will print the
+strings you pass to
+<a href="docprocessing.html#title">TITLE</a>
 and
-<a href="#HDRFTR_RECTOVERSO">FOOTER_VERSO</a>,
-make sure that the default size for footers
-(<a href="#FOOTER_GLOBAL_SIZE">FOOTER_SIZE</a>)
-is set to the largest size of type that will be used in the footer
-or <strong>mom</strong> may not get the rule gap right.  Inline
-changes to the size of type in <strong>FOOTER_RECTO</strong> and
-<strong>FOOTER_VERSO</strong> should always be negative (smaller)
-than the default.
-</p>
-
-<!-- -HDRFTR_RULE_COLOR- -->
-
-<hr width="33%" align="left"/>
-
-<a name="HDRFTR_RULE_COLOR"></a>
-
-<p>
-<nobr>Macro: <strong>HEADER_RULE_COLOR</strong> <kbd>&lt;colorname&gt;</kbd></nobr>
-</p>
-
-<p>
-If you wish to change the colour of the header rule, invoke
-<kbd>.HEADER_RULE_COLOR</kbd> with the name of a colour
-pre-defined (or &quot;initialized&quot;) with
-<a href="color.html#NEWCOLOR">NEWCOLOR</a>
-or
-<a href="color.html#XCOLOR">XCOLOR</a>.
-</p>
-
-<p>
-Please note that <strong>HEADER_RULE_COLOR</strong> overrides the
-colour set with
-<a href="#HDRFTR_COLOR">HDRFTR_COLOR</a>,
-so that it's possible to have the heads entirely in, say, blue (set
-with <strong>HEADER_COLOR</strong>), and the header rule in, say,
-red.
+<a href="docprocessing.html#author">AUTHOR</a>;
+<kbd>\*[PAGE#]</kbd> is how you include the page number in a header
+or footer string.  (For a list of special strings you can use in
+headers and footers, see
+<a href="#reserved-strings">here</a>.)
 </p>
 
 <p>
-<strong>NOTE:</strong> Replace <strong>HEADER_</strong>, above,
-with <strong>FOOTER_</strong> to change the colour of the footer
-rule.
-</p>
+You don&#8217;t have to use these special strings.  You can type
+in anything you like.  I&#8217;ve only used them here to show that
+they&#8217;re available.
+</p>
+</div>
+
+<div id="examples-userdef-hdrftr-2" class="examples-container" style="margin-top: 1em; padding-bottom: 18px;">
+<div class="examples" style="margin-top: 12px; margin-bottom: 0;">Example 2: Different headers and footers on recto/verso pages</div>
+<span class="pre">
+.HEADERS_AND_FOOTERS \
+C "BOOK TITLE" \
+L "^\*[PAGE#]#\E*[$AUTHOR]^" \
+C "Story Title" \
+L "^\E*[$AUTHOR]#\*[PAGE#]^"
+
+        +-----------------------+     +------------------------+
+        |      BOOK TITLE       |     |       Story Title      |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        |                       |     |                        |
+        | Pg. #          Author |     | Author            Pg.# |
+        +-----------------------+     +------------------------+
+</span>
+</div>
 
-<hr/>
+<div class="rule-short" style="margin-top: 1.25em;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="PAGINATION"><h2><u>Pagination</u></h2></a>
+<h2 id="pagination-intro" class="macro-group">Pagination</h2>
 
 <p>
-By default, <strong>mom</strong> paginates documents.  Page numbers
+By default, mom paginates documents.  Page numbers
 appear in the bottom margin of the page, centred between two hyphens.
-As with all elements of <strong>mom</strong>'s document processing,
+As with all elements of mom&#8217;s document processing,
 most aspects of pagination style can be altered to suit your taste
 with control macros.
 </p>
 
-<a name="INDEX_PAGINATION"><h3><u>Pagination macros list</u></h3></a>
 
-<ul>
-    <li><a href="#PAGINATE">PAGINATE</a> &mdash; pagination on or off</li>
-    <li><a href="#PAGENUMBER">PAGENUMBER</a> &mdash; user-defined (starting) page number</li>
-    <li><a href="#PAGENUM_STYLE">PAGENUM_STYLE</a> &mdash; digits, roman numerals, etc</li>
-    <li><a href="#PAGENUM_ON_FIRST_PAGE">PAGENUM_ON_FIRST_PAGE</a> &mdash; applies only when footers are enabled</li>
-    <li><a href="#DRAFT_WITH_PAGENUMBER">DRAFT_WITH_PAGENUMBER</a> &mdash; attach draft/revision information to page numbers</li>
-    <li><a href="#PAGINATE_CONTROL">Control macros</a></li>
+<div class="macro-list-container">
+<h3 id="index-pagination" class="macro-list">Pagination macros</h3>
+<ul class="macro-list">
+  <li><a href="#paginate">PAGINATE</a> &ndash; pagination on or off</li>
+  <li><a href="#pagenumber">PAGENUMBER</a> &ndash; user-defined (starting) page number</li>
+  <li><a href="#pagenum-style">PAGENUM_STYLE</a> &ndash; digits, roman numerals, etc</li>
+  <li><a href="#pagenum-on-first-page">PAGENUM_ON_FIRST_PAGE</a> &ndash; applies only when footers are enabled</li>
+  <li><a href="#draft-with-pagenumber">DRAFT_WITH_PAGENUMBER</a> &ndash; attach draft/revision information to page numbers</li>
+  <li><a href="#paginate-control">Pagination control macros and defaults</a></li>
 </ul>
+</div>
 
 <!-- -PAGINATE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="PAGINATE"></a>
+<div id="paginate" class="box-macro-args">
+Macro: <b>PAGINATE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>PAGINATE</strong> <kbd>toggle</kbd></nobr>
-<br/>
-
-Alias: <strong>PAGINATION</strong>
-</p>
-
-<p>
-By default, <strong>mom</strong> paginates documents (in the bottom
-margin).  If you'd prefer she not paginate, turn pagination off
-by invoking <kbd>.PAGINATE</kbd> with any argument (<strong>OFF,
-NO, QUIT, END, X...</strong>), e.g.
-
-<pre>
-    .PAGINATE NO 
-</pre>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>PAGINATION</b>
 </p>
 
 <p>
+By default, mom paginates documents (in the bottom margin).  If
+you&#8217;d prefer she not paginate, turn pagination off by invoking
+<kbd>.PAGINATE</kbd> with any argument (<kbd>OFF, NO, QUIT, END,
+X...</kbd>), e.g.
+<br/>
+<span class="pre-in-pp">
+  .PAGINATE NO 
+</span>
 To (re)start pagination, invoke <kbd>.PAGINATE</kbd> without any
 argument.
 </p>
 
 <!-- -PAGENUMBER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAGENUMBER"></a>
-
-<p>
-<nobr>Macro: <strong>PAGENUMBER</strong> <kbd>&lt;number&gt;</kbd></nobr>
-</p>
+<div id="pagenumber" class="box-macro-args">
+Macro: <b>PAGENUMBER</b> <kbd class="macro-args">&lt;number&gt;</kbd>
+</div>
 
 <p>
 As is to be expected, pagination of documents begins at page 1.  If
-you'd prefer that <strong>mom</strong> begin with a different number
-on the first page of a document, invoke <kbd>.PAGENUMBER</kbd> with
-the number you want.
+you&#8217;d prefer that mom begin with a different number on the
+first page of a document, invoke <kbd>.PAGENUMBER</kbd> with the
+number you want.
 </p>
 
 <p>
-<strong>PAGENUMBER</strong> need not be used only to give
-<strong>mom</strong> a "first page" number.  It can be used at any
-time to tell <strong>mom</strong> what number you want a page to
-have.  Subsequent page numbers will, of course, be incremented by 1
-from that number.
+PAGENUMBER need not be used only to give mom a "first page" number.
+It can be used at any time to tell mom what number you want a page
+to have.  Subsequent page numbers will, of course, be incremented by
+1 from that number.
 </p>
 
 <!-- -PAGENUM_STYLE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAGENUM_STYLE"></a>
-
-<p>
-<nobr>Macro: <strong>PAGENUM_STYLE</strong> <kbd>DIGIT | ROMAN | roman | ALPHA | alpha</kbd></nobr>
-</p>
+<div id="pagenum-style" class="box-macro-args">
+Macro: <b>PAGENUM_STYLE</b> <kbd class="macro-args">DIGIT | ROMAN | roman | ALPHA | alpha</kbd>
+</div>
 
 <p>
-<strong>PAGENUM_STYLE</strong> lets you tell
-<strong>mom</strong> what kind of page numbering you want.
+PAGENUM_STYLE lets you tell mom what kind of page numbering you
+want.
+<br/>
+<span class="pre-in-pp">
+  DIGIT   Arabic digits (1, 2, 3...)
+  ROMAN   upper case roman numerals (I, II, III...)
+  roman   lower case roman numerals (i, ii, iii...)
+  ALPHA   upper case letters (A, B, C...)
+  alpha   lower case letters (a, b, c...)
+</span>
 </p>
 
-<pre>
-    DIGIT   Arabic digits (1, 2, 3...)
-    ROMAN   upper case roman numerals (I, II, III...)
-    roman   lower case roman numerals (i, ii, iii...)
-    ALPHA   upper case letters (A, B, C...)
-    alpha   lower case letters (a, b, c...)
-</pre>
-
 <!-- -PAGENUM_ON_FIRST_PAGE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAGENUM_ON_FIRST_PAGE"></a>
-
-<p>
-<nobr>Macro: <strong>PAGENUM_ON_FIRST_PAGE</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div id="pagenum-on-first-page" class="box-macro-args">
+Macro: <b>PAGENUM_ON_FIRST_PAGE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-This macro applies only if you've enabled
-<a href="#FOOTERS">FOOTERS</a>.
-If <strong>FOOTERS</strong> are on, <strong>mom</strong>
-automatically places page numbers at the tops of pages except on the
-first page of a document (or on first pages after
-<a href="rectoverso.html#COLLATE">COLLATE</a>).
-If you'd like the page number to appear on &quot;first&quot; pages
-when footers are on, invoke <kbd>.PAGENUM_ON_FIRST_PAGE</kbd> with
-no argument.  Any other argument turns the feature off (<strong>OFF,
-QUIT, END, X...</strong>).
+This macro applies only if you&#8217;ve enabled
+<a href="#footers">FOOTERS</a>.
+If FOOTERS are on, mom automatically places page numbers at the tops
+of pages except on the first page of a document (or on first pages
+after
+<a href="rectoverso.html#collate">COLLATE</a>).
+If you&#8217;d like the page number to appear on &#8220;first&#8221; pages
+when footers are on, invoke
+<br/>
+<span class="pre-in-pp">
+  .PAGENUM_ON_FIRST_PAGE
+</span>
+with no argument.  Any other argument turns the feature off
+(<kbd>OFF, QUIT, END, X</kbd>, etc).
 </p>
 
 <p>
 As with most of the
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>,
-<strong>PAGENUM_ON_FIRST_PAGE</strong> can be invoked at any time,
-meaning that if you don't want a page number on the very first
-page of a document, but do want one on pages that appear after
-<strong>COLLATE</strong>, omit it before the first
-<a href="docprocessing.html#START">START</a>
+<a href="definitions.html#controlmacro">control macros</a>,
+PAGENUM_ON_FIRST_PAGE can be invoked at any time, meaning that if
+you don&#8217;t want a page number on the very first page of a
+document, but do want one on pages that appear after COLLATE, omit
+it before the first
+<a href="docprocessing.html#start">START</a>
 of the document, then invoke it either just before or after your
-first <strong>COLLATE</strong>.
+first COLLATE.
 </p>
 
 <!-- -DRAFT_WITH_PAGENUMBER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="DRAFT_WITH_PAGENUMBER"></a>
-
-<p>
-<nobr>Macro: <strong>DRAFT_WITH_PAGENUMBER</strong></nobr>
-</p>
+<div id="draft-with-pagenumber" class="box-macro-args">
+Macro: <b>DRAFT_WITH_PAGENUMBER</b>
+</div>
 
 <p>
 Sometimes, in
-<a href="docprocessing.html#COPYSTYLE">COPYSTYLE DRAFT</a>,
+<a href="docprocessing.html#copystyle">COPYSTYLE <kbd>DRAFT</kbd></a>,
 the CENTER part of page headers gets overcrowded because of
 the draft and revision information that go there by default.
-<strong>DRAFT_WITH_PAGENUMBER</strong> is one way to fix the
-problem.
+DRAFT_WITH_PAGENUMBER is one way to fix the problem.
 </p>
 
 <p>
 Invoked without an argument, <kbd>.DRAFT_WITH_PAGENUMBER</kbd>
 removes draft/revision information from the page headers and
-attaches it instead to the document's page numbering, in the form
-
-<pre>
-    Draft #, Rev. # / &lt;pagenumber&gt;
-</pre>
-</p>
-
-<p>
-If you have not supplied <strong>mom</strong> with a draft number
-(with
-<a href="docprocessing.html#DRAFT">DRAFT</a>)
-<strong>DRAFT_WITH_PAGENUMBER</strong> will assume &quot;Draft
-1&quot;, and will print it before the page number.
+attaches it instead to the document&#8217;s page numbering, in the
+form
+<br/>
+<span class="pre-in-pp">
+  Draft #, Rev. # / &lt;pagenumber&gt;
+</span>
+If you have not supplied mom with a draft number (with
+<a href="docprocessing.html#draft">DRAFT</a>)
+DRAFT_WITH_PAGENUMBER will assume &#8220;Draft 1&#8220;, and will
+print it before the page number.
 </p>
 
 <p>
 See the note in
-<a href="docprocessing.html#COPYSTYLE_NOTE">COPYSTYLE DRAFT</a>
+<a href="docprocessing.html#copystyle-note">COPYSTYLE <kbd>DRAFT</kbd>
+</a>
 for other ways of dealing with crowded page headers when formatting
 draft-style copy.
 </p>
 
-<hr width="66%" align="left"/>
-
 <!-- -PAGINATE_CONTROL- -->
 
-<a name="PAGINATE_CONTROL"><h3><u>Pagination control macros</u></h3></a>
+<div class="macro-list-container">
+<h3 id="index-pagination-control" class="macro-list">Pagination control macros and defaults</h3>
 
-<ol>
-    <li><a href="#PAGINATE_GENERAL">Family/font/size/colour</a></li>
-    <li><a href="#PAGENUM_POS">Page number position (vertical and horizontal)</a></li>
-    <li><a href="#PAGENUM_HYPHENS">Enclose page numbers with hyphens (on or off)</a></li>
+<ol style="margin-top: -1.5em; padding-bottom: 6px;">
+  <li><a href="#paginate-general">Family/font/size/colour</a></li>
+  <li><a href="#pagenum-pos">Page number position (vertical and horizontal)</a></li>
+  <li><a href="#pagenum-hyphens">Enclose page numbers with hyphens (on or off)</a></li>
 </ol>
+</div>
 
-<a name="PAGINATE_GENERAL"><h4><u>1. Page number family/font/size/colour</u></h4></a>
+<h4 id="paginate-general" class="docs">1. Page number family/font/size/colour</h4>
 
-<p>
+<div class="defaults-container" style="margin-top: 1em; padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="docelement.html#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .PAGENUM_FAMILY default = prevailing document family; default is Times Roman
 .PAGENUM_FONT   default = roman
 .PAGENUM_SIZE   default = 0 (i.e. same size as paragraph text)
-.PAGENUM_COLOR  default= black
-</pre>
+.PAGENUM_COLOR  default = black
+</span>
+</div>
 
-<a name="PAGENUM_POS"><h4><u>2. Page number position</u></h4></a>
+<h4 id="pagenum-pos" class="docs" style="margin-top: -1em;">2. Page number position</h4>
 
-<p>
-<nobr>Macro: <strong>PAGENUM_POS</strong> <kbd>TOP | BOTTOM&nbsp;&nbsp;LEFT | CENTER | RIGHT</kbd></nobr>
-</p>
+<div class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>PAGENUM_POS</b> <kbd class="macro-args">TOP | BOTTOM&nbsp;&nbsp;LEFT | CENTER | RIGHT</kbd>
+</div>
 
 <p>
-Use <strong>PAGENUM_POS</strong> to change the default position of
-automatic page numbering. <strong>PAGENUM_POS</strong> requires
-<em>two</em> arguments: a vertical position (TOP or BOTTOM) and a
-horizontal position (LEFT or CENTER or RIGHT).
+Use PAGENUM_POS to change the default position of automatic page
+numbering. PAGENUM_POS requires <i>two</i> arguments: a vertical
+position (<kbd>TOP</kbd> or <kbd>BOTTOM</kbd>) and a horizontal
+position (<kbd>LEFT</kbd> or <kbd>CENTER</kbd> or <kbd>RIGHT</kbd>).
 </p>
 
 <p>
 For example, if you turn both
-<a href="definitions.html#TERMS_HEADER">headers</a>
+<a href="definitions.html#header">headers</a>
 and
-<a href="definitions.html#TERMS_FOOTER">footers</a> 
-off (with <nobr><kbd>.HEADERS OFF</kbd></nobr> and
-<nobr><kbd>.FOOTERS OFF</kbd>)</nobr> and you want
-<strong>mom</strong> to number your pages at the top right position,
-enter
-
-<pre>
-    .PAGENUM_POS TOP RIGHT
-</pre>
+<a href="definitions.html#footer">footers</a> 
+off (with <kbd>.HEADERS&nbsp;OFF</kbd> and
+<kbd>.FOOTERS&nbsp;OFF</kbd>) and you want mom to number your pages
+at the top right position, enter
+<br/>
+<span class="pre-in-pp">
+  .PAGENUM_POS TOP RIGHT
+</span>
 </p>
 
-<a name="PAGENUM_HYPHENS"><h4><u>3. Enclose page numbers with hyphens (on or off)</u></h4></a>
-
-<p>
-By default, <strong>mom</strong> encloses page numbers between
-hyphens.  If you don't want this behaviour, invoke the macro
-<strong>PAGENUM_HYPHENS</strong> with any argument (<strong>OFF,
-QUIT, END, X...</strong>), like this:
+<h4 id="pagenum-hyphens" class="docs" style="margin-top: -1em;">3. Enclose page numbers with hyphens (on or off)</h4>
 
-<pre>
-    .PAGENUM_HYPHENS OFF
-</pre>
-</p>
+<div class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>PAGENUM_HYPHENS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
+By default, mom encloses page numbers between hyphens.  If you
+don&#8217;t want this behaviour, invoke the macro PAGENUM_HYPHENS
+with any argument (<kbd>OFF, QUIT, END, X</kbd>, etc), like this:
+<br/>
+<span class="pre-in-pp">
+  .PAGENUM_HYPHENS OFF
+</span>
 If, for some reason, you want to turn page number hyphens back
 on, invoke the macro without an argument.
 </p>
 
-<hr/>
+<!-- -BLANK_PAGE- -->
+
+<h2 id="blank-pages" class="macro-group">Inserting blank pages into a document</h2>
+
+<div class="box-macro-args">
+Macro: <b>BLANKPAGE</b> <kbd class="macro-args">&lt;# of blank pages to insert&gt; [DIVIDER [NULL]]</kbd>
+</div>
+
+<p>
+This one does exactly what you&#8217;d expect&mdash;inserts a blank
+page (or pages) into a document.  Unless you give the optional argument,
+<kbd>NULL</kbd>, mom silently increments the page number of every
+blank page and keeps track of
+<a href="rectoverso.html#recto-verso">recto/verso</a>
+stuff, but otherwise does nothing.  This is useful for forcing new
+sections of a document onto recto pages, but may have other
+applications as well.
+</p>
 
 <p>
-<a href="rectoverso.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="docelement.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
+The required argument to BLANK_PAGE is the number of blank pages to
+insert.  The argument is not optional, hence even if you only want
+one blank page, you have to tell mom:
+<br/>
+<span class="pre-in-pp">
+  .BLANKPAGE 1
+</span>
+The optional argument, <kbd>DIVIDER</kbd>, must be given if
+you&#8217;re inserting a blank page before the start of any new
+document section (i.e. a new chapter, or endnotes, a bibliography,
+or table of contents).  Without the <kbd>DIVIDER</kbd> argument, mom
+simply inserts the blank pages and prepares the next page to receive
+<a href="definitions.html#running">running text</a>.
 </p>
 
+<p>
+<kbd>NULL</kbd>, which is also optional, allows you to output the
+specified number of pages without mom incrementing the page number
+for each blank page.  She will, however, continue to keep track
+of which pages are recto/verso if recto/verso printing has been
+enabled.
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 24%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 42%; text-align: right;"><a href="rectoverso.html">Next: Recto/verso printing, collating</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
+
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/images.html groff-1.21/contrib/mom/momdoc/images.html
--- groff-1.20.1/contrib/mom/momdoc/images.html	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/images.html	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is part of groff, the GNU roff type-setting system.
+
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+Written by Peter Schaffter.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being this comment section, with no Front-Cover
+Texts, and with no Back-Cover Texts.
+
+A copy of the Free Documentation License is included as a file called
+FDL in the main directory of the groff source package.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Inserting images into mom documents</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
+</head>
+
+<body style="background-color: #f5faff;">
+
+<!-- ==================================================================== -->
+
+<div id="top" class="page">
+
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="headfootpage.html#top">Next: Page headers/footers, pagination</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Inserting images into a document</h1>
+
+<p>
+You can insert images into a document by using the PSPIC
+macro. PSPIC isn&#8217;t actually part of mom; it comes packaged
+with groff itself.  Images must be in PostScript format, either
+straight .ps or .eps (Encapsulated PostScript).  If you have the
+ImageMagick suite of programmes installed on your system, a simple way
+to convert most image formats to .eps is with <kbd>convert</kbd>, at
+the command line, as in this jpg&nbsp;=>&nbsp;eps example:
+<br/>
+<span class="pre-in-pp">
+  convert &lt;filename&gt;.jpg &lt;filename&gt;.eps 
+</span>
+There have been reports of trouble with PostScript level 2 images,
+so don&#8217;t save your images in this format.
+</p>
+
+<!-- -PSPIC- -->
+
+<div class="macro-id-overline">
+<h3 id="pspic" class= "macro-id">PSPIC</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>PSPIC</b> <kbd class="macro-args">[ -L | -R | -I &lt;n&gt; ] &lt;file&gt; [ width [ height ] ]</kbd>
+</div>
+
+<p>
+<kbd>man groff-tmac</kbd> contains the documentation for PSPIC, but
+I&#8217;ll repeat it here with a few modifications for clarity.
+</p>
+
+<div class="examples-container">
+<h3 id="groff-tmac" class="docs" style="margin-top: .5em;">From groff-tmac</h3>
+<p style="margin-top: .5em; margin-bottom: .5em;">
+<kbd>&lt;file&gt;</kbd> is the name of the file containing the
+image; <kbd>width</kbd> and <kbd>height</kbd> give the desired
+width and height of the image as you wish it to appear within the
+document.  The width and height arguments may have
+<a href="definitions.html#unitofmeasure">units of measure</a>
+attached; the default unit of measure is
+<kbd>i</kbd>.  PSPIC will scale the graphic
+uniformly in the x and y directions so that it is no more than
+<kbd>width</kbd> wide and <kbd>height</kbd> high.  By default, the
+graphic will be horizontally centered.  The <kbd>-L</kbd> and
+<kbd>-R</kbd> options cause the graphic to be left-aligned and
+right-aligned, respectively.  The <kbd>-I</kbd> option causes
+the graphic to be indented by <kbd>&lt;n&gt;</kbd>;  the default unit of
+measure is <kbd>m</kbd>
+(<a href="definitions.html#em">ems</a>).
+</p>
+</div>
+
+<p>
+Unless you&#8217;re a PostScript whiz and have futzed around with
+bounding boxes and whatnot, it&#8217;s unlikely that your image will
+occupy an easily predictable and precise amount of space on the
+page.  This is particularly significant when it comes to the amount
+of vertical space occupied by the image.  A certain amount of
+manual tweaking of the vertical placement of the image will
+probably be required, via the
+<a href="typesetting.html#ald">ALD</a>
+and
+<a href="typesetting.html#rld">RLD</a>
+macros.
+</p>
+
+<p>
+Additionally, images inserted into
+<a href="definitions.html#running">running text</a>
+will almost certainly disrupt the baseline placement of running
+text.  In order to get mom back on track after
+invoking <kbd>.PSPIC</kbd>, I strongly recommend using the
+<a href="docprocessing.html#shim">SHIM</a>
+macro so that the bottom margin of running text falls where it
+should.
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 20%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 46%; text-align: right;"><a href="headfootpage.html">Next: Page headers/footers, pagination</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
+
+</body>
+</html>
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/inlines.html groff-1.21/contrib/mom/momdoc/inlines.html
--- groff-1.20.1/contrib/mom/momdoc/inlines.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/inlines.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -17,61 +17,69 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Inline escapes</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Inline escapes</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
 
-<!-- ==================================================================== -->
+<body style="background-color: #f5faff;">
 
-<a name="TOP"></a>
+<!-- ==================================================================== -->
 
-<p>
-<a href="color.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="goodies.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<div id="top" class="page">
 
-<a name="INLINE_ESCAPES"><h1 align="center"><u>Inline escapes</u></h1></a>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="color.html#top">Next: Coloured text</a></td>
+</tr>
+</table>
 
-<p>
-<a href="#INTRO_INLINE_ESCAPES">Introduction to inline escapes</a>
-<br/>
+<h1 id="inline-escapes" class="docs">Inline escapes</h1>
 
-<a href="#INDEX_INLINES">Index of inline escapes</a>
-</p>
+<div style="text-align: center;">
+<a href="#index-inlines">List of inline escapes</a>
+</div>
 
-<a name="INTRO_INLINE_ESCAPES"><h2><u>Introduction to inline escapes</u></h2></a>
+<div class="rule-medium"><hr/></div>
 
+<h2 id="intro-inlines" class="docs">Introduction</h2>
 <p>
 Inline escapes, as described in the
-<a href="definitions.html#TERMS_INLINES">groff terms</a>
+<a href="definitions.html#inlines">groff terms</a>
 section of this manual, are typesetting commands that appear in text
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>,
+<a href="definitions.html#inputline">input lines</a>,
 as opposed to macros and other
-<a href="definitions.html#TERMS_CONTROLLINES">control lines</a>
+<a href="definitions.html#controllines">control lines</a>
 that must appear on lines by themselves.
 </p>
 
 <p>
 Aside from altering type parameters within a line, inlines also tell
-groff about special characters &mdash; em-dashes, bullets,
-<a href="definitions.html#TERMS_FIGURESPACE">figure/digit-width spaces</a>,
-and so on.  It is beyond the scope of this manual to provide a
-complete list of groff's inline functions and special characters.  I
-recommend having a look at the
-<a href="intro.html#CANONICAL">canonical reference materials</a>
+groff about special characters&mdash;em-dashes, bullets,
+<a href="definitions.html#figurespace">figure/digit-width spaces</a>,
+and so on.  It is beyond the scope of this manual to provide
+a complete list of groff&#8217;s inline functions and special
+characters.  I recommend having a look at the
+<a href="intro.html#canonical">canonical reference materials</a>
 should you need more information than is contained herein.
 </p>
 
 <p>
-In groff, the escape character is the backslash <nobr>(<kbd>\</kbd>)</nobr>.
+In groff, the escape character is the backslash (<kbd>\</kbd>).
 Groff interprets everything following the backslash as instructions,
 not literal text, until the escape sequence is complete.  Should
 you need the actual backslash character as part of a line of text,
-simply enter it twice <nobr>(<kbd>\\</kbd>)</nobr>.  Groff
-understands that this means "please print a backslash character."
-(You can also use <kbd>\e</kbd> to print a literal backslash.)
+simply enter it twice (<kbd>\\</kbd>).  Groff understands that this
+means "please print a backslash character."
+</p>
+
+<p>
+You can also use <kbd>\e</kbd> to print a literal backslash, or use
+<a href="goodies.html#esc-char">ESC_CHAR</a> to change the escape
+character to something other than the backslash, which lets you
+use a single backslash as a literal backslash.
 </p>
 
 <p>
@@ -85,693 +93,678 @@
 </p>
 
 <p>
-<strong>Mom</strong> recognizes that certain escapes get used more
-often than others.  For these, she has a consistent input style that
-takes the form <kbd>\*[...]</kbd>, which makes them stand out well
-from the text of your documents.  These escapes are the ones listed
-under
-<a href="#INLINES_MOM">Mom's personal inlines</a>.
+Mom recognizes that certain escapes get used more often than others.
+For these, she has a consistent input style that takes the form
+<kbd>\*[...]</kbd>, which makes them stand out well from the text of
+your documents.  These escapes are the ones listed under
+<a href="#inlines-mom">Mom&#8217;s personal inline escapes</a>.
 </p>
 
 <p>
-Despite <strong>mom</strong>'s best intentions, there are still
+Despite mom&#8217;s best intentions, there are still
 a number of typesetting functions that can only be accomplished
-with groff's native inline escapes.  I've listed the ones that
+with groff&#8217;s native inline escapes.  I've listed the ones that
 strike me as essential, but there are many others.  If you want
 to know what they are, please read the
-<a href="intro.html#CANONICAL">canonical reference materials</a>
+<a href="intro.html#canonical">canonical reference materials</a>
 pertaining to groff.
 </p>
 
-<p>
-<strong>HELPFUL BIT OF INFORMATION:</strong> Inline escapes can be used
-in
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Helpful bit of information:</span>
+Inline escapes can be used in
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 that take
-<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments</a>.
+<a href="definitions.html#stringargument">string arguments</a>.
 </p>
+</div>
 
-<a name="INDEX_INLINES"><h3><u>Inlines index</u></h3></a>
+<div class="macro-list-container">
+<h3 id="index-inlines" class="macro-list">List of inline escapes</h3>
 
-<ul>
-    <li><a name="INLINES_MOM"><strong>Mom's personal inlines</strong></a></li>
-    <ul>
-        <li><a href="#INLINE_FONTS_MOM">Changing fonts</a></li>
-        <li><a href="#INLINE_SIZE_MOM">Changing point size</a></li>
-        <li><a href="#UC_LC">Capitalise a section of type</a></li>
-        <li><a href="#INLINE_KERNING_MOM">Pairwise kerning</a></li>
-        <li><a href="#INLINE_HORIZONTAL_MOM">Horizontal movement</a></li>
-        <li><a href="#INLINE_VERTICAL_MOM">Vertical movement</a></li>
-        <li><a href="#B">Terminate a line without advancing on the page</a></li>
-        <li><a href="#TB+">Call the next sequential tab without advancing on the page</a></li>
-        <li><a href="#INLINE_RULE_MOM">Full measure rules</a></li>
-    </ul>
-    <li><a name="INLINES_GROFF"><strong>Groff inline escapes</strong></a></li>
-    <ul>
-        <li><a href="#INLINE_FONTS_GROFF">Font control</a> <kbd>\f</kbd></li>
-        <li><a href="#INLINE_HORIZONTAL_GROFF">Inline horizontal motions</a> <kbd>\h</kbd></li>
-        <li><a href="#INLINE_VERTICAL_GROFF">Inline vertical motions</a> <kbd>\v</kbd></li>
-        <li><a href="#INLINE_STRINGWIDTH_GROFF">String width function</a> <kbd>\w</kbd></li>
-        <li><a href="#INLINE_LINEDRAWING_GROFF">Horizontal line drawing function</a> <kbd>\l</kbd></li>
-        <li><a href="#INLINE_CHARACTERS_GROFF">Special characters</a></li>
-    </ul>
+<ul class="macro-list">
+<li id="inlines-mom"><a href="#inlines-mom-top">Mom&#8217;s personal inline escapes</a>
+<ul class="no-enumerator" style="margin-left: -1.5em;">
+  <li><a href="#inline-fonts-mom">Changing fonts</a></li>
+  <li><a href="#inline-size-mom">Changing point size</a></li>
+  <li><a href="#uc-lc">Capitalise a section of type</a></li>
+  <li><a href="#inline-kerning-mom">Pairwise kerning</a></li>
+  <li><a href="#inline-horizontal-mom">Horizontal movement</a></li>
+  <li><a href="#inline-vertical-mom">Vertical movement</a></li>
+  <li><a href="#inline-b-mom">Terminate a line without advancing on the page</a></li>
+  <li><a href="#tb-plus-mom">Call the next sequential tab without advancing on the page</a></li>
+  <li><a href="#inline-rule-mom">Full measure rules</a>
+  <ul class="sublist" style="font-size: 100%;">
+    <li><a href="#rule-weight">Macro to control the weight of rules</a></li>
+  </ul></li>
+</ul></li>
+<li id="inlines-groff"><a href="#inlines-groff-top">Commonly-used groff inline escapes</a>
+<ul class="no-enumerator" style="margin-left: -1.5em;">
+  <li><kbd>\f</kbd>&nbsp;<a href="#inline-fonts-groff">Font control</a></li>
+  <li><kbd>\h</kbd>&nbsp;<a href="#inline-horizontal-groff">Inline horizontal motions</a></li>
+  <li><kbd>\v</kbd>&nbsp;<a href="#inline-vertical-groff">Inline vertical motions</a></li>
+  <li><kbd>\w</kbd>&nbsp;<a href="#inline-stringwidth-groff">String width function</a></li>
+  <li><kbd>\l</kbd>&nbsp;<a href="#inline-linedrawing-groff">Horizontal line drawing function</a></li>
+  <li style="margin-left: 1.6em;"><a href="#inline-characters-groff">Special characters</a></li>
+</ul></li>
 </ul>
+</div>
 
-<hr/>
+<div class="rule-medium"><hr/></div>
 
 <!-- -INLINE_FONTS_MOM- -->
 
-<h2><u>Mom's personal inlines</u></h2>
+<h2 id="inlines-mom-top" class="macro-group">Mom&#8217;s personal inline escapes</h2>
 
-<a name="INLINE_FONTS_MOM"><h3><u>Changing fonts</u></h3></a>
+<h3 id="inline-fonts-mom" class="docs">Changing fonts</h3>
 
 <p>
-<strong>Mom</strong> provides five escapes for changing fonts
-inline:
-
-<pre>
-    \*[ROM]   Change to the medium roman font
-    \*[IT]    Change to the medium italic font
-    \*[BD]    Change to the bold roman font
-    \*[BDI]   Change to the bold italic font
-    \*[PREV]  Revert to the previous font (once only)*
-
-    *Note: \*[PREV] does not operate "stack style".  It returns
-    to the previous font once only, and afterwards has no effect.
-    In other words, in the case of \*[PREV]\*[PREV], only the first
-    \*[PREV] is respected; the second one is silently ignored.
-</pre>
+Mom provides five escapes for changing fonts inline:
+<br/>
+<span class="pre-in-pp">
+  \*[ROM]   Change to the medium roman font
+  \*[IT]    Change to the medium italic font
+  \*[BD]    Change to the bold roman font
+  \*[BDI]   Change to the bold italic font
+  \*[PREV]  Revert to the previous font (once only)*
+</span>
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>\*[PREV]</kbd> does not operate "stack style".  It returns
+to the previous font once only, and afterwards has no effect.  In
+other words, in the case of <kbd>\*[PREV]\*[PREV]</kbd>, only the
+first <kbd>\*[PREV]</kbd> is respected; the second one is silently
+ignored.
 </p>
+</div>
 
 <p>
 These escapes are provided for merely for convenience, legibility,
-and consistency when typesetting with <strong>mom</strong>.  For
-more complete and flexible inline font control, please see
-<a href="#INLINE_FONTS_GROFF">font control with <kbd>\f</kbd></a>.
+and consistency when typesetting with mom.  For more complete and
+flexible inline font control, please see
+<a href="#inline-fonts-groff">font control with <kbd>\f</kbd></a>.
 </p>
 
-<p>
-<strong>NOTE CONCERNING DOCUMENT PROCESSING:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>,
+<div class="box-notes">
+<h3 id="inlines-docprocessing-fonts" class="docs notes">Notes concerning document processing</h3>
+<p style="margin-top: .5em;">
+If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>,
 inline font changes remain in effect only for the duration of the
 current document element tag.
 </p>
 
-<p>
-Additionally, if you're designing your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS or FOOTERS</a>
-and want to use <strong>mom</strong>'s inline escapes
-for changing fonts <em>inside</em> the left, centre and/or right
-strings, or in the strings for
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">recto</a>
+<p class="tip-bottom">
+Additionally, if you&#8217;re designing your own
+<a href="headfootpage.html#headfootpage-intro">HEADERS or FOOTERS</a>
+and want to use mom&#8217;s inline escapes for changing fonts as
+part of the the left, centre and/or right strings, or in the strings
+for
+<a href="headfootpage.html#hdrftr-rectoverso">recto</a>
 and/or
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
+<a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
-<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
+<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
 you must enter the inlines beginning with <kbd>\E*</kbd>
 rather than just <kbd>\*</kbd>, e.g. <kbd>\E*[BD]</kbd>.
 </p>
+</div>
 
 <!-- -INLINE_SIZE_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_SIZE_MOM"><h3><u>Changing point size</u></h3></a>
-
+<h3 id="inline-size-mom" class="docs">Changing point size</h3>
 <p>
-<strong>Mom</strong> has two inline escapes for changing point
-size:
-
-<pre>
-    \*[SIZE &lt;size&gt;]
-</pre>
-
+Mom has two inline escapes for changing point size:
+<br/>
+<span class="pre-in-pp">
+  \*[SIZE &lt;size&gt;]
+</span>
 and
-
-<pre>
-    \*[S&lt;size&gt;]
-</pre>
-
-where &quot;size&quot; is the new size you want.  You can use
+<br/>
+<span class="pre-in-pp">
+  \*S[&lt;size&gt;]
+</span>
+where &#8220;size&#8221; is the new size you want.  You can use
 either; they behave exactly the same way.  For example, to change
 the point size of type inline to 12 points, you could enter either
-
-<pre>
-    \*[SIZE 12]
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  \*[SIZE 12]
+</span>
 or
-
-<pre>
-    \*[S12]
-</pre>
+<br/>
+<span class="pre-in-pp">
+  \*S[12]
+</span>
 </p>
 
 <p>
-The advantage of the first form is that it's easy to remember, and
-follows <strong>mom</strong>'s usual inline syntax.  The advantage
-of the second is that it's more concise.
+The advantage of the first form is that it&#8217;s easy to remember,
+and follows mom&#8217;s usual inline syntax.  The advantage of the
+second is that it&#8217;s more concise.
 </p>
 
 <p>
 Notice that in both cases, the new size does not require a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>;
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>;
+<a href="definitions.html#picaspoints">points</a>
 is assumed.  However, a unit of measure may be appended to the size
-if that's what you wish.  Fractional sizes are, of course, allowed.
+if that&#8217;s what you wish.  Fractional sizes are, of course,
+allowed.
 </p>
 
 <p>
 The size given to <kbd>\*[SIZE&nbsp;&lt;size&gt;]</kbd> or
 <kbd>\*S[&lt;size&gt;]</kbd> may be expressed in plus or minus
 terms, which can be very useful.  In the following examples, the
-word &quot;mom&quot; will be output 2 points larger than the point
+word &#8220;mom&#8221; will be output 2 points larger than the point
 size of the rest of the line.
-
-<pre>
-    While she isn't perfect, \*S[+2]mom\*S[-2] isn't half bad.
-    While she isn't perfect, \*[SIZE +2]mom\*[SIZE -2] isn't half bad.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  While she isn't perfect, \*S[+2]mom\*S[-2] isn't half bad.
+  While she isn't perfect, \*[SIZE +2]mom\*[SIZE -2] isn't half bad.
+</span>
 </p>
 
-<p>
-<strong>NOTE CONCERNING DOCUMENT PROCESSING:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-notes">
+<h3 id="inline-docprocessing-ps" class="docs notes">NOTE CONCERNING DOCUMENT PROCESSING</h3>
+<p style="margin-top: .5em;">
+If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 and wish to design your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS or FOOTERS</a>
-using <strong>mom</strong>'s inline escape
-for changing point size <em>inside</em> the left, centre and/or right
-strings, or in the strings for
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">recto</a>
+<a href="headfootpage.html#headfootpage-intro">HEADERS or FOOTERS</a>
+using mom&#8217;s inline escape for changing point size as part of
+the left, centre and/or right strings, or in the strings for
+<a href="headfootpage.html#hdrftr-rectoverso">recto</a>
 and/or
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
+<a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
-<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you <strong>must</strong> use the form <kbd>\*S[&lt;n&gt;]</kbd>
+<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
+you <i>must</i> use the form <kbd>\*S[&lt;n&gt;]</kbd>
 and enter the inline beginning with <kbd>\E*</kbd>, like this:
 <kbd>\E*S[&lt;+|-&gt;&lt;n&gt;]</kbd>.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> If you're accustomed to groff's usual way
-of handling inline size requests <kbd>(\sN, \s±N, \s(NN, \s±(NN,
-\s[NNN], \s±[NNN]),</kbd> feel free to continue with your old habits.
-<strong>Mom</strong> doesn't care.
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+If you&#8217;re accustomed to groff&#8217;s usual way of handling
+inline size requests <kbd>(\sN, \s±N, \s(NN, \s±(NN, \s[NNN],
+\s±[NNN]),</kbd> feel free to continue with your old habits.  Mom
+doesn&#8217;t care.
 </p>
+</div>
 
 <!-- -CAPITALISATION- -->
 
-<hr width="33%" align="left"/>
-
-<a name="UC_LC"><h3><u>Capitalise a section of type</u></h3></a>
-
+<h3 id="uc-lc" class="docs">Capitalise a section of type</h3>
 <p>
 If you need to capitalise a region of type inline, bracket the
 region of type with the inline escapes, <kbd>\*[UC]</kbd> (Upper Case)
 and <kbd>\*[LC]</kbd> (Lower Case), like this:
-
-<pre>
-    All work \*[UC]and\*[LC] no play makes Jack a dull boy.
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  All work \*[UC]and\*[LC] no play makes Jack a dull boy.
+</span>
 The above produces, on output
-
-<pre>
-    All work AND no play makes Jack a dull boy.
-</pre>
+<br/>
+<span class="pre-in-pp">
+  All work AND no play makes Jack a dull boy.
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> <kbd>\*[UC]</kbd> and <kbd>\*[LC]</kbd>
-must not be used inside the
-<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>\*[UC]</kbd> and <kbd>\*[LC]</kbd> must not be used inside the
+<a href="definitions.html#stringargument">string arguments</a>
 passed to the
-<a href="headfootpage.html#HDRFTR_STRINGS">HEADER_&lt;POSITION&gt;</a>
-macro.  Instead, use the
-control macro
-<a href="headfootpage.html#_CAPS">HEADER_&lt;POSITION&gt;_CAPS.</a>
+<a href="headfootpage.html#hdrftr-strings">HEADER_&lt;POSITION&gt;</a>
+macro.  Instead, use the control macro
+<a href="headfootpage.html#_caps">HEADER_&lt;POSITION&gt;_CAPS.</a>
 For
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_RECTO</a>
+<a href="headfootpage.html#hdrftr-rectoverso">HEADER_RECTO</a>
 (or _VERSO) or
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_RECTO</a>
+<a href="headfootpage.html#hdrftr-rectoverso">FOOTER_RECTO</a>
 (or _VERSO), supply the <kbd>CAPS</kbd> option to the appropriate
 macro.
 </p>
+</div>
 
 <!-- -INLINE_KERNING_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_KERNING_MOM"><h3><u>Pairwise kerning</u></h3></a>
-
+<h3 id="inline-kerning-mom" class="docs">Pairwise kerning</h3>
 <p>
 Pairwise kerning means moving specific letter pairs closer
 together or further apart (see
-<a href="definitions.html#TERMS_KERN">Typesetting terms, kerning</a>
+<a href="definitions.html#kern">Typesetting terms, kerning</a>
 for more details).
 </p>
 
 <p>
-<strong>Mom</strong> permits inline pairwise
-kerning through the use of the inline escapes
-
-<pre>
-    \*[BU &lt;n&gt;]  Closes the space between letters (<strong>B</strong>ack <strong>U</strong>nits).
-    \*[FU &lt;n&gt;]   Opens the space between letters (<strong>F</strong>orward <strong>U</strong>nits).
-</pre>
-
-&quot;<strong>&lt;n&gt;</strong>&quot; is the number of
-<a href="definitions.html#TERMS_KERNUNIT">kern units</a>
+Mom permits inline pairwise kerning through the use of the inline
+escapes
+<br/>
+<span class="pre-in-pp">
+  \*[BU &lt;n&gt;]&nbsp;Closes the space between letters (Back Units).
+  \*[FU &lt;n&gt;]&nbsp;Opens the space between letters (Forward Units).
+</span>
+&#8220;<b>&lt;n&gt;</b>&#8221; is the number of
+<a href="definitions.html#kernunit">kern units</a>
 by which to close or open the space between letters.
 </p>
 
 <p>
 For example,
-
-<pre>
-    THE HUMAN COST OF COMMODIF\*[FU 1]YING FRESH W\*[BU 4]A\*[BU 5]TER
-</pre>
-
-moves the letter <strong>Y</strong> in &quot;COMMODIFYING&quot;
-1 kern unit away from the letter <strong>F</strong>, and the
-letter <strong>A</strong> in &quot;WATER&quot; 4 kern units closer
-to the letter <strong>W</strong>.  Additionally, the letter
-<strong>T</strong> in "WATER" is moved 5 kern units closer to the
-letter <strong>A</strong>.
+<br/>
+<span class="pre-in-pp">
+  THE HUMAN COST OF COMMODIF\*[FU 1]YING FRESH W\*[BU 4]A\*[BU 5]TER
+</span>
+moves the letter Y in &#8220;COMMODIFYING&#8221; one kern unit away from
+the letter F, and the letter A in &#8220;WATER&#8221; four kern units
+closer to the letter W.  Additionally, the letter T in "WATER" is
+moved five kern units closer to the letter A.
 </p>
 
 <p>
 For backward compatibility, the forms
-
-<pre>
-    \*[BU1]...\*[BU36]   Move backward 1...36 <a href="definitions.html#TERMS_KERNUNIT">kern units</a>
-    \*[FU1]...\*[FU36]    Move forward 1...36 <a href="definitions.html#TERMS_KERNUNIT">kern units</a>
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  \*[BU1]...\*[BU36]&nbsp;Move backward 1...36 <a href="definitions.html#kernunit">kern units</a>
+  \*[FU1]...\*[FU36]&nbsp;Move forward  1...36 <a href="definitions.html#kernunit">kern units</a>
+</span>
 also exist (i.e. with no space before the number of kern units desired,
 up to a limit of 36).
 </p>
 
-<p>
-<strong>NOTE CONCERNING DOCUMENT PROCESSING:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-notes">
+<h3 id="inlines-docprocessing-kerning" class="docs notes">Notes concerning document processing</h3>
+<p style="margin-top: .5em;">
+If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 and wish to design your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS or FOOTERS</a>
-using <strong>mom</strong>'s inline escapes
-for kerning <em>inside</em> the left, centre and/or right
-strings, or in the strings for
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">recto</a>
+<a href="headfootpage.html#headfootpage-intro">HEADERS or FOOTERS</a>
+using mom&#8217;s inline escapes for kerning as part of the left,
+centre and/or right strings, or in the strings for
+<a href="headfootpage.html#hdrftr-rectoverso">recto</a>
 and/or
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
+<a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
-<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you <strong>must</strong> use the forms <kbd>\E*[BU&lt;n&gt;]</kbd>
+<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
+you <i>must</i> use the forms <kbd>\E*[BU&lt;n&gt;]</kbd>
 and <kbd>\E*[FU&lt;n&gt;]</kbd> (i.e. with no space), and enter the
 inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
 e.g. <kbd>\E*[BU4]</kbd>.
 </p>
-
-<p>
-<strong>ADDITIONAL NOTE:</strong> Using <strong>BU</strong> or <strong>FU</strong>
-between characters pairs that are already automatically kerned
-disables the automatic kerning and uses the value you give to
-<strong>BU</strong> or <strong>FU</strong> instead.
+ 
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+Using the <kbd>BU</kbd> or <kbd>FU</kbd> escapes between characters
+pairs that are already automatically kerned (see
+<a href="typesetting.html#kern">KERN</a>)
+disables the automatic
+kerning and uses the value you give to BU or FU instead.
 </p>
+</div>
 
 <!-- -INLINE_HORIZONTAL_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_HORIZONTAL_MOM"><h3><u>Horizontal inline movement</u></h3></a>
-
+<h3 id="inline-horizontal-mom" class="docs">Horizontal inline movement</h3>
 <p>
 Sometimes, you may need to insert a specified amount amount of white
 space into an
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>,
-or &mdash; occasionally &mdash; back up to a
-previous position on an
-<a href="definitions.html#TERMS_INPUTLINE">output</a>
+<a href="definitions.html#outputline">output line</a>,
+or&mdash;occasionally&mdash;back up to a previous position on an
+<a href="definitions.html#inputline">output</a>
 line in order to create special typographic effects.
 </p>
 
 <p>
-<strong>Mom</strong>'s inline escapes for these horizontal movements are
-
-<pre>
-    <a name="BCK">\*[BCK &lt;n unit&gt;]</a>   Move backward inline the specified number of
-                       <a href="definitions.html#TERMS_UNITOFMEASURE">units of measure</a>; decimal fractions are allowed.
-
-    <a name="FWD">\*[FWD &lt;n unit&gt;]</a>    Move forward inline the specified number of
-                       <a href="definitions.html#TERMS_UNITOFMEASURE">units of measure</a>; decimal fractions are allowed.
-</pre>
+Mom&#8217;s inline escapes for these horizontal movements are
+<br/>
+<span id="bck" class="pre-in-pp">
+  \*[BCK &lt;n unit&gt;]&nbsp;&nbsp;Move backward inline the specified number of
+                    <a href="definitions.html#unitofmeasure">units of measure</a>; decimal fractions are allowed.
+</span>
+and
+<span id="fwd" class="pre-in-pp">
+  \*[FWD &lt;n unit&gt;]&nbsp;&nbsp;Move forward inline the specified number of
+                    <a href="definitions.html#unitofmeasure">units of measure</a>; decimal fractions are allowed.
+</span>
 </p>
 
 <p>
 For example,
-
-<pre>
+<br/>
+<span class="pre-in-pp">
     1.\*[FWD 12p]The Free Trade Play-Offs: WalMart 100, Mexico 0
-</pre>
-
-puts 12 points of space between <strong>1.</strong> and
-<strong>The</strong>.
+</span>
+puts 12 points of space between <kbd>1.</kbd> and
+<kbd>The</kbd>.
 </p>
 
-<p>
-<strong>NOTE:</strong> For backward compatibility, the forms
-
-<pre>
-    \*[BP.25]...\*[BP12.75]    Move backward .25...12.75 points
-    \*[FP.25]...\*[FP12.75]    Move forward .25...12.75 points
-</pre>
-
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+For backward compatibility, the forms
+<br/>
+<span class="pre-in-pp">
+  \*[BP.25]...\*[BP12.75]&nbsp;Move backward .25...12.75 points
+  \*[FP.25]...\*[FP12.75]&nbsp;Move forward  .25...12.75 points
+</span>
 also exist (i.e. with no space before the digit and points being
 the unit of measure, hence no unit of measure required).  Both
-accept quarter points, so it's possible to do, for example,
+accept quarter points, so it&#8217;s possible to do, for example,
 <kbd>\*[FP.5]</kbd> or <kbd>\*[BP1.25]</kbd> up to a limit
 of 12.75 points.
 </p>
+</div>
 
-<p>
-<strong>NOTE CONCERNING DOCUMENT PROCESSING:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-notes">
+<h3 id="inlines-docprocessing-horizontal" class="docs notes">Note concerning document processing</h3>
+<p style="margin-top: .5em; padding-bottom: .5em;">
+If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 and wish to design your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS or FOOTERS</a>
-using <strong>mom</strong>'s inline escapes for horizontal movements
-<em>inside</em> the left, centre and/or right strings, or in the
-strings for
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">recto</a>
+<a href="headfootpage.html#headfootpage-intro">HEADERS or FOOTERS</a>
+using mom&#8217;s inline escapes for horizontal movements as part of
+the left, centre and/or right strings, or in the strings for
+<a href="headfootpage.html#hdrftr-rectoverso">recto</a>
 and/or
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
+<a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
-<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you <strong>must</strong> use the forms <kbd>\E*[BP&lt;n&gt;]</kbd>
+<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
+you <i>must</i> use the forms <kbd>\E*[BP&lt;n&gt;]</kbd>
 and <kbd>\E*[FP&lt;n&gt;]</kbd> (i.e. with no space), and enter the
 inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
 e.g. <kbd>\E*[BP.755]</kbd>.
 </p>
+</div>
 
 <!-- -INLINE_VERTICAL_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_VERTICAL_MOM"><h3><u>Vertical inline movement</u></h3></a>
-
-<p>
-If you need to move portions of type up or down on a line,
-<strong>mom</strong> provides the following inline escapes:
-
-<pre>
-    <a name="DOWN">\*[DOWN &lt;n unit&gt;]</a>   Move down inline the specified number of
-                        <a href="definitions.html#TERMS_UNITOFMEASURE">units of measure</a>
-
-    <a name="UP">\*[UP &lt;n unit&gt;]</a>     Move up inline the specified number of
-                        <a href="definitions.html#TERMS_UNITOFMEASURE">units of measure</a>
-</pre>
-</p>
-
+<h3 id="inline-vertical-mom" class="docs">Vertical inline movement</h3>
 <p>
+If you need to move portions of type up or down on a line, mom
+provides the following inline escapes:
+<br/>
+<span id="down" class="pre-in-pp">
+  \*[DOWN &lt;n unit&gt;]&nbsp;Move down inline the specified number of
+                    <a href="definitions.html#unitofmeasure">units of measure</a>
+
+  <span id="up">\*[UP &lt;n unit&gt;]&nbsp;Move up inline the specified number of
+                  <a href="definitions.html#unitofmeasure">units of measure</a></span>
+</span>
 For example,
-
-<pre>
-    Tel: 905\*[UP 1p]-\*[DOWN 1p]4072
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  Tel: 905\*[UP 1p]-\*[DOWN 1p]4072
+</span>
 moves the hyphen in the telephone number up by 1 point, then
 moves back down by the same amount.
 </p>
 
-<p>
-<strong>NOTE:</strong> <kbd>\*[UP]</kbd> and <kbd>\*[DOWN]</kbd> do
-not work with the inline escape,
-<kbd><a href="#INLINE_RULE_MOM">\*[RULE]</a></kbd>.
-See
-<a href="#RULE_EXCEPTION">here</a>
-for details.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>\*[UP]</kbd> and <kbd>\*[DOWN]</kbd> do not work in conjunction
+with the inline escape,
+<kbd><a href="#inline-rule-mom">\*[RULE]</a></kbd>.
 </p>
 
 <p>
-<strong>ADDITIONAL NOTE:</strong> For backward compatibility, the
-following are also available:
-
-<pre>
-    \*[ALD.25]...\*[ALD12.75]   Advance lead .25...12.75 points (move downward)
-    \*[RLD.25]...\*[RLD12.75]   Reverse lead .25...12.75 points (move upward)
-</pre>
+<span class="additional-note">Additional note:</span>
+For backward compatibility, the following are also available:
+<br/>
+<span class="pre-in-pp">
+  \*[ALD.25]...\*[ALD12.75]   Advance lead .25...12.75 points (move downward)
+  \*[RLD.25]...\*[RLD12.75]   Reverse lead .25...12.75 points (move upward)
+</span>
 </p>
 
-<p>
+<p class="tip-bottom">
 Both <kbd>\*[ALD]</kbd> and <kbd>\*[RLD]</kbd> work in points, hence
-you mustn't use a unit of measure.
+you mustn&#8217;t use a unit of measure.
 </p>
+</div>
 
-<p>
-<strong>NOTE CONCERNING DOCUMENT PROCESSING:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-notes">
+<h3 id="inline-docprocessing-vertical" class="docs notes">Note concerning document processing</h3>
+<p style="margin-top: .5em; padding-bottom: .5em;">
+If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 and wish to design your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS or FOOTERS</a>
-using <strong>mom</strong>'s inline escapes for vertical movements
-<em>inside</em> the left, centre and/or right strings, or in the
-strings for
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">recto</a>
+<a href="headfootpage.html#headfootpage-intro">HEADERS or FOOTERS</a>
+using mom&#8217;s inline escapes for vertical movements as part of
+the left, centre and/or right strings, or in the strings for
+<a href="headfootpage.html#hdrftr-rectoverso">recto</a>
 and/or
-<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
+<a href="headfootpage.html#hdrftr-rectoverso">verso</a>
 HEADERS or FOOTERS, or in the strings passed to
-<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you <strong>must</strong> use the forms <kbd>\E*[ALD&lt;n&gt;]</kbd>
+<a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a>,
+you <i>must</i> use the forms <kbd>\E*[ALD&lt;n&gt;]</kbd>
 and <kbd>\E*[RLD&lt;n&gt;]</kbd> (i.e. with no space), and enter the
 inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
 e.g. <kbd>\E*[ALD.5]</kbd>.
 </p>
+</div>
 
 <!-- -INLINE_B_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="B"><h3><u>Terminate a line without advancing on the page</u></h3></a>
-
+<h3 id="inline-b-mom" class="docs">Terminate a line without advancing on the page</h3>
 <p>
-Sometimes, you want <strong>mom</strong> to break a line but not
-advance on the page.  See
-<a href="typesetting.html#EL_EXAMPLE">here</a>
+Sometimes, you want mom to break a line but not advance on the page.
+See
+<a href="typesetting.html#el-example">here</a>
 for an example of when you might want to do this.
 </p>
 
 <p>
-In versions of <strong>mom</strong> prior to 1.2-f, this was
-accomplished through the use of the
-<a href="typesetting.html#EL">EL</a>
+In versions of mom prior to 1.2-f, this was accomplished through the
+use of the
+<a href="typesetting.html#el">EL</a>
 macro.  As of 1.2-f, you can, if you prefer, accomplish the same
 thing by using the inline escape, <kbd>\*[B]</kbd>.  Simply attach
-the escape to the end of any input line.  Using the example
-given in the document entry for <strong>EL</strong>, you'd use
-<kbd>\*[B]</kbd> like this:
-
-<pre>
-    .LEFT
-    .LS 12.5
-    A line of text.\*[B]
-    .ALD 24p
-    The next line of text.
-</pre>
+the escape to the end of any input line.  Using the example given in
+the document entry for EL, you'd use <kbd>\*[B]</kbd> like this:
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  .LS 12.5
+  A line of text.\*[B]
+  .ALD 24p
+  The next line of text.
+</span>
 
 <kbd>\*[B]</kbd> works reliably regardless of the current
-<a href="definitions.html#TERMS_FILLED">fill mode</a>.
+<a href="definitions.html#filled">fill mode</a>.
 </p>
 
 <!-- -INLINE_TB+_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="TB+"><h3><u>Call the next sequential tab without advancing on the page</u></h3></a>
-
+<h3 id="tb-plus-mom" class="docs">Call the next sequential tab without advancing on the page</h3>
 <p>
-Sometimes, you want <strong>mom</strong> to move to the next tab in
-sequence (e.g. from TAB 1 to TAB 2, or TAB 8 to TAB 9) without
-<strong>mom</strong> advancing on the page.  (See the NOTE
-<a href="typesetting.html#NOTE_TN">here</a>
-if you're not clear how <strong>mom</strong> manages tabs and
-linebreaks.)
+Sometimes, you want mom to move to the next tab in sequence (e.g.
+from TAB 1 to TAB 2, or TAB 8 to TAB 9) without mom advancing on the
+page.  (See the NOTE
+<a href="typesetting.html#note-tn">here</a>
+if you&#8217;re not clear how mom manages tabs and linebreaks.)
 </p>
 
 <p>
-In versions of <strong>mom</strong> prior to 1.2-f, this was
-accomplished through the use of
-<a href="typesetting.html#TN">TN</a>.
+In versions of mom prior to 1.2-f, this was accomplished through the
+use of
+<a href="typesetting.html#tn">TN</a>.
 As of 1.2-f, you can, if you prefer, accomplish the same thing by
 using the inline escape, <kbd>\*[TB+]</kbd>.  Simply attach the
 escape to the end of any input line in a tab, like this:
-
-<pre>
-    .TAB 1
-    Some text\*[TB+]    \" This line is in tab 1
-    Some more text      \" This line is in tab 2, on the same baseline as tab 1
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .TAB 1
+  Some text\*[TB+]  \" This line is in tab 1
+  Some more text    \" This line is in tab 2, on the same baseline as tab 1
+</span>
 
 <kbd>\*[TB+]</kbd> works reliably regardless of the current
-<a href="definitions.html#TERMS_FILLED">fill mode</a>.
+<a href="definitions.html#filled">fill mode</a>.
 </p>
 
 <!-- -INLINE_RULE_MOM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_RULE_MOM"><h3><u>Full measure rules</u></h3></a>
-
+<h3 id="inline-rule-mom" class="docs">Full measure rules</h3>
 <p>
 I find I often need rules drawn to the full measure of the current line
-or tab length.  The official way to do this is <kbd>\l'\n(.lu'</kbd>,
-which is annoying to type, and doesn't mean a whole heck of a lot if
-you're new to groff.  The inline, <kbd>\*[RULE]</kbd>, is a simple
-replacement for <kbd>\l'\n(.lu'</kbd>.  Use it whenever you need
+or tab length.  The official way to do this is <kbd>\l'\n[.lu]'</kbd>,
+which is annoying to type, and doesn&#8217;t mean a whole heck of a lot if
+you&#8217;re new to groff.  The inline, <kbd>\*[RULE]</kbd>, is a simple
+replacement for <kbd>\l'\n[.lu]'</kbd>.  Use it whenever you need
 a rule drawn to the full measure of the current line or tab length, for
 example:
-
-<pre>
-    .LL 6P
-    \*[RULE]
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .LL 6P
+  \*[RULE]
+</span>
 
 The above draws a rule the full measure of the 6-pica line length.
 For another way to draw full measure rules, see the macro,
-<a href="graphical.html#DRH">DRH</a>.
+<a href="graphical.html#drh">DRH</a>.
 </p>
 
 <p>
 <kbd>\*[RULE]</kbd> must appear on an
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
+<a href="definitions.html#inputline">input line</a>
 by itself, and always causes a break when entered after a normal
-input line of text.  It does not, however, deposit a break when
-used immediately after a macro.
+input line of text.  It does not, however, deposit a break when used
+immediately after a macro.
 </p>
 
 <p>
 The weight of the rule drawn with <kbd>\*[RULE]</kbd> is controlled
 with the macro
-<a href="#RULE_WEIGHT">RULE_WEIGHT</a>.  <strong>Mom</strong>'s
-default is 1/2 point.
-</p>
-
-<p>
-Please note that <kbd>\*[RULE]</kbd> draws the rule to the full
-measure, hence it <em>cannot</em> be used to fill the remainder of a
-partial line with a rule in this way:
-
-<pre>
-    Signature__________________________________________
-</pre>
+<a href="#rule-weight">RULE_WEIGHT</a>.
+Mom&#8217;s default is 1/2 point.
 </p>
 
-<p>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>\*[RULE]</kbd> draws the rule to the full measure, hence it
+cannot be used to fill the remainder of a partial line with a rule
+in this way:
+<br/>
+<span class="pre-in-pp">
+  Signature__________________________________________
+</span>
 If you wish to accomplish this effect, you have to use
 <kbd>\*[RULE]</kbd> in conjunction with the
-<a href="goodies.html#PAD">PAD</a>
+<a href="goodies.html#pad">PAD</a>
 macro and
-<a href="typesetting.html#STRING_TABS">string tabs</a>.
+<a href="typesetting.html#string-tabs">string tabs</a>.
 (See the
-<a href="goodies.html#PAD_EXAMPLE">example</a>
-provided with <strong>PAD</strong>.)
+<a href="goodies.html#pad-example">example</a>
+provided with PAD.)
 <a name="RULE_EXCEPTION"></a>
 </p>
 
 <p>
 Please also note that the inline escapes
-<a href="#UP"><kbd>\*[UP]</kbd></a>
+<a href="#up"><kbd>\*[UP]</kbd></a>
 and
-<a href="#DOWN"><kbd>\*[DOWN]</kbd></a>
-cannot be used in conjunction with <kbd>\*[RULE]</kbd>.  This
-<em>doesn't</em> work:
-
-<pre>
-    \*[DOWN 2p]\*[RULE]\*[UP 2p]
-</pre>
+<a href="#down"><kbd>\*[DOWN]</kbd></a>
+cannot be used in conjunction with <kbd>\*[RULE]</kbd>.
 </p>
 
-<p>
-This does:
-
-<pre>
-    .ALD 2p
-    \*[RULE]
-    .RLD 2p
-</pre>
+<p>This <i>doesn&#8217;t</i> work:
+<br/>
+<span class="pre-in-pp">
+  \*[DOWN 2p]\*[RULE]\*[UP 2p]
+</span>
+whereas this does:
+<br/>
+<span class="pre-in-pp">
+  .ALD 2p
+  \*[RULE]
+  .RLD 2p
+</span>
 </p>
 
-<p>
-See groff's
-<a href="#INLINE_LINEDRAWING_GROFF">Horizontal line drawing function</a>
+<p class="tip-bottom">
+See groff&#8217;s
+<a href="#inline-linedrawing-groff">Horizontal line drawing function</a>
 for more information on drawing horizontal rules.
 </p>
+</div>
 
 <!-- -RULE_WEIGHT- -->
 
-<hr width="33%" align="left"/>
-
-<a name="RULE_WEIGHT"></a>
-
-<p>
-<nobr>Macro: <strong>RULE_WEIGHT</strong> <kbd>&lt;weight in points&gt;</kbd></nobr>
-<br/>
-
-<em>*Argument must be greater than 0 and less than 100; decimal
-fractions are allowed</em>
+<div id="rule-weight" class="box-macro-args">
+Macro: <b>RULE_WEIGHT</b> <kbd>&lt;weight in points&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Must <span class="normal">not</span> have a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+appended.
 <br/>
-
-<em>*Must </em>not<em> have a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> appended</em>
+&nbsp;&nbsp;Argument must be greater than 0 and less than 100; decimal
+fractions are allowed.
 </p>
 
 <p>
-<strong>RULE_WEIGHT</strong> allows you to tell <strong>mom</strong>
-how heavy (in other words, how &quot;thick&quot;) you want the rules
-drawn with the inline escape,
-<a href="#INLINE_RULE_MOM"><kbd>\*[RULE]</kbd></a>.
+RULE_WEIGHT allows you to tell mom how heavy (in other words, how
+&#8220;thick&#8221;) you want the rules drawn with the inline
+escape,
+<a href="#inline-rule-mom"><kbd>\*[RULE]</kbd></a>.
 It takes a single argument: the weight of the rule in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
-<em>but without the</em>
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-<strong><kbd>p</kbd></strong> <em>attached</em>.  Thus, to set the weight of rules
-drawm with <kbd>\*[RULE]</kbd> to 1-1/4 points, you'd do
-
-<pre>
-    .RULE_WEIGHT 1.25
-</pre>
+<a href="definitions.html#picaspoints">points</a>
+<i>but without the</i>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+<kbd>p</kbd> <i>attached</i>.  Thus, to set the weight of rules
+drawn with <kbd>\*[RULE]</kbd> to 1-1/4 points, you'd do
+<br/>
+<span class="pre-in-pp">
+  .RULE_WEIGHT 1.25
+</span>
 </p>
 
 <p>
-<strong>RULE_WEIGHT</strong> also sets the weight of rules drawn
+RULE_WEIGHT also sets the weight of rules drawn
 with
-<a href="graphical.html#DRH"><kbd>.DRH</kbd></a>
-when <strong>DRH</strong> is not given any arguments.
+<a href="graphical.html#drh"><kbd>.DRH</kbd></a>
+when DRH is not given any arguments.
 </p>
 
-<hr/>
+<div class="rule-medium"><hr/></div>
 
 <!-- -INLINE_FONT_GROFF- -->
 
-<h2><u>Groff inline escapes</u></h2>
+<h2 id="inlines-groff-top" class="macro-group">Commonly-used groff inline escapes</h2>
 
-<a name="INLINE_FONTS_GROFF"><h3><u>Font control</u> (<kbd>\f</kbd>)</h3></a>
+<h3 id="inline-fonts-groff" class="docs">Font control (<kbd style="text-transform: none">\f</kbd>)</h3>
 
 <p>
-Groff's basic mechanism for inline font control is the escape
+Groff&#8217;s basic mechanism for inline font control is the escape
 <kbd>\f[&lt;font&gt;]</kbd>. 
+<br/>
+<span class="pre-in-pp">
+  \f[R]   Change to the medium roman font  (equivalent to mom's \*[ROM])
+  \f[I]   Change to the medium italic font (equivalent to mom's \*[IT])
+  \f[B]   Change to the bold roman font    (equivalent to mom's \*[BD])
+  \f[BI]  Change to the bold italic font   (equivalent to mom's \*[BDI])
+  \f[P]   Revert to the previous font      (equivalent to mom's \*[PREV])
+</span>
 </p>
 
-<pre>
-    \f[R]   Change to the medium roman font  (equivalent to mom's \*[ROM])
-    \f[I]   Change to the medium italic font (equivalent to mom's \*[IT])
-    \f[B]   Change to the bold roman font    (equivalent to mom's \*[BD])
-    \f[BI]  Change to the bold italic font   (equivalent to mom's \*[BDI])
-    \f[P]   Revert to the previous font      (equivalent to mom's \*[PREV])
-</pre>
-
 <p>
 <kbd>\f[&lt;font&gt;]</kbd> can be used with any valid
-<a href="definitions.html#TERMS_FONT">font style</a>
+<a href="definitions.html#font">font style</a>
 registered with groff.  (See
-<a href="appendices.html#STYLE_EXTENSIONS">here</a>
-for a list of pre-registered font styles provided by
-<strong>mom</strong>).
+<a href="appendices.html#style-extensions">here</a>
+for a list of pre-registered font styles provided by mom).
 </p>
 
 <p>
@@ -780,241 +773,246 @@
 need to change both family and font inline.  For example, if your
 prevailing family and font are Times Roman and you want a few words
 in Courier Bold Italic, you could do this:
-
-<pre>
-    .FAM T
-    .FT  R
-    The command \f[CBI]ls -l\f[P] gives a &quot;long&quot; directory listing.
-</pre>
-
-The Unix command <kbd><strong>ls -l</strong></kbd> will appear in
-Courier Bold Italic in a line that is otherwise in Times Roman.
+<br/>
+<span class="pre-in-pp">
+  .FAM T
+  .FT  R
+  The command \f[CBI]ls -l\f[P] gives a "long" directory listing.
+</span>
+The Unix command <kbd>ls -l</kbd> will appear in Courier Bold Italic
+in a line that is otherwise in Times Roman.
 </p>
 
 <!-- -INLINE_HORIZONTAL_GROFF- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_HORIZONTAL_GROFF"><h3><u>Inline horizontal motions</u> (<kbd>\h</kbd>)</h3></a>
-
-<p>
-Whenever you need to move forward or backward on a line, use
-the inline
-
-<pre>
-    \h'&lt;distance&gt;'
-</pre>
-</p>
+<h3 id="inline-horizontal-groff" class="docs">Inline horizontal motions (<kbd style="text-transform: none;">\h</kbd>)</h3>
 
 <p>
+Whenever you need to move forward or backward on a line, use the
+inline
+<br/>
+<span class="pre-in-pp">
+  \h'&lt;distance&gt;'
+</span>
 In order to avoid unpleasant surprises, always append a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 to <kbd>&lt;distance&gt;</kbd>.  For example,
-
-<pre>
-    \h'1.25i'
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  \h'1.25i'
+</span>
 moves you 1.25 inches to the right (forward) of the horizontal
 position on the current
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>.
+<a href="definitions.html#outputline">output line</a>.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
 <kbd>\h'&lt;distance&gt;'</kbd> is exactly equivalent to
-<a href="#FWD"><kbd>\*[FWD n&lt;unit&gt;]</kbd></a>.
+<a href="#fwd"><kbd>\*[FWD n&lt;unit&gt;]</kbd></a>.
 </p>
+</div>
 
 <p>
 To move backwards by the same amount, do
+<br/>
+<span class="pre-in-pp">
+  \h'-1.25i'
+</span>
+</p>
 
-<pre>
-    \h'-1.25i'
-</pre>
-
+<div class="box-tip">
+<p class="tip" style="margin-top: -1em;">
+<span class="note">Note:</span>
 <kbd>\h'-&lt;distance&gt;'</kbd> is exactly equivalent to
-<a href="#BCK"><kbd>\*[BCK n&lt;unit&gt;]</kbd></a>.
+<a href="#bck"><kbd>\*[BCK n&lt;unit&gt;]</kbd></a>.
 </p>
+</div>
 
 <!-- -INLINE_VERTICAL_GROFF- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_VERTICAL_GROFF"><h3><u>Inline vertical motions</u> (<kbd>\v</kbd>)</h3></a>
+<h3 id="inline-vertical-groff" class="docs">Inline vertical motions (<kbd style="text-transform: none;">\v</kbd>)</h3>
 
 <p>
 If you need to raise or lower type on a line (say, for sub- or
 superscripts, or any other special effect), use
-
-<pre>
-    \v'&lt;distance&gt;'
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  \v'&lt;distance&gt;'
+</span>
 In order to avoid unpleasant surprises, always append a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-to &quot;distance&quot;.  For example, 
-
-<pre>
-    \v'.6m'
-</pre>
-
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+to <kbd>&lt;distance&gt;</kbd>.  For example, 
+<br/>
+<span class="pre-in-pp">
+  \v'.6m'
+</span>
 moves you (approx.) 2/3 of an
-<a href="definitions.html#TERMS_EM">em</a>
+<a href="definitions.html#em">em</a>
 downward on the current
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>.
-<kbd>\v'&lt;distance&gt;'</kbd> is exactly equivalent to
-<a href="#DOWN"><kbd>\*[DOWN n&lt;unit&gt;]</kbd></a>.
-</p>
-
-<p>
-To move upward an equivalent amount, do
-
-<pre>
-    \v'-.6m'
-</pre>
+<a href="definitions.html#outputline">output line</a>.
 </p>
 
-<p>
-<kbd>\v'&lt;-distance&gt;'</kbd> is exactly equivalent to <a
-href="#UP"><kbd>\*[UP n&lt;unit&gt;]</kbd></a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>\v'&lt;distance&gt;'</kbd> is exactly equivalent to
+<a href="#down"><kbd>\*[DOWN n&lt;unit&gt;]</kbd></a>.
 </p>
+</div>
 
-<p>
-<strong>IMPORTANT:</strong> The vertical motion of <kbd>\v</kbd>
-affects ONLY type on the current
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>.
+<p style="margin-top: -.5em;">
+To move upward an equivalent amount, do
+<br/>
+<span class="pre-in-pp">
+  \v'-.6m'
+</span>
+</p>
+
+<div class="box-tip" style="margin-top: -1em;">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>\v'&lt;-distance&gt;'</kbd> is exactly equivalent to
+<a href="#up"><kbd>\*[UP n&lt;unit&gt;]</kbd></a>.
+</p>
+</div>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">Important:</span>
+The vertical motion of <kbd>\v</kbd> affects ONLY type on the
+current
+<a href="definitions.html#outputline">output line</a>.
 When groff breaks the output line, the effect of
 <kbd>\v</kbd> is cancelled; the baseline of the next output line
-is where it would be if you hadn't used <kbd>\v</kbd>.
+is where it would be if you hadn&#8217;t used <kbd>\v</kbd>.
 </p>
+</div>
 
-<p>
-<strong>TIP:</strong> When using <kbd>\v</kbd> for
-occasional effects on a line, don't forget to reverse it when you've
-done what you want to do.  Otherwise, the remaining type will be set
-too high (if you used <kbd>\v</kbd> with the minus sign) or too low
-(if you used <kbd>\v</kbd> without the minus sign).
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+When using <kbd>\v</kbd> for occasional effects in a line,
+don&#8217;t forget to reverse it when you've done what you want to
+do.  Otherwise, the remaining type will be set too high (if you
+used <kbd>\v</kbd> with the minus sign) or too low (if you used
+<kbd>\v</kbd> without the minus sign).
 </p>
+</div>
 
-<!-- -INLINE_STRINGWIDTHL_GROFF- -->
-
-<hr width="33%" align="left"/>
-
-<a name="INLINE_STRINGWIDTH_GROFF"><h3><u>String width function</u> (<kbd>\w</kbd>)</h3></a>
+<!-- -INLINE_STRINGWIDTH_GROFF- -->
 
+<h3 id="inline-stringwidth-groff" class="docs">String width function (<kbd style="text-transform: none;">\w</kbd>)</h3>
 
 <p>
-In the context of <strong>mom</strong>, the string width inline
-<kbd>\w'string'</kbd> primarily serves to let you establish the
+In the context of mom, the string width inline
+<kbd>\w'&lt;string&gt;'</kbd> primarily serves to let you establish the
 horizontal measure of something (e.g. indents) based on the length
 of a bit of text.  For example, if you want a left indent the length
-of the word &quot;Examples:&quot; plus a space, you can set it with
+of the word &#8220;Examples:&#8221; plus a space, you can set it with
 the <kbd>\w</kbd> inline escape:
-
-<pre>
-    .IL "\w'Examples: '"
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .IL "\w'Examples: '"
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> Whenever you pass <kbd>\w'string'</kbd>
+<div class="box-tip" style="margin-top: -1em;">
+<p class="tip">
+<span class="note">Note:</span>
+Whenever you pass <kbd>\w'string'</kbd>
 to a macro that normally requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
-<em>do <strong>NOT</strong> add a unit of measure to the</em>
-<kbd>\w'string'</kbd> <em>argument.</em>
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+<i>do NOT add a unit of measure to the</i>
+<kbd>\w'string'</kbd> <i>argument.</i>
 </p>
 
-<p>
+<p class="tip-bottom">
 Furthermore, if the string is composed of several words separated
 by spaces, you MUST surround the whole escape with double quotes,
 as in the example above.
 </p>
+</div>
 
 <!-- -INLINE_LINEDRAWING_GROFF- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_LINEDRAWING_GROFF"><h3><u>Horizontal line drawing function</u> (<kbd>\l</kbd>)</h3></a>
+<h3 id="inline-linedrawing-groff" class="docs">Horizontal line drawing function (<kbd style="text-transform: none;">\l</kbd>)</h3>
 
 <p>
-The <kbd>\l'distance'</kbd> inline allows you to draw a
-horizontal rule of the specified distance.  You must supply a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+The <kbd>\l'distance'</kbd> inline allows you to draw a horizontal
+rule of the specified distance.  You must supply a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 Therefore, to set a 3-pica rule into a line of text, you'd do
-
-<pre>
-    A line of text with a superfluous \l'3P' 3-pica rule in it.
-</pre>
-</p>
-
-<p>
-<kbd>\l'3P'</kbd> above not only draws the rule, but advances 3
+<br/>
+<span class="pre-in-pp">
+  A line of text with a superfluous \l'3P' 3-pica rule in it.
+</span>
+<kbd>\l'3P'</kbd>, above, not only draws the rule, but advances 3
 picas horizontally as well, just as you'd expect.
 </p>
 
 <p>
 For an easy way of drawing rules to the full measure of the current
 line or tab length, see
-<a href="#INLINE_RULE_MOM">Full measure rules</a>.
+<a href="#inline-rule-mom">Full measure rules</a>.
 </p>
 
 <p>
 The weight (thickness) of rules varies according to the point
-size in effect when you invoke <kbd>\l</kbd>, but you can't fix
+size in effect when you invoke <kbd>\l</kbd>, but you can&#8217;t fix
 the weight with any real precision.  A point size of 12 produces
 a tastefully moderate rule weight of between one-half and one
 point (depending on your printer).
 </p>
 
-<p>
-<strong>NOTE:</strong> Besides <kbd>\l</kbd>, <strong>groff</strong>
-provides a number of more sophisticated &quot;drawing&quot;
-escapes.  It is well beyond the scope of this documentation
-to demonstrate their usage; see
-<nobr><kbd>info groff =&gt; Escape index =&gt; \D</kbd></nobr>
-for directions concerning their use.  The drawing escapes
-can be a bit unwieldy, so <strong>mom</strong> provides
-&quot;user-friendly&quot; macros for the
-<a href="graphical.html#TOP">graphical objects</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Besides <kbd>\l</kbd>, <b>groff</b> provides a number of more
+sophisticated &#8220;drawing&#8221; escapes.  It is well beyond
+the scope of this documentation to demonstrate their usage; see
+<br/>
+<span class="pre-in-pp">
+  info groff =&gt; Escape index =&gt; \D
+</span>
+for directions concerning their use.  The drawing escapes can be a
+bit unwieldy, so mom provides &#8220;user-friendly&#8221; macros for
+the
+<a href="graphical.html#top">graphical objects</a>
 most commonly enountered in typesetting: horizontal and vertical
 rules, boxes, and circles (ellipses).
 </p>
 
-<p>
-Additionally, <strong>groff</strong> comes with two
-&quot;preprocessors&quot; that let you create ruled tables and
-vector diagrams (line drawings): <strong>tbl</strong> and
-<strong>pic</strong>.  The documentation
-for <strong>tbl</strong> can be downloaded from
-
-<pre>
-    <a href="http://cm.bell-labs.com/cm/cs/doc/76/tbl.ps.gz">http://cm.bell-labs.com/cm/cs/doc/76/tbl.ps.gz</a>;
-</pre>
-
-<strong>pic</strong> from
-
-<pre>
-    <a href="http://www.kohala.com/start/troff/gpic.raymond.ps">http://www.kohala.com/start/troff/gpic.raymond.ps</a>.
-</pre>
-
-Both are powerful tools, but they can be nasty to learn &mdash;
-at first, anyway.  You may prefer to use a vector drawing program
+<p class="tip-bottom">
+Additionally, groff comes with two &#8220;preprocessors&#8221; that
+let you create ruled tables and vector diagrams (line drawings):
+<b>tbl</b> and <b>pic</b>.  The documentation for <b>tbl</b> can be
+downloaded from
+<br/>
+  <a style="display: inline-block; margin-left: 2em; margin-top: .5em; margin-bottom: .5em" href="http://cm.bell-labs.com/cm/cs/doc/76/tbl.ps.gz">http://cm.bell-labs.com/cm/cs/doc/76/tbl.ps.gz</a>
+<br/>
+and <b>pic</b> from
+<br/>
+  <a style="display: inline-block; margin-left: 2em; margin-top: .5em; margin-bottom: .5em" href="http://www.kohala.com/start/troff/gpic.raymond.ps">http://www.kohala.com/start/troff/gpic.raymond.ps</a>
+<br/>
+Both are powerful tools, but they can be nasty to learn&mdash;at
+first, anyway.  You may prefer to use a vector drawing program
 to create diagrams and tables; inserting the results into a
-document is easy enough with <kbd>.PSPIC</kbd> (consult <kbd>man
-groff_tmac</kbd> for information on this indispensable and
+document is easy enough with <kbd>.PSPIC</kbd> (consult
+<kbd>man groff-tmac</kbd> for information on this indispensable and
 easy-to-use macro).
 </p>
+</div>
 
 <!-- -INLINE_CHARACTERS_GROFF- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_CHARACTERS_GROFF"><h3><u>Special characters and symbols</u></h3></a>
-
+<h3 id="inline-characters-groff" class="docs">Special characters and symbols</h3>
 <p>
-Here follows a short list of commonly-used special characters available
-via inline escapes.  If you're not sure of the meaning of some of
-these characters, consult the
-<a href="definitions.html#TERMS">Definitions of Terms</a>.
+Here follows a short list of commonly-used special characters
+available via inline escapes.  If you&#8217;re not sure of the
+meaning of some of these characters, consult the
+<a href="definitions.html#top">Definitions of Terms</a>.
 </p>
 
 <p>
@@ -1022,53 +1020,57 @@
 about anything you'd ever want to appear on the printed page,
 including mathematical symbols, accented characters, unusual
 ligatures and letters unique to various European languages), consult
-<kbd>man groff_char</kbd>.
-
-<pre>
-    CHARACTER                   ESCAPE SEQUENCE
-    ---------                   ---------------
-
-    Comment line                \#
-    Fixed-width space           \&lt;space&gt;  i.e. backslash followed by a space
-    Unbreakable space           \~
-    Digit-width (figure) space  \0
-    Zero-width character        \&amp;
-    Discretionary hyphen        \%
-    Backslash                   \\ or \e
-    Plus&#47;minus (arithmetic)     \(+-
-    Subtract (arithmetic)       \(mi
-    Multiply (arithmetic)       \(mu
-    Divide (arithmetic)         \(di
-    Em-dash                     \(em
-    En-dash                     \(en
-    Left double-quote           \(lq
-    Right double-quote          \(rq
-    Bullet                      \(bu
-    Ballot box                  \(sq
-    One-quarter                 \(14
-    One-half                    \(12
-    Three-quarters              \(34
-    Degree sign                 \(de
-    Dagger                      \(dg
-    Foot mark                   \(fm
-    Cent sign                   \(ct
-    Registered trademark        \(rg
-    Copyright                   \(co
-    Section symbol              \(se
-</pre>
-</p>
-
-<hr/>
-
-<p>
-<a href="color.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="goodies.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
+<kbd>man groff-char</kbd>.
 </p>
 
+<span class="pre">
+  CHARACTER                   ESCAPE SEQUENCE
+  ---------                   ---------------
+  Comment line                \# or .\"
+  Fixed-width space           \&lt;space&gt; (ie backslash followed by a space)
+  Unbreakable space           \~
+  Digit-width (figure) space  \0
+  Zero-width character        \&amp;
+  Discretionary hyphen        \%
+  Backslash                   \\ or \e
+  Plus&#47;minus (arithmetic)     \(+-
+  Subtract (arithmetic)       \(mi
+  Multiply (arithmetic)       \(mu
+  Divide (arithmetic)         \(di
+  Em-dash                     \(em
+  En-dash                     \(en
+  Left double-quote           \(lq
+  Right double-quote          \(rq
+  Bullet                      \(bu
+  Ballot box                  \(sq
+  One-quarter                 \(14
+  One-half                    \(12
+  Three-quarters              \(34
+  Degree sign                 \(de
+  Dagger                      \(dg
+  Foot mark                   \(fm
+  Cent sign                   \(ct
+  Registered trademark        \(rg
+  Copyright                   \(co
+  Section symbol              \(se
+</span>
+<br/>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="color.html#top">Next: Coloured text</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
+
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/intro.html groff-1.21/contrib/mom/momdoc/intro.html
--- groff-1.20.1/contrib/mom/momdoc/intro.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/intro.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,502 +16,511 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>What is mom?</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>What is mom?</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
-
-<a name="TOP"></a>
-
-<p>
-<a href="definitions.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
 
-<p>
-<a name="INTRO"><h1 align="center"><u>What is mom?</u></h1></a>
-
-<a href="#INTRO_INTRO">Who is mom meant for?</a>
-<br/>
-
-<a href="#INTRO_TYPESETTING">Typesetting with mom</a>
-<br/>
-
-<a href="#INTRO_DOCPROCESSING">Document processing with mom</a>
-<br/>
+<body style="background-color: #f5faff;">
 
-<a href="#INTRO_PHILOSOPHY">Mom's philosophy</a>
-<br/>
+<!-- ==================================================================== -->
 
-<a href="#INTRO_DOCUMENTATION">A note on mom's documentation</a>
-<br/>
+<div id="top" class="page">
 
-<a href="#CANONICAL">Canonical reference materials</a>
-<br/>
+<!-- Navigation links -->
+<table style="width: 100%;">
+  <tr>
+    <td><a href="toc.html">Back to Table of Contents</a></td>
+    <td style="text-align: right;"><a href="definitions.html#top">Next: Definitions</a></td>
+  </tr>
+  </table>
+
+<h1 id="intro" class="docs">What is mom?</h1>
+
+<div style="text-align: center;">
+<ul class="no-enumerator" style="margin-left: -2.5em;">
+  <li ><a href="#intro-intro">Who is mom meant for?</a></li>
+  <li ><a href="#intro-typesetting">Typesetting with mom</a></li>
+  <li ><a href="#intro-docprocessing">Document processing with mom</a></li>
+  <li ><a href="#intro-philosophy">Mom&#8217;s philosophy</a></li>
+  <li ><a href="#intro-documentation">A note on mom&#8217;s documentation</a></li>
+  <li ><a href="#canonical">Canonical reference materials</a></li>
+  <li ><a href="#macro-args">How to read macro arguments</a></li>
+</ul>
+</div>
 
-<a href="#MACRO_ARGS">How to read macro arguments</a>
-</p>
+<div class="rule-short" style="margin-top: 18px;"><hr/></div>
 
-<a name="INTRO_INTRO"><h2><u>Who is mom meant for?</u></h2></a>
+<h2 id="intro-intro" class="docs">Who is mom meant for?</h2>
 
 <p>
-<strong>Mom</strong> (&quot;my own macros&quot;, &quot;my other
-macros&quot;, &quot;maximum overdrive macros&quot;...) is a macro set for
+Mom (&#8220;my own macros&#8221;, &#8220;my other macros&#8221;,
+&#8220;maximum overdrive macros&#8221;...) is a macro set for
 groff, designed to format documents for PostScript output.
-She's aimed at three kinds of users:
+She&#8217;s aimed at three kinds of users:
 </p>
 
-<ol>
-    <li>typesetters who suspect groff might be &quot;the right
-        tool for the job&quot; but who are
-        frustrated/intimidated by groff's terse, geeky,
-        not-always-typographically-intuitive
-        <a href="definitions.html#TERMS_PRIMITIVES">primitives</a>;
-    </li>
-    <li>non-scientific writers (novelists, short story writers,
-        journalists, students) who just want their work to
-        look good;
-    </li>
-    <li>newbies to computer typesetting, document processing, or
-        groff who need a well-documented macro set to help them get
-        started.
-    </li>
+<ol style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>Typesetters who suspect groff might be &#8220;the right
+      tool for the job&#8221; but who are
+      frustrated/intimidated by groff&#8217;s terse, geeky,
+      not-always-typographically-intuitive
+      <a href="definitions.html#primitives">primitives</a>;
+  </li>
+  <li>Non-scientific writers (novelists, short story writers,
+      journalists, students) who just want their work to
+      look good;
+  </li>
+  <li>Newbies to computer typesetting, document processing or
+      groff who need a well-documented macro set to help them get
+      started.
+  </li>
 </ol>
 
 <p>
-As might be inferred from the above, <strong>mom</strong> is two macro
-packages in one: a set of typesetting macros, and a set of document
-formatting macros.  The typesetting macros govern the physical
-aspects of page layout and provide sane, comprehensible control over
-typographic refinements.  The document formatting macros let you focus
-on a document's content and logical structure without worrying about
-typesetting or page layout at all.
+As might be inferred from the above, mom is two macro packages in
+one: a set of typesetting macros, and a set of document formatting
+macros.  The typesetting macros govern the physical aspects
+of page layout and provide sane, comprehensible control over
+typographic refinements.  The document formatting macros let you
+focus on a document&#8217;s content and logical structure without
+worrying about typesetting or page layout at all.
 </p>
 
 <p>
-Because <strong>mom</strong> provides both typesetting and document
-formatting macros, it's safe to say she blurs the distinction between
-document processing and document design.  While her basic document style
-come with pretty spiffy defaults (okay &mdash; change &quot;spiffy&quot;
-to &quot;typographically professional&quot;), you can easily control
-how all the various document elements look: titles, page headers and
-footers, page numbering, heads, subheads, footnotes and so on can be
-made to come out exactly the way you want.  And should you need precise
-typographic control over elements in a document that fall outside the
-range of <strong>mom</strong>'s document element tags, you don't have to
-read up on groff
-<a href="definitions.html#TERMS_PRIMITIVES">primitives</a>
+Because mom provides both typesetting and document formatting
+macros, it&#8217;s safe to say she blurs the distinction
+between document processing and document design.  While
+her basic document style come with pretty spiffy defaults
+(okay&mdash;change &#8220;spiffy&#8221; to &#8220;typographically
+professional&#8221;), you can easily control how all the various
+document elements look: titles, page headers and footers, page
+numbering, heads, subheads, footnotes and so on can be made to
+come out exactly the way you want.  And should you need precise
+typographic control over elements in a document that fall outside
+the range of mom&#8217;s document element tags, you don&#8217;t
+have to read up on groff
+<a href="definitions.html#primitives">primitives</a>
 in order to accomplish what you want; the typesetting macros take
 care of that.
 </p>
 
-<a name="INTRO_TYPESETTING"><h2><u>Typesetting with mom</u></h2></a>
+<h2 id="intro-typesetting" class="docs">Typesetting with mom</h2>
 
 <p>
-<strong>Mom</strong>'s typesetting macros control the basic parameters
+Mom&#8217;s typesetting macros control the basic parameters
 of type: margins, line length, type family, font, point size,
-linespacing, and so on.  In addition, they allow you to move around
-on the page horizontally and vertically, and to set up tabs, indents,
-and columns.  Finally, they let you adjust such typographic details as
-justification style, letter spacing, word spacing, hyphenation, and
-kerning.
+linespacing, and so on.  In addition, they allow you to move
+around on the page horizontally and vertically, and to set up
+tabs, indents, and columns.  Finally, they let you adjust such
+typographic details as justification style, letter spacing, word
+spacing, hyphenation, and kerning.
 </p>
 
 <p>
-In terms of typographic control, these macros resemble the
-commands used on dedicated typesetting computers like Compugraphics and
-Linotronics.  Most of them simply give access to groff's typesetting
-primitives in a way that's consistent and easy to use.  A few of
-them (tabs and indents, for example) handle fundamental typesetting
-requirements in ways radically different from groff primitives.
+In terms of typographic control, these macros resemble
+the commands used on dedicated typesetting computers like
+Compugraphics and Linotronics.  Most of them simply give access
+to groff&#8217;s typesetting primitives in a way that&#8217;s
+consistent and easy to use.  A few of them (tabs and indents,
+for example) handle fundamental typesetting requirements in ways
+radically different from groff primitives.
 </p>
 
 <p>
-With <strong>mom</strong>'s typesetting macros, you can, if you wish,
-create individual output pages that you design from the ground up.
-Provided you have not signalled to <strong>mom</strong> that you
-want document processing (via the
-<a href="docprocessing.html#START">START</a>
-macro; see below), every macro is a literal command that remains in
-effect until you modify it or turn it off.  This means that if you
-want to create flyers, surveys, tabulated forms, curricula vitae and
-so on, you may do so in the good old-fashioned way: one step at a
-time with complete control over every element on the page.
+With mom&#8217;s typesetting macros, you can, if you wish, create
+individual output pages that you design from the ground up.
+Provided you have not signalled to mom that you want document
+processing (via the
+<kbd><a href="docprocessing.html#start">START</a></kbd>
+macro; see below), every macro is a literal command that remains
+in effect until you modify it or turn it off.  This means that if
+you want to create flyers, surveys, tabulated forms, curricula
+vitae and so on, you may do so in the good old-fashioned way: one
+step at a time with complete control over every element on the
+page.
 </p>
 
 <p>
 Years of reading various mailing lists dealing with computer
-typesetting (groff, TeX, and friends) have convinced me that no program
-can ever replace the human eye and human input when it comes to high
-quality typesetting.  As of this writing, a thread on the subject of
-&quot;micro typography&quot; in groff has been going on for nearly a
-month.  The reason for the lengthy thread is obvious; words and
-punctuation on the printed page are too variable, too fluid, to be
-rendered flawlessly by any algorithm, no matter how clever.  (For
-whatever it's worth, a similar problem exists with engraving musical
-scores by computer.)
+typesetting (groff, TeX, and friends) have convinced me that no
+program can ever replace the human eye and human input when it
+comes to high quality typesetting.  As of this writing, a thread
+on the subject of &#8220;micro typography&#8221; in groff has been
+going on for nearly a month.  The reason for the lengthy thread
+is obvious; words and punctuation on the printed page are too
+variable, too fluid, to be rendered flawlessly by any algorithm,
+no matter how clever.  (For whatever it&#8217;s worth, a similar
+problem exists with engraving musical scores by computer.)
 </p>
 
 <p>
-<strong>Mom</strong> does not try to solve the problems posed
-by things like hanging punctuation, left-margin adjustments for
-upper case letters like T and W, and so on.  She merely tries to
-provide tools that allow knowledgeable typesetters to come up with
+Mom does not try to solve the problems posed by things like
+hanging punctuation, left-margin adjustments for upper case
+letters like T and W, and so on.  She merely tries to provide
+tools that allow knowledgeable typesetters to come up with
 solutions to these problems in ways that are easier and more
 intuitive than manipulating groff at the
-<a href="definitions.html#TERMS_PRIMITIVES">primitive</a>
-level.  As a professional typesetter of more than two decades, and a
-writer, I have encountered few situations that cannot be handled by
-<strong>mom</strong>'s typesetting macros.
+<a href="definitions.html#primitives">primitive</a>
+level.  As a professional typesetter of more than two decades, and
+a writer, I have encountered few situations that cannot be handled
+by mom&#8217;s typesetting macros.
 </p>
 
 <p>
-<strong>Author's note:</strong> One area where groff itself needs
-serious rethinking is in the matter of an algorithm that takes into
+Author&#8217;s note: One area where groff itself needs serious
+rethinking is in the matter of an algorithm that takes into
 account both word and letter spacing when
-<a href="definitions.html#TERMS_JUST">justifying</a>
-lines.  At present, only word spacing is adjusted, requiring what I
-consider an unnecessary amount of user intervention whenever
+<a href="definitions.html#just">justifying</a>
+lines.  At present, only word spacing is adjusted, requiring what
+I consider an unnecessary amount of user intervention whenever
 letter spacing is required.
 </p>
 
-<a name="INTRO_DOCPROCESSING"><h2><u>Document processing with mom</u></h2></a>
+<h2 id="intro-docprocessing" class="docs">Document processing with mom</h2>
 
 <p>
-<strong>Mom</strong>'s document processing macros let you format
-documents without having to worry about the typographic details.
-In this respect, <strong>mom</strong> is similar to other groff macro
-packages, as well as to html and LaTeX.  Where <strong>mom</strong>
-differs is in the degree of control you have over the look and
-placement of the various elements of a document.  For example, if you
-don't want your heads underlined, or you want them bigger/smaller,
-or you'd prefer them to be in a different font, or you'd rather they
-were flush left instead of centred, you can make the changes easily
+Mom&#8217;s document processing macros let you format documents
+without having to worry about the typographic details.  In this
+respect, mom is similar to other groff macro packages, as well as
+to html and LaTeX.  Where mom differs is in the degree of control
+you have over the look and placement of the various elements of
+a document.  For example, if you don&#8217;t want your heads
+underlined, or you want them bigger/smaller, or you&#8217;d prefer
+them to be in a different font, or you&#8217;d rather they were
+flush left instead of centred, you can make the changes easily
 and have them apply to the whole document.  Temporary and one-off
 changes are easy, too.
 </p>
 
 <p>
-<strong>Mom</strong> has some nifty features other macro sets
-don't provide.  For example, you can switch between draft-style and
-final-copy output.  If you regularly make submissions to publishers
-and editors who insist on "typewritten, double-spaced," there's a
-special macro &mdash;
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>
-&mdash; that changes typeset documents into ones that would make
-your high-school typing teacher proud.  Footnotes, endnotes, tables
-of contents, multiple columns, nested lists, recto/verso printing
-and user designable headers and footers are also part of the fun.
-</p>
-
-<a name="INTRO_PHILOSOPHY"><h2><u>Mom's philosophy</u></h2></a>
-
-<p>
-Formatting documents should be easy, from soup to nuts.  Writers need
-to focus on what they're writing, not on how it looks.  From the
-moment you fire up an editor to the moment you add "FINIS"
-to your opus, nothing should interfere with the flow of your words.
-The commands needed to format your work should be easy to remember,
-comprehensible, and stand out well from the text.  There shouldn't
-be too much clutter.  Your documents should be as readable inside a
-text editor as they are on the printed page.
+Mom has some nifty features other macro sets don&#8217;t provide.
+For example, you can switch between draft-style and final-copy
+output.  If you regularly make submissions to publishers and
+editors who insist on "typewritten, double-spaced," there&#8217;s
+a special macro&mdash;
+<a href="docprocessing.html#printstyle"><kbd>PRINTSTYLE TYPEWRITE</kbd></a>&mdash;
+that changes typeset documents into ones that would make your
+high-school typing teacher proud.  Footnotes, endnotes, tables of
+contents, multiple columns, nested lists, recto/verso printing and
+user designable headers and footers are also part of the fun.
+</p>
+
+<h2 id="intro-philosophy" class="docs">Mom&#8217;s philosophy</h2>
+
+<p>
+Formatting documents should be easy, from soup to nuts.  Writers
+need to focus on what they&#8217;re writing, not on how it looks.
+From the moment you fire up an editor to the moment you add
+"FINIS" to your opus, nothing should interfere with the flow of
+your words.  The commands needed to format your work should be
+easy to remember, comprehensible, and stand out well from the
+text.  There shouldn&#8217;t be too much clutter.  Your documents
+should be as readable inside a text editor as they are on the
+printed page.
 </p>
 
 <p>
-Unfortunately, in computerland, &quot;easy,&quot;
-&quot;comprehensible,&quot; and &quot;readable&quot; often mean
-&quot;you're stuck with what you get.&quot; No document formatting
-system can give you exactly what you want all the time, every time.
-Documents, it seems, always need to be tweaked, either to satisfy a
-typographic whim or to clarify some aspect of their content.
+Unfortunately, in computerland, &#8220;easy,&#8221;
+&#8220;comprehensible,&#8221; and &#8220;readable&#8221; often
+mean &#8220;you&#8217;re stuck with what you get.&#8221; No
+document formatting system can give you exactly what you want all
+the time, every time.  Documents, it seems, always need to be
+tweaked, either to satisfy a typographic whim or to clarify some
+aspect of their content.
 </p>
 
 <p>
-Groff has traditionally solved the problem of formatting vs. tweaking
-by requiring users of the common macro packages (mm, ms, me and their
-offspring) to resort to groff
-<a href="definitions.html#TERMS_PRIMITIVES">primitives</a>
+Groff has traditionally solved the problem of formatting vs.
+tweaking by requiring users of the common macro packages (mm, ms,
+me and their offspring) to resort to groff
+<a href="definitions.html#primitives">primitives</a>
 and
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-for their special typesetting needs.  Not to put too fine a point on
-it, groff primitives tend toward the abstruse, and most inline escapes
-are about as readable in-line as an encrypted password.  This does
-not make for happy-camper writers, who either find themselves stuck
-with a document formatting style they don't really like, or are
-forced to learn groff from the ground up &mdash; a daunting task, to
-say the least.
+<a href="definitions.html#inlines">inline escapes</a>
+for their special typesetting needs.  Not to put too fine a
+point on it, groff primitives tend toward the abstruse, and most
+inline escapes are about as readable in-line as an encrypted
+password.  This does not make for happy-camper writers, who either
+find themselves stuck with a document formatting style they
+don&#8217;t really like, or are forced to learn groff from the
+ground up&mdash;a daunting task, to say the least.
 </p>
 
 <p>
-<strong>Mom</strong> aims to make creating documents a simple matter,
-but with no corresponding loss of user control.  The document
-processing macros provide an excellent set of defaults, but if
-something is not to your liking, you can change it.  And in combination
-with the typesetting macros, you have all the tools you need to
-massage passages and tweak pages until they look utterly professional.
+Mom aims to make creating documents a simple matter, but with
+no corresponding loss of user control.  The document processing
+macros provide an excellent set of defaults, but if something is
+not to your liking, you can change it.  And in combination with
+the typesetting macros, you have all the tools you need to massage
+passages and tweak pages until they look utterly professional.
 </p>
 
 <p>
-One rarely hears the word &quot;user interface&quot; in conjunction
-with document processing.  Since the user formatting takes place
-inside a text editor, little thought is given to the look and feel
-of the formatting commands.  <strong>Mom</strong> attempts to rectify
-this by providing users with a consistent, readable &quot;coding&quot;
-style.  Most of the macros (especially in the document processing set)
-have humanly-readable names.  Not only does this speed up learning
-the macros, it makes the sense of what's going on in a document,
-typographically and structurally, easier to decipher.
+One rarely hears the term &#8220;user interface&#8221; in
+conjunction with document processing.  Since formatting takes
+place inside a text editor, little thought is given to the
+look and feel of the formatting commands.  Mom attempts to
+rectify this by providing users with a consistent, readable
+&#8220;coding&#8221; style.  Most of the macros (especially in
+the document processing set) have humanly-readable names.  Not
+only does this speed up learning the macros, it makes the sense
+of what&#8217;s going on in a document, typographically and
+structurally, easier to decipher.
 </p>
 
 <p>
-<strong>Mom</strong> does not try to be all things to all people.
-In contrast to the normal groff philosophy, she does not try to
-produce output that looks good no matter where it's displayed.
-She's designed for printed output, although with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>
+Mom does not try to be all things to all people.  In contrast to
+the normal groff philosophy, she does not try to produce output
+that looks good no matter where it&#8217;s displayed.  She&#8217;s
+designed for printed output, although with
+<a href="docprocessing.html#printstyle"><kbd>PRINTSTYLE TYPEWRITE</kbd></a>
 she produces acceptable terminal copy.  She makes no attempt to be
 compatible with older versions of troff.
 </p>
 
 <p>
-One special feature in <strong>mom</strong>'s design is the attention
-she pays to aligning the bottom margins of every page.  Nothing screams
-&quot;shoddy&quot; in typeset documents louder than bottom margins
-that wander, or, in typesetter jargon, &quot;hang.&quot; There are,
-of course, situations where whitespace at the bottom of a page may
-be desirable (for example, you wouldn't want a head to appear at the
-bottom of the page without some text underneath it), but in all cases
-where hanging bottom margins can be avoided, <strong>mom</strong> does
-avoid them, by clever adjustments to leading (&quot;line spacing&quot;)
-and the spacing between different elements on the page.
+One special feature in mom&#8217;s design is the attention she
+pays to aligning the bottom margins of every page.  Nothing
+screams shoddy in typeset documents louder than bottom margins
+that wander, or, in typesetter jargon, &#8220;hang.&#8221; There
+are, of course, situations where whitespace at the bottom of a
+page may be desirable (for example, you wouldn&#8217;t want a head
+to appear at the bottom of the page without some text underneath
+it), but in all cases where hanging bottom margins can be avoided,
+mom does avoid them, by clever adjustments to leading (&#8220;line
+spacing&#8221;) and the spacing between different elements on the
+page.
 </p>
 
-<a name="INTRO_DOCUMENTATION"><h2><u>A note on mom's documentation</u></h2></a>
+<h2 id="intro-documentation" class="docs">A note on mom&#8217;s documentation</h2>
 
 <p>
 Writing documentation is tough, no doubt about it.  One is never
-quite sure of the user's level of expertise.  Is s/he new to the
-application, new to its underlying protocols and programs, new to
-the operating system, new to computers?  At some point, one has to
-decide who the documentation is for.  Making the wrong decision can
-mean the difference between a program that gets used and a program
-that gets tossed.
+quite sure of the user&#8217;s level of expertise.  Is s/he new
+to the application, new to its underlying protocols and programs,
+new to the operating system, new to computers?  At some point, one
+has to decide whom the documentation is for.  Making the wrong
+decision can mean the difference between a program that gets used
+and a program that gets tossed.
 </p>
 
 <p>
-<strong>Mom</strong>'s documentation assumes users know their
-way around their own operating system (basic file management,
-how to invoke commands, how to use a text editor, etc).  I use
-GNU/Linux, and while the documentation may exhibit a GNU/Linux bias,
-<strong>mom</strong> and groff can, in fact, be used on a variety of
-other popular operating systems, including the one from Redmond,
-Virginia, USA.
+Mom&#8217;s documentation assumes users know their way around
+their own operating system (basic file management, how to invoke
+commands, how to use a text editor, etc).  I use GNU/Linux,
+and while the documentation may exhibit a GNU/Linux bias, mom
+and groff can, in fact, be used on a variety of other popular
+operating systems, including the one from Redmond, Virginia, USA.
 </p>
 
 <p>
-The documentation further assumes they at least know what groff is,
-even if they don't know much about it.  Lastly, it assumes that
-everyone &mdash; groff newbies and experts alike &mdash; learns
-faster from a few well-placed examples than from manpage-style
-reference docs.  What <strong>mom</strong>'s documentation doesn't
-assume is that you know everything--not about groff, not about
-typesetting, not about document processing.  Even experts have odd
-lacunae in their knowledge base.  Therefore, whenever I suspect
-that a term or procedure will cause head scratching, I offer an
-explanation.  And when explanations aren't enough, I offer examples.
+The documentation further assumes they at least know what groff
+is, even if they don&#8217;t know much about it.  Lastly,
+it assumes that everyone&mdash;groff newbies and experts
+alike&mdash;learns faster from a few well-placed examples than
+from manpage-style reference docs.  What mom&#8217;s documentation
+doesn&#8217;t assume is that you know everything&mdash;not about
+groff, not about typesetting, not about document processing.  Even
+experts have odd lacunae in their knowledge base.  Therefore,
+whenever I suspect that a term or procedure will cause head
+scratching, I offer an explanation.  And when explanations
+aren&#8217;t enough, I offer examples.
 </p>
 
-<a name="CANONICAL"><h3><u>Canonical reference materials</u></h3></a>
+<h2 id="canonical" class="docs">Canonical reference materials</h2>
 
 <p>
 The canonical reference materials for groff are
-<strong>cstr54</strong> (a downloadable PostScript copy of which is
-available
+<strong>cstr54</strong> (a downloadable PostScript copy of which
+is available
 <a href="http://www.kohala.com/start/troff/">here</a>)
 and the <strong>troff</strong> and <strong>groff_diff</strong>
 manpages.  Another excellent source of information (maybe the best)
-is the groff <strong>info</strong> pages, available by typing
-
-<pre>
-    info groff
-</pre>
-
-at the command line (assuming you have the <strong>TeXinfo
-standalone browser</strong> installed on your system, which is
-standard for most GNU/Linux distributions).  And for
-inputting special characters, see <strong>man groff_char.</strong>
+is the groff info pages, available by typing
+<kbd>info groff</kbd>
+at the command line (assuming you have the TeXinfo standalone
+browser installed on your system, which is standard for most
+GNU/Linux distributions).  And for inputting special characters,
+see <kbd>man groff_char</kbd>.
+</p>
+
+<p style="margin-top: 24px;">
+I&#8217;ve tried to avoid reiterating the information contained
+in these documents; however, in a few places, this has proved
+impossible.  But be forewarned: I have no qualms about
+sidestepping excruciating completeness concerning groff usage;
+I&#8217;m more interested in getting mom users up and running.
+<i>Mea culpa.</i>
+</p>
+
+<div class="box-tip">
+<p class="tip-top" style="padding-bottom: 9px;">
+<b>Note:</b> Mom&#8217;s macro file (om.tmac) is heavily
+commented.  Each macro is preceded by a description of its
+arguments, function and usage, which may give you information in
+addition to what&#8217;s contained in this documentation.
 </p>
+</div>
 
-<p>
-I've tried to avoid reiterating the information contained in these
-documents; however, in a few places, this has proved impossible.
-But be forewarned: I have no qualms about sidestepping excruciating
-completeness concerning groff usage; I'm more interested in getting
-<strong>mom</strong> users up and running. <em>Mea culpa.</em>
-</p>
-
-<p>
-<strong>Note:</strong> <strong>Mom</strong>'s macro file
-(om.tmac) is heavily commented.  Each macro is preceded by a
-description of its arguments, function and usage, which may
-give you information in addition to what's contained in this
-documentation.
-</p>
-
-<p>
+<div class="box-tip">
+<p class="tip-top" style="padding-bottom: 9px; text-indent: 0px;">
 <strong>Addendum:</strong> As of version 1.4-a, the main macro
 file, om.tmac, is now stripped of comments when groff is built
-from sources.  om.tmac in the sources themselves still contains
-the comments, as do the tarballs posted on <strong>mom</strong>'s
-homepage.
+from sources. om.tmac in the sources themselves still contains
+the comments, as do the tarballs posted on mom&#8217;s homepage.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short" style="padding-top: 6px; padding-bottom: 3px;"><hr/></div>
 
-<a name="MACRO_ARGS"><h2><u>How to read macro arguments</u></h2></a>
+<h2 id="macro-args" class="docs">How to read macro arguments</h2>
 
 <p>
 The concise descriptions of macros in this documentation typically
 look like this:
-
-<blockquote>
-    <nobr>Macro: <strong>NAME</strong> <kbd>arguments</kbd></nobr>
-</blockquote>
 </p>
 
+<div class="box-macro-args">
+Macro: <b>MACRO_NAME</b> <kbd class="macro-args">arguments</kbd>
+</div>
+
 <p>
-<kbd>arguments</kbd> lists the macro's arguments using conventions that
-should be familiar to anyone who has ever read a manpage.  Briefly:
+<kbd>arguments</kbd> lists the macro&#8217;s
+arguments using conventions that should be familiar to anyone who
+has ever read a manpage.  Briefly:
+</p>
 
 <ol>
-    <li>Macro arguments are separated from each other by spaces.
-    </li>
-    <li>If an argument is surrounded by chevrons
-        (<kbd>&lt;&nbsp;&gt;</kbd>), it's a description
-        of the argument, not the argument itself.
-    </li>
-    <li>If an argument begins with or is surrounded by double-quotes, the
-        double quotes MUST be included in the argument.
-    </li>
-    <li>If the user has a choice between several arguments, each of the
-        choices is separated by the pipe character
-        (<kbd>|</kbd>), which means &quot;or.&quot;
-    </li>
-    <li>Arguments that are optional are surrounded by square brackets.
-    </li>
-    <li><kbd>&lt;off&gt;</kbd> in an argument list means that any
-        argument other than those in the argument list turns the
-        macro off.
-    </li>
+  <li>Macro arguments are separated from each other by spaces.</li>
+  <li>If an argument is surrounded by chevrons
+      (<kbd>&lt;&nbsp;&gt;</kbd>), it&#8217;s a description
+      of the argument, not the argument itself.
+  </li>
+  <li>If an argument begins with or is surrounded by double-quotes, the
+      double quotes MUST be included in the argument.
+  </li>
+  <li>If the user has a choice between several arguments, each of the
+      choices is separated by the pipe character
+      (<kbd>|</kbd>), which means &#8220;or.&#8221;
+  </li>
+  <li>Arguments that are optional are surrounded by square brackets.</li>
+  <li><kbd>&lt;off&gt;</kbd> in an argument list means that any
+      argument other than those in the argument list turns the
+      macro off.
+  </li>
 </ol>
-</p>
 
-<a name="TOGGLE_MACRO"><h3><u>Toggle macros</u></h3></a>
+<h3 id="toggle-macro" class="docs">Toggle macros</h3>
 
 <p>
-Some macros don't require an argument.  They simply start something.
-When you need to turn them off, the same macro with <em>any</em>
-argument will do the trick.  That's right: ANY argument.  This permits
-choosing whatever works for you: OFF, END, QUIT, DONE, Q, X...  Hell,
-it could even be I_LOVE_MOM.
+Some macros don&#8217;t require an argument.  They simply start
+something.  When you need to turn them off, the same macro with
+<em>any</em> argument will do the trick.  That&#8217;s right:
+<em>any</em> argument (in caps, lowercase or a mixture
+thereof).  This permits choosing whatever works for you:
+<kbd>OFF, end, Quit, Q, X</kbd>...  Hell, it
+could even be <kbd>I_love_mom</kbd>.
 </p>
 
 <p>
 Since these macros toggle things on and off, the argument list
-simply reads
-
-<blockquote>
-    <kbd>toggle</kbd>
-</blockquote>
+simply reads <kbd>toggle</kbd>.
 </p>
 
-<h4><u>Example 1: An argument requiring double-quotes</u></h4>
+<div id="examples" class="examples-container">
+<h2 class="docs" style="margin-top: .5em;">Examples</h2>
 
-<blockquote>
-    <nobr>Macro: <strong>TITLE</strong> <kbd>&quot;&lt;title of document&gt;&quot;</kbd></nobr>
-</blockquote>
+<div class="examples">Example 1: An argument requiring double-quotes</div>
 
-<p>
-The required argument to <strong>TITLE</strong> is the title of your
-document.  Since it's surrounded by double-quotes, you must
-include them in the argument, like this:
+<div class="box-macro-args" style="max-width: 684px;">
+Macro: <b>TITLE</b> <kbd class="macro-args">&quot;&lt;title of document&gt;&quot;</kbd>
+</div>
 
-<pre>
-    .TITLE "My Pulitzer Novel"
-</pre>
+<p>
+The required argument to TITLE is the title of your document.
+Since it&#8217;s surrounded by double-quotes, you must include
+them in the argument, like this:
+<br/>
+<span class="pre-in-pp">
+  .TITLE "My Pulitzer Novel"
+</span>
 </p>
 
-<h4><u>Example 2: A macro with required and optional arguments</u></h4>
+<div class="examples" style="margin-top: -1em;">Example 2: A macro with required and optional arguments</div>
 
-<blockquote>
-    <nobr>Macro: <strong>TAB_SET</strong> <kbd>&lt;tab #&gt;  &lt;indent&gt;  &lt;length&gt;  [ L | R | C | J [ QUAD ] ]</kbd></nobr>
-</blockquote>
+<div class="box-macro-args"  style="width: 684px;">
+Macro: <b>TAB_SET</b> <kbd class="macro-args">&lt;tab number&gt;  &lt;indent&gt;  &lt;length&gt;  [ L | R | C | J [ QUAD ] ]&nbsp;</kbd>
+</div>
 
 <p>
-The first required argument is a number that identifies the tab (say,
-"3").  The second required argument is an indent from the left margin
-(say, 6 picas).  The third required argument is the length of the tab
-(say, 3 picas).  Therefore, at a minimum, when using this macro,
-you would enter:
-
-<pre>
-    .TAB_SET 3 6P 3P
-</pre>
-</p>
-
-<p>
-The remaining two arguments are optional.  The first is a single
-letter, either <kbd>L, R, C</kbd> or <kbd>J</kbd>.  The second,
-which is itself optional after <kbd>L, R, C</kbd> or <kbd>J</kbd>,
-is the word <kbd>QUAD</kbd>.  Therefore, depending on what
-additional information you wish to pass to the macro, you could
-enter:
-
-<pre>
-    .TAB_SET 3 6P 3P L
-        or
-    .TAB_SET 3 6P 3P L QUAD
-</pre>
+The first required argument is a number that identifies the tab
+(say, "3").  The second required argument is an indent from the
+left margin (say, 6 picas).  The third required argument is the
+length of the tab (say, 3 picas).  Therefore, at a minimum, when
+using this macro, you would enter:
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET 3 6P 3P
+</span>
+The remaining two arguments are optional.  The first is a
+single letter, either <kbd>L, R, C</kbd> or
+<kbd>J</kbd>.  The second, which is itself
+optional after <kbd>L, R, C</kbd> or
+<kbd>J</kbd>, is the word <kbd>QUAD</kbd>.
+Therefore, depending on what additional information you wish to
+pass to the macro, you could enter:
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET 3 6P 3P L
+</span>
+or
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET 3 6P 3P L QUAD
+</span>
 </p>
 
-<a name="TOGGLE_EXAMPLE"><h4><u>Example 3: A sample toggle macro:</u></h4></a>
+<div id="toggle-example" class="examples" style="margin-top: -1em;">Example 3: A sample toggle macro:</div>
 
-<blockquote>
-    <nobr>Macro: <strong>QUOTE</strong> <kbd>toggle</kbd></nobr>
-</blockquote>
+<div class="box-macro-args" style="max-width: 684px;">
+Macro: <b>QUOTE</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<strong>QUOTE</strong> begins a section of quoted text in a document
-and doesn't require an argument.  When the quote's finished,
-you have to tell <strong>mom</strong> it's done.
-
-<pre>
-    .QUOTE
-    So runs my dream, but what am I?
-    An infant crying in the night
-    An infant crying for the light
-    And with no language but a cry.
-    .QUOTE OFF
-</pre>
+<kbd>QUOTE</kbd> begins a section of quoted text
+in a document and doesn&#8217;t require an argument.  When the
+quote&#8217;s finished, you have to tell mom it&#8217;s done.
+<span class="pre">
+  .QUOTE
+  So runs my dream, but what am I?
+  An infant crying in the night
+  An infant crying for the light
+  And with no language but a cry.
+  .QUOTE OFF
+</span>
 </p>
 
 <p>
-Alternatively, you could have turned the quote off with
-<kbd>END</kbd>, or <kbd>X</kbd>, or something else.
-</p>
+  Alternatively, you could have turned the quote off with
+  <kbd>END</kbd>, or <kbd>X</kbd>, or something else.
+  </p>
+</div>
 
-<hr/>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="definitions.html#top">Next: Definitions</a></td>
+</tr>
+</table>
 
-<p>
-<a href="definitions.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Table of Contents</a>
-</p>
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/letters.html groff-1.21/contrib/mom/momdoc/letters.html
--- groff-1.20.1/contrib/mom/momdoc/letters.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/letters.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,249 +16,235 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Document Processing, Writing Letters</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Writing letters</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="macrolist.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="refer.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="macrolist.html#top">Next: Quick reference guide</a></td>
+</tr>
+</table>
 
-<a name="LETTERS"><h1 align="center"><u>Writing letters with mom</u></h1></a>
+<h1 class="docs">Writing letters</h1>
 
-<a name="LETTERS_INTRO"><h2><u>Introduction</u></h2></a>
+<h2 id="letters-intro" class="docs">Introduction</h2>
 
 <p>
-<strong>Mom</strong>'s simple but effective letter-writing
-macros are a subset of the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>,
+Mom&#8217;s simple but effective letter-writing macros are a subset
+of the
+<a href="docprocessing.html#docprocessing">document processing macros</a>,
 designed to ease the creation of correspondence.
 </p>
 
 <p>
-Because the letter macros are a subset of the document
-processing macros, you can use
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>
+Because the letter macros are a subset of the document processing
+macros, you can use
+<a href="definitions.html#controlmacro">control macros</a>
 to design correspondence to your own specifications.  However,
-<strong>mom</strong> makes no pretence of providing complete design
-flexibility in the matter of letters, which are, after all, simple
-communicative documents whose only real style requirements are that
-they be neat and professional-looking.
+mom makes no pretence of providing complete design flexibility in
+the matter of letters, which are, after all, simple communicative
+documents whose only real style requirements are that they be neat
+and professional-looking.
 </p>
 
-<hr width="66%" align="left"/>
-
-<p>
-<a name="TUTORIAL"><h2><u>Tutorial on writing letters</u></h2></a>
-</p>
+<div class="examples-container" style="margin-top: 1.5em; margin-bottom: 1.5em;">
+<h3 id="tutorial" class="docs">Tutorial &ndash; writing letters</h3>
 
 <p>
-<strong>Mom</strong> letters begin, like all
-<strong>mom</strong>-processed documents, with a
-<a href="docprocessing.html#REFERENCE_MACROS">reference macro</a>
+Mom letters begin, like all mom-processed documents, with
+<a href="docprocessing.html#reference-macros">reference macros</a>
 (in this case,
-<a href="docprocessing.html#AUTHOR">AUTHOR</a>),
+<a href="docprocessing.html#author">AUTHOR</a>),
 a
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>
-(<strong>LETTER</strong>, obviously), the essential
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a>
+<a href="docprocessing.html#doctype">DOCTYPE</a>
+(LETTER, obviously), the essential
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
 macro, and
-<a href="docprocessing.html#START">START</a>,
+<a href="docprocessing.html#start">START</a>,
 like this:
-
-<pre>
-    .AUTHOR    "Yannick P. Guique"
-    .DOCTYPE    LETTER
-    .PRINTSTYLE TYPESET
-    .START
-</pre>
-</p>
-
-<p>
-<strong>PRINTSTYLE</strong>, above, could also be
-<strong>TYPEWRITE</strong>. <strong>Mom</strong> has no objection to
-creating letters that look like they were typed on an Underwood by a
-shapely secretary with 1940s gams.
-</p>
-
-<p>
-After the <strong>START</strong> macro, you enter headers pertinent
-to your letter: the date, the addressee (in business correspondence,
-typically both name and address), the addresser (that's you; in
-business correspondence, typically both name and address), and a
-greeting (in full, e.g. &quot;Dear Mr. Smith,&quot; or &quot;Dear
-Mr. Smith:&quot;).
+<br/>
+<span class="pre-in-pp">
+  .AUTHOR    "Yannick P. Guique"
+  .DOCTYPE    LETTER
+  .PRINTSTYLE TYPESET
+  .START
+</span>
+PRINTSTYLE, above, could also be <kbd>TYPEWRITE</kbd>. Mom has no
+objection to creating letters that look like they were typed on an
+Underwood by a shapely secretary with 1940s gams.
 </p>
 
 <p>
-The macros for entering the headers are simple (they're not even
-<a href="definitions.html#TERMS_TOGGLE">toggles</a>):
-
-<pre>
-    .DATE
-    .TO
-    .FROM
-    .GREETING
-</pre>
+After the START macro, you enter headers pertinent to your letter:
+the date, the addressee (in business correspondence, typically both
+name and address), the addresser (that&#8217;s you; in business
+correspondence, typically both name and address), and a greeting
+(in full, e.g. &#8220;Dear Mr. Smith,&#8221; or &#8220;Dear
+Mr. Smith:&#8221;).
 </p>
 
 <p>
-You may enter them in any order you like, except for
-<strong>GREETING</strong>, which must come last.
-<strong>Mom</strong> ignores any headers you omit and spaces the
-letter's opening according to what you do include.  See
-<a href="#LETTERS_DEFAULTS">Default for letters</a>
-to find out how <strong>mom</strong> formats the headers.
+The macros for entering the headers are simple (they&#8217;re not even
+<a href="definitions.html#toggle">toggles</a>):
+<br/>
+<span class="pre-in-pp">
+  .DATE
+  .TO
+  .FROM
+  .GREETING
+</span>
+You may enter them in any order you like, except for GREETING, which
+must come last.  Mom ignores any headers you omit and spaces the
+letter&#8217;s opening according to what you do include.  See
+<a href="#letters-defaults">Default for letters</a>
+to find out how mom formats the headers.
 </p>
 
 <p>
-(In pre 1.1.7-a releases of <strong>mom</strong>, the order
-of entry was fixed at the above.  This has been changed, although
-if you do follow the above order, <strong>mom</strong> will
-continue to behave exactly as she did in pre 1.1.7-a.)
+(In pre 1.1.7-a releases of mom, the order of entering headers was
+fixed at the above.  This has been changed, although if you do
+follow the above order, mom will continue to behave exactly as she
+did in pre 1.1.7-a.)
 </p>
 
 <p>
-Once you've filled in what you need to get a letter started, simply
-type the letter, introducing each and every paragraph, including
-the first, with the
-<a href="docelement.html#PP">PP</a>
+Once you&#8217;ve filled in what you need to get a letter started,
+simply type the letter, introducing each and every paragraph,
+including the first, with the
+<a href="docelement.html#pp">PP</a>
 macro.
 </p>
 
 <p>
-At the end of the letter, should you wish an indented closing
-(&quot;Yours truly,&quot; &quot;Sincerely,&quot; &quot;Hugs and
-kisses&quot;), invoke the macro, <kbd>.CLOSING</kbd>, on a
-line by itself and follow it with the text of the closing.  
-<strong>N.B.</strong> Don't put your name here; <strong>mom</strong>
-supplies it automatically from <strong>AUTHOR</strong> with
-enough space to leave room for your signature.
+At the end of the letter, should you wish a closing (&#8220;Yours
+truly,&#8221; &#8220;Sincerely,&#8221; &#8220;Hugs and
+kisses&#8221;), invoke the macro, <kbd>.CLOSING</kbd>, on a line
+by itself, and follow it with the text of the closing. <b>N.B.</b>
+Don&#8217;t put your name here; mom supplies it automatically from
+<a href="docprocessing.html#author">AUTHOR</a>),
+with enough space to leave room for your signature.  If you omit the
+closing, mom simply adds your name (from AUTHOR), again with enough
+space for your signature.
 </p>
 
 <p>
 Assuming our tutorial letter is for business correspondence,
-here's what the complete letter looks like.
-</p>
-
-<pre>
-    .AUTHOR    "Yannick P. Guique"
-    .DOCTYPE    LETTER
-    .PRINTSTYLE TYPESET
-    .START
-    .DATE
-    August 25, 2004
-    .TO
-    GUILLAUME BARRIÈRES
-    Minidoux Corporation
-    5000 Pannes Drive
-    Redmond, Virginia
-    .FROM
-    Y.P. GUIQUE
-    022 Umask Road
-    St-Sauveur-en-dehors-de-la-mappe, Québec
-    .GREETING
-    Dear Mr. Barrières,
-    .PP
-    It has come to my attention that you have been lobbying the
-    US government to prohibit the use of open source software by
-    endeavouring to outlaw so-called &quot;warranty free&quot;
-    applications.
-    .PP
-    I feel it is my duty to inform you that the success of your
-    operating system with its embedded web browser relies heavily
-    on open source programs and protocols, most notably TCP/IP.
-    .PP
-    Therefore, in the interests of your corporation's fiscal health,
-    I strongly advise that you withdraw support for any US
-    legislation that would cripple or render illegal open source
-    development.
-    .CLOSING
-    Sincerely,
-</pre>
-
-<p>
+here&#8217;s what the complete letter looks like.
+<br/>
+<span class="pre-in-pp">
+  .AUTHOR    "Yannick P. Guique"
+  .DOCTYPE    LETTER
+  .PRINTSTYLE TYPESET
+  .START
+  .DATE
+  August 25, 2010
+  .TO
+  GUILLAUME BARRIÈRES
+  Minidoux Corporation
+  5000 Pannes Drive
+  Redmond, Virginia
+  .FROM
+  Y.P. GUIQUE
+  022 Umask Road
+  St-Sauveur-en-dehors-de-la-mappe, Québec
+  .GREETING
+  Dear Mr. Barrières,
+  .PP
+  It has come to my attention that you have once again been
+  lobbying the US government to prohibit the use of open source
+  software by endeavouring to outlaw so-called "warranty
+  free" applications.
+  .PP
+  I feel it is my duty to inform you that the success of your
+  operating system relies heavily on open source programs and
+  protocols, notably TCP/IP.
+  .PP
+  Therefore, in the interests of your corporation&#8217;s fiscal health,
+  I strongly advise that you withdraw support for any US
+  legislation that would cripple or render illegal open source
+  development.
+  .CLOSING
+  Sincerely,
+</span>
 This produces a letter with headers that follow the North American
-standard for business correspondence.  If you'd prefer another style
-of correspondence, for example, British, you'd set up the same
+standard for business correspondence.  If you&#8217;d prefer another style
+of correspondence, for example, British, you&#8217;d set up the same
 letter like this:
-
-<pre>
-    .AUTHOR    "Yannick P. Guique"
-    .DOCTYPE    LETTER
-    .PRINTSTYLE TYPESET
-    .START
-    .FROM
-    .RIGHT
-    Y.P. GUIQUE
-    022 Umask Road
-    St-Sauveur-en-dehors-de-la-mappe, Québec
-    .TO
-    GUILLAUME BARRIÈRES
-    Minidoux Corporation
-    5000 Pannes Drive
-    Redmond, Virginia
-    .DATE
-    .RIGHT
-    August 25, 2004
-    .GREETING
-    Dear Mr. Barrières,
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .AUTHOR    "Yannick P. Guique"
+  .DOCTYPE    LETTER
+  .PRINTSTYLE TYPESET
+  .START
+  .FROM
+  .RIGHT
+  Y.P. GUIQUE
+  022 Umask Road
+  St-Sauveur-en-dehors-de-la-mappe, Québec
+  .TO
+  GUILLAUME BARRIÈRES
+  Minidoux Corporation
+  5000 Pannes Drive
+  Redmond, Virginia
+  .DATE
+  .RIGHT
+  August 25, 2004
+  .GREETING
+  Dear Mr. Barrières,
+</span>
 Notice the use of <kbd>.RIGHT</kbd> after <kbd>.FROM</kbd> and
 <kbd>.DATE</kbd> in this example, used to change the default quad
 for these macros.
 </p>
+</div>
 
-<hr width="66%" align="left"/>
-
-<a name="LETTERS_DEFAULTS"><h2><u>Defaults for letters</u></h2></a>
+<h2 id="letters-defaults" class="docs">Mom&#8217;s default letter style</h2>
 
 <p>
 In letters, if the order of header macros is
-
-<pre>
-    .DATE
-    .TO
-    .FROM
-    .GREETING
-</pre>
-
-<strong>mom</strong> sets
-
-<ol>
-    <li>the date flush right, page right, at the top of page one,
-        with a gap of two linespaces underneath
-    </li>
-    <li>the addressee in a block flush left, page left, with a gap of
-        one linespace underneath
-    </li>
-    <li>the addresser in a block flush left, page left, with a gap of
-        one linespace underneath
-    </li>
-    <li>the greeting flush left, with a gap of one linespace
-        underneath
-    </li>
+</p>
+<ol style="margin-top: -.5em;">
+  <li><kbd>.DATE</kbd></li>
+  <li><kbd>.TO</kbd>&nbsp;&nbsp;(the addressee)</li>
+  <li><kbd>.FROM</kbd>&nbsp;&nbsp;(the addresser)</li>
+  <li><kbd>.GREETING</kbd>&nbsp;&nbsp;(&#8220;Dear Whoever,&#8221; &#8220;To Whom It May Concern,&#8221; etc.)</li>
 </ol>
+<p style="margin-top: -.5em;">
+mom sets
 </p>
-
-<p>
+<ul style="margin-top: -.5em;">
+  <li>the date flush right, page right, at the top of page one,
+      with a gap of two linespaces underneath
+  </li>
+  <li>the addressee (<kbd>.TO</kbd>) in a block flush left, page
+      left, with a gap of one linespace underneath
+  </li>
+  <li>the addresser (<kbd>.FROM</kbd>) in a block flush left, page
+      left, with a gap of one linespace underneath
+  </li>
+  <li>the greeting flush left, with a gap of one linespace
+      underneath
+  </li>
+</ul>
+<p style="margin-top: -.5em;">
 which is the standard for North American business correspondence.
 </p>
 
 <p>
 If you switch the order of <kbd>.DATE</kbd>, <kbd>.TO</kbd> and/or
-<kbd>.FROM</kbd>, <strong>mom</strong> sets all the headers
+<kbd>.FROM</kbd>, mom sets all the headers
 flush left, with a gap of one linespace underneath each.  (The
 default left quad of any header can be changed by invoking the
 <kbd>.RIGHT</kbd> macro, on a line by itself, immediately before
@@ -266,97 +252,100 @@
 </p>
 
 <p>
-Following the headers, <strong>mom</strong> sets
-
-<ul>
-    <li>the body of the letter justified</li>
-    <li>in multi-page letters:</li>
-    <ul>
-        <li>a footer indicating there's a next page (of the form <nobr><kbd>.../#</kbd>)</nobr></li>
-        <li>the page number at the top of every page after page one</li>
-    </ul>
-    <li>the closing/signature line flush left, indented halfway across the page</li>
-</ul>
+Following the headers, mom sets
 </p>
+<ul style="margin-top: -.5em;">
+  <li>the body of the letter justified</li>
+  <li>in multi-page letters:
+  <ul style="margin-left: -.5em;">
+    <li>a footer indicating there&#8217;s a next page (of the form <kbd>.../#</kbd>)</li>
+    <li>the page number at the top of every page after page one</li>
+  </ul></li>
+  <li>the closing/signature lines flush left, indented halfway across the page</li>
+</ul>
 
 <p>
 Other important style defaults are listed below, and may be changed
 via the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
+<a href="typesetting.html#top">typesetting macros</a>
 or the document processing
-<a href="definitions.html#TERMS_CONTROLMACRO">control macros</a>
+<a href="definitions.html#controlmacro">control macros</a>
 prior to
-<a href="docprocessing.html#START">START</a>.  Assume that any
-style parameter not listed below is the same as for
-<a href="docprocessing.html#TYPESET_DEFAULTS">PRINTSTYLE TYPESET</a>
+<a href="docprocessing.html#start">START</a>.
+Assume that any style parameter not listed below is the same as for
+any document processed with
+<a href="docprocessing.html#typeset-defaults">PRINTSTYLE <kbd>TYPESET</kbd></a>
 or
-<a href="docprocessing.html#TYPEWRITE_DEFAULTS">PRINTSTYLE TYPEWRITE</a>.
+<a href="docprocessing.html#typewrite-defaults">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>.
 </p>
 
-<pre>
-PARAMETER             PRINTSTYLE TYPESET   PRINTSTYLE TYPEWRITE
----------             ------------------   --------------------
-
-Paper size            8.5 x 11 inches      8.5 x 11 inches
-Left/right margins    1.125 inches         1.125 inches
-Header margin         3.5 picas            3.5 picas
- (for page numbers)
-Header gap            3 picas              3 picas
- (for page numbers)
-Family                Times Roman          Courier
-Font                  roman                roman
-Point size            12                   12
-Line space            13.5                 12 (i.e. singlespaced)
-Paragraph indent      3 ems                3 picas
-Spaced paragraphs     yes                  no
-Footers*              yes                  yes
-Footer margin         3 picas              3 picas
-Footer gap            3 picas              3 picas
-Page numbers          top, centred         top, centred
-
-*Footers contain a &quot;next page&quot; number of the form .../#
-</pre>
-
-<hr/>
-
-<a name="LETTERS_MACROS"><h2><u>The letter macros</u></h2></a>
-
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<span class="pre defaults">
+  PARAMETER                 PRINTSTYLE TYPESET         PRINTSTYLE TYPEWRITE
+
+  Paper size                8.5 x 11 inches            8.5 x 11 inches
+  Left/right margins        1.125 inches               1.125 inches
+  Header margin             3.5 picas                  3.5 picas
+   (for page numbers)
+  Header gap                3 picas                    3 picas
+   (for page numbers)
+  Family                    Times Roman                Courier
+  Font                      roman                      roman
+  Point size                12                         12
+  Line space                13.5                       12 (i.e. singlespaced)
+  Paragraph indent          3 ems                      3 picas
+  Spaced paragraphs         yes                        no
+  Footers*                  yes                        yes
+  Footer margin             3 picas                    3 picas
+  Footer gap                3 picas                    3 picas
+  Page numbers              top, centred               top, centred
+
+  *Footers contain a &quot;next page&quot; number of the form .../#
+</span>
+</div>
+
+<div class="rule-medium"><hr/></div>
+
+
+<div class="macro-list-container">
+<h3 id="index-letters-macros" class="macro-list">The letter macros</h3>
+<p style="margin-left: 9px; margin-top: -1.5em;">
 All letter macros must come after
-<a href="docprocessing.html#START">START</a>,
-except <strong>NO_SUITE</strong>.
-</p>
-
-<ul>
-    <li><a href="#DATE">DATE</a></li>
-    <li><a href="#TO">TO</a></li>
-    <li><a href="#FROM">FROM</a></li>
-    <li><a href="#GREETING">GREETING</a></li>
-    <li><a href="#CLOSING">CLOSING</a></li>
-    <li><a href="#NO_SUITE">NO_SUITE</a> &mdash; &quot;next page&quot; number off</li>
+<a href="docprocessing.html#start">START</a>,
+except NO_SUITE, which must come after
+<a href="docprocessin.html#start">PRINTSTYLE</a>
+and before
+<a href="docprocessing.html#start">START</a>.
+</p>
+
+<ul class="macro-list" style="margin-top: -.75em;">
+  <li><a href="#date">DATE</a></li>
+  <li><a href="#to">TO</a></li>
+  <li><a href="#from">FROM</a></li>
+  <li><a href="#greeting">GREETING</a></li>
+  <li><a href="#closing">CLOSING</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#closing-indent">CLOSING_INDENT</a></li>
+    <li><a href="#signature-indent">SIGNATURE_INDENT</a></li>
+  </ul></li>
+  <li><a href="#no-suite">NO_SUITE</a> &ndash; turn the &#8220;next page&#8221; footer off</li>
 </ul>
+</div>
 
 <!-- -DATE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="DATE"></a>
-
-<p>
-Macro: <strong>DATE</strong>
-</p>
+<div id="date" class="box-macro-args">
+Macro: <b>DATE</b>
+</div>
 
 <p>
 Invoke <kbd>.DATE</kbd> on a line by itself, with the date
 underneath, like this:
-
-<pre>
-    .DATE
-    October 31, 2002
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .DATE
+  October 31, 2012
+</span>
 If you wish to change the default quad direction for the date,
 enter <kbd>.LEFT</kbd> or <kbd>.RIGHT</kbd>, on a line by itself,
 immediately after <kbd>.DATE</kbd>.
@@ -366,47 +355,36 @@
 If you wish to insert additional space between the date and any
 letter header that comes after it, do so after inputting the date,
 not at the top of the next header macro, like this:
-
-<pre>
-    .DATE
-    October 31, 2002
-    .SPACE     \"Or, more simply, .SP
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .DATE
+  October 31, 2012
+  .SPACE  \"Or, more simply, .SP
+</span>
 If you wish to remove the default space,
-
-<pre>
-    .SPACE -1v \"Or, more simply, .SP -1v
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SPACE -1v  \"Or, more simply, .SP -1v
+</span>
 will do the trick.
 </p>
 
 <!-- -TO- -->
 
-<hr width="33%" align="left"/>
-
-<a name="TO"></a>
-
-<p>
-Macro: <strong>TO</strong>
-</p>
-
-<p>
-Invoke <kbd>.TO</kbd> on a line by itself, with the name
-and address of the addressee underneath, like this:
-
-<pre>
-    .TO
-    JOHN SMITH
-    10 Roberts Crescent
-    Bramladesh, Ont.
-</pre>
-</p>
+<div id="to" class="box-macro-args">
+Macro: <b>TO</b>
+</div>
 
 <p>
+Invoke <kbd>.TO</kbd> on a line by itself, with the name and address
+of the addressee underneath, like this:
+<br/>
+<span class="pre-in-pp">
+  .TO
+  JOHN SMITH
+  10 Roberts Crescent
+  Bramladesh, Ont.
+</span>
 If you wish to change the default quad direction for the address,
 enter <kbd>.LEFT</kbd> or <kbd>.RIGHT</kbd>, on a line by itself,
 immediately after <kbd>.TO</kbd>.
@@ -416,49 +394,38 @@
 If you wish to insert additional space between the address and
 any letter header that comes after it, do so after inputting the
 address, not at the top of the next header macro, like this:
-
-<pre>
-    .TO
-    JOHN SMITH
-    10 Roberts Crescent
-    Bramladesh, Ont.
-    .SPACE     \"Or, more simply, .SP
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .TO
+  JOHN SMITH
+  10 Roberts Crescent
+  Bramladesh, Ont.
+  .SPACE  \"Or, more simply, .SP
+</span>
 If you wish to remove the default space,
-
-<pre>
-    .SPACE -1v \"Or, more simply, .SP -1v
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SPACE -1v  \"Or, more simply, .SP -1v
+</span>
 will do the trick.
 </p>
 
 <!-- -FROM- -->
 
-<hr width="33%" align="left"/>
-
-<a name="FROM"></a>
-
-<p>
-Macro: <strong>FROM</strong>
-</p>
-
-<p>
-Invoke <kbd>.FROM</kbd> on a line by itself, with the name
-and address of the addresser underneath, like this:
-
-<pre>
-    .FROM
-    JOE BLOW
-    15 Brunette Road
-    Ste-Vieille-Andouille, Québec
-</pre>
-</p>
+<div id="from" class="box-macro-args">
+Macro: <b>FROM</b>
+</div>
 
 <p>
+Invoke <kbd>.FROM</kbd> on a line by itself, with the name and
+address of the addresser underneath, like this:
+<br/>
+<span class="pre-in-pp">
+  .FROM
+  JOE BLOW
+  15 Brunette Road
+  Ste-Vieille-Andouille, Québec
+</span>
 If you wish to change the default quad direction for the address,
 enter <kbd>.LEFT</kbd> or <kbd>.RIGHT</kbd>, on a line by itself,
 immediately after <kbd>.FROM</kbd>.
@@ -468,95 +435,133 @@
 If you wish to insert additional space between the address and
 any letter header that comes after it, do so after inputting the
 address, not at the top of the next header macro, like this:
-
-<pre>
-    .FROM
-    JOE BLOW
-    15 Brunette Road
-    Ste-Vieille-Andouille, Québec
-    .SPACE     \"Or, more simply, .SP
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .FROM
+  JOE BLOW
+  15 Brunette Road
+  Ste-Vieille-Andouille, Québec
+  .SPACE  \"Or, more simply, .SP
+</span>
 If you wish to remove the default space,
-
-<pre>
-    .SPACE -1v \"Or, more simply, .SP -1v
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SPACE -1v  \"Or, more simply, .SP -1v
+</span>
 will do the trick.
 </p>
 
 <!-- -GREETING- -->
 
-<hr width="33%" align="left"/>
-
-<a name="GREETING"></a>
+<div id="greeting" class="box-macro-args">
+Macro: <b>GREETING</b>
+</div>
 
 <p>
-Macro: <strong>GREETING</strong>
-</p>
-
-<p>
-Invoke <kbd>.GREETING</kbd> on a line by itself, with the
-full salutation you want for the letter, like this:
-
-<pre>
-    .GREETING
-    Dear Mr. Smith,
-</pre>
+Invoke <kbd>.GREETING</kbd> on a line by itself, with the full
+salutation you want for the letter underneath, like this:
+<br/>
+<span class="pre-in-pp">
+  .GREETING
+  Dear Mr. Smith,
+</span>
 </p>
 
 <!-- -CLOSING- -->
 
-<hr width="33%" align="left"/>
-
-<a name="CLOSING"></a>
-
-<p>
-Macro: <strong>CLOSING</strong>
-</p>
-
-<p>
-Invoke <kbd>.CLOSING</kbd> on a line by itself after the body of the
-letter, with the closing you'd like (e.g. &quot;Yours truly,&quot;),
-like this:
+<div id="closing" class="box-macro-args">
+Macro: <b>CLOSING</b>
+</div>
+
+<p>
+Invoke <kbd>.CLOSING</kbd> on a line by itself after the body of
+the letter, with the closing you&#8217;d like (e.g. &#8220;Yours
+truly,&#8221;) underneath, like this:
+<br/>
+<span class="pre-in-pp">
+  .CLOSING
+  Yours truly,
+</span>
+</p>
+
+<div class="box-tip" style="background-color: #E3D2B1;">
+<p class="tip">
+<span class="tip" style="display: inline-block; padding-bottom: .5em; color: #000056;">CLOSING control macros and defaults</span>
+<br/>
+Two macros control the behaviour of <kbd>.CLOSING</kbd>:
+</p>
+<ul style="margin-top: -1.25em;">
+  <li>CLOSING_INDENT</li>
+  <li>SIGNATURE_SPACE</li>
+</ul>
 
-<pre>
-    .CLOSING
-    Yours truly,
-</pre>
+<p id="closing-indent" style="margin-top: -.25em;">
+The first, CLOSING_INDENT, indicates the distance from the left
+margin you&#8217;d like to have your closing indented.  It takes a
+single
+<a href="definitions.html#numericargument">numeric argument</a>
+and must have a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+appended to it, unless you want an indent of 0 (zero).  Mom&#8217;s
+default is one half the width of the letter&#8217;s line length
+(i.e. halfway across the page).  If you wanted, instead, an indent of
+6
+<a href="definitions.html#picaspoints">picas</a>,
+you&#8217;d do it like this:
+<br/>
+<span class="pre-in-pp">
+  .CLOSING_INDENT 6P
+</span>
+Or, if you wanted to have no indent at all:
+<br/>
+<span class="pre-in-pp">
+  .CLOSING_INDENT 0
+</span>
+</p>
+
+<p id="signature-space" style="margin-top: -1.25em;">
+The second, SIGNATURE_SPACE, controls how much room to leave for the
+signature.  It takes a single
+<a href="definitions.html#numericargument">numeric argument</a>
+and must have a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+appended to it.  Mom&#8217;s default is 3 line spaces, but if you
+wanted to change that to, say, 2 line spaces, you&#8217;d do:
+<br/>
+<span class="pre-in-pp">
+  .SIGNATURE_SPACE 2v
+</span>
 </p>
+</div>
 
 <!-- -NO_SUITE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="NO_SUITE"></a>
-
-<p>
-Macro: <strong>NO_SUITE</strong>
-</p>
+<div class="box-macro-args" style="margin-top: 2em;">
+Macro: <b>NO_SUITE</b>
+</div>
 
 <p>
-If you don't want <strong>mom</strong> to print a &quot;next
-page&quot; number at the bottom of multi-page letters, invoke
+If you don&#8217;t want mom to print a &#8220;next page&#8221;
+number at the bottom of multi-page letters, invoke
 <kbd>.NO_SUITE</kbd>, on a line by itself, prior to
-<a href="docprocessing.html#START">START</a>.
+<a href="docprocessing.html#start">START</a>.
 </p>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="macrolist.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="refer.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="macrolist.html">Next: Quick reference guide</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/macrolist.html groff-1.21/contrib/mom/momdoc/macrolist.html
--- groff-1.20.1/contrib/mom/momdoc/macrolist.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/macrolist.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,458 +16,1265 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Quick reference guide</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Quick reference guide</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="appendices.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="typemacdoc.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="appendices.html#top">Next: Appendices</a></td>
+</tr>
+</table>
 
-<h1 align="center"><a name="QUICK"><u>Quick reference guide to mom</u></a></h1>
+<h1 class="docs">Quick reference guide</h1>
 
 <p>
-Once you know your way around <strong>mom</strong>, you may find
-this guide preferable to using the Table of Contents.  It lists
-<strong>mom</strong>'s major user-space macros.  The links point to
-references found elsewhere in the documentation.
+Once you know your way around mom, you may find this guide
+preferable to using the Table of Contents.  It lists mom&#8217;s
+major user-space macros.  The links point to references found
+elsewhere in the documentation.
 </p>
 
-<h2 align="center"><u>Index to the quick reference guide</u></h2>
 
-<pre>
-TYPESETTING MACROS                     DOCUMENT PROCESSING MACROS
-==================                     ==========================
-<a href="#1">Paper size, margins, line length</a>       <a href="#18">Reference macros</a>
-<a href="#2">Family, font, point size</a>               <a href="#19">General document formatting directives</a>
-<a href="#3">Font modifications</a>                     <a href="#20">Line numbering</a>
-<a href="#4">Linespacing (leading)</a>                  <a href="#21">Set documents in columns</a>
-<a href="#5">Justification, quad, breaking lines</a>    <a href="#22">TYPEWRITE control macros</a>
-<a href="#6">Hyphenation</a>                            <a href="#23">Initiate document processing</a>
-<a href="#7">Word and sentence spacing</a>              <a href="#24">Epigraphs</a>
-<a href="#8">Kerning, ligatures, smartquotes</a>        <a href="#25">Main heads</a>
-<a href="#9">Horizontal/vertical motions, columns</a>   <a href="#26">Subheads</a>
-<a href="#10">Indents</a>                                <a href="#27">Paragraph heads</a>
-<a href="#11">Tabs</a>                                   <a href="#28">Paragraphs</a>
-<a href="#12">Underscoring, underlining</a>              <a href="#29">Quotes (line by line verbatim quotes)</a> 
-<a href="#13">Superscipts</a>                            <a href="#30">Blockquotes (cited passages of text)</a>
-<a href="#14">Nested lists</a>                           <a href="#32">Author linebreaks (section breaks)</a>
-<a href="#15">Colour</a>                                 <a href="#33">Document termination string</a>
-<a href="#16">Dropcaps</a>                               <a href="#34">Footnotes</a>
-<a href="#17">Utilities</a>                              <a href="#35">Endnotes</a>
-                                       <a href="#36">Margin notes</a>
-                                       <a href="#37">Bibliographic references</a>
-                                       <a href="#38">Tables of contents</a>
-                                       <a href="#39">Letter (correspondence) macros</a>
-                                       <a href="#40">Changing global print style parameters after START</a>
-                                       <a href="#41">Managing a document's first-page header</a>
-                                       <a href="#42">Managing page headers and footers</a>
-                                       <a href="#43">Recto/verso page headers and footers</a>
-                                       <a href="#44">Pagination</a>
-                                       <a href="#45">Document and section cover (title) pages</a>
-                                       <a href="#46">Utilities</a>
-</pre>
-
-<hr/>
-
-<h2 align="center"><u>The Quick Reference Guide</u></h2>
-
-<pre>
-TYPESETTING MACROS
-==================
-
-<a name="1">+++ Paper size, margins, line length</a>
-    <a href="typesetting.html#PAPER">PAPER</a>      -- set common paper sizes (letter, A4, etc)
-    <a href="typesetting.html#PAGEWIDTH">PAGEWIDTH</a>  -- set a custom page width
-    <a href="typesetting.html#PAGELENGTH">PAGELENGTH</a> -- set a custom page length
-    <a href="typesetting.html#PAGE">PAGE</a>       -- set explicit page dimensions and margins
-    <a href="typesetting.html#T_MARGIN">T_MARGIN</a>   -- set a top margin
-    <a href="typesetting.html#B_MARGIN">B_MARGIN</a>   -- set a bottom margin
-    <a href="typesetting.html#L_MARGIN">L_MARGIN</a>   -- set a left margin (page offset)
-    <a href="typesetting.html#R_MARGIN">R_MARGIN</a>   -- set a right margin
-    <a href="typesetting.html#LINELENGTH">LL</a>         -- set a line length
-
-<a name="2">+++ Family, font, point size</a>
-    <a href="typesetting.html#FAMILY">FAMILY</a>        -- set the family of type
-    <a href="typesetting.html#FONT">FT</a>            -- set the font style (roman, italic, etc)
-    <a href="typesetting.html#FALLBACK_FONT">FALLBACK_FONT</a> -- establish a fallback font (for missing fonts)
-    <a href="typesetting.html#PS">PT_SIZE</a>       -- set the point size
-    <a href="inlines.html#INLINE_SIZE_MOM">\*[SIZE n]</a>    -- change the point size inline
-
-<a name="3">+++ Font modifications</a>
-    * Pseudo italic
-      <a href="typesetting.html#SETSLANT">SETSLANT</a>   -- set the degree of slant
-      <a href="typesetting.html#SLANT_INLINE">\*[SLANT]</a>  -- invoke pseudo italic inline
-      <a href="typesetting.html#SLANT_INLINE">\*[SLANTX]</a> -- turn off pseudo italic inline
-
-    * Pseudo bold
-      <a href="typesetting.html#SETBOLDER">SETBOLDER</a>   -- set the amount of emboldening
-      <a href="typesetting.html#BOLDER_INLINE">\*[BOLDER]</a>  -- invoke pseudo bold inline
-      <a href="typesetting.html#BOLDER_INLINE">\*[BOLDERX]</a> -- turn off pseudo bold inline
-
-    * Pseudo condensed 
-      <a href="typesetting.html#CONDENSE">CONDENSE</a>  -- set the amount to pseudo condense
-      <a href="typesetting.html#COND_INLINE">\*[COND]</a>  -- invoke pseudo condensing inline
-      <a href="typesetting.html#COND_INLINE">\*[CONDX]</a> -- turn off pseudo condensing inlines
-
-    * Pseudo extended
-      <a href="typesetting.html#EXTEND">EXTEND</a>   -- set the amount to pseudo extend
-      <a href="typesetting.html#EXT_INLINE">\*[EXT]</a>  -- invoke pseudo extending inline
-      <a href="typesetting.html#EXT_INLINE">\*[EXTX]</a> -- turn off pseudo condensing inlinee
-
-<a name="4">+++ Linespacing (leading)</a>
-    <a href="typesetting.html#LEADING">LS</a>       -- set the linespacing (leading)
-    <a href="typesetting.html#AUTOLEAD">AUTOLEAD</a> -- set the linespacing relative to the point size
-
-<a name="5">+++ Justification, quad direction, line-by-line setting, breaking lines</a>
-    <a href="typesetting.html#JUSTIFY">JUSTIFY</a> -- justify text to both margins
-    <a href="typesetting.html#QUAD">QUAD</a>    -- "justify" text left, centre, or right
-    <a href="typesetting.html#LRC">LEFT</a>    -- set line-by-line quad left
-    <a href="typesetting.html#LRC">CENTER</a>  -- set line-by-line quad centre
-    <a href="typesetting.html#LRC">RIGHT</a>   -- set line-by-line quad right
-    <a href="typesetting.html#BR">BR</a>      -- break a justified line
-    <a href="typesetting.html#SPREAD">SPREAD</a>  -- force justify a line
-    <a href="typesetting.html#EL">EL</a>      -- break a line without advancing on the page
-
-<a name="6">+++ Hyphenation</a>
-    <a href="typesetting.html#HY">HY</a>     -- turn automatic hyphenation on or off
-    <a href="typesetting.html#HY_SET">HY_SET</a> -- set automatic hyphenation parameters
-
-<a name="7">+++ Word and sentence spacing</a>
-    <a href="typesetting.html#WS">WS</a> -- set the minimum word space size
-    <a href="typesetting.html#SS">SS</a> -- set the sentence space size
-
-<a name="8">+++ Kerning, ligatures, smartquotes</a>
-    <a href="typesetting.html#KERN">KERN</a>            -- turn automatic character pair kerning on or off
-    <a href="inlines.html#INLINE_KERNING_MOM">\*[BU n]</a>        -- move characters pairs closer together inline
-    <a href="inlines.html#INLINE_KERNING_MOM">\*[FU n]</a>        -- move character pairs further apart inline
-    <a href="typesetting.html#RW">RW</a>              -- uniformly reduce space between characters (tighten)
-    <a href="typesetting.html#EW">EW</a>              -- uniformly increase space between characters (loosen)
-    <a href="typesetting.html#BR_AT_LINE_KERN">BR_AT_LINE_KERN</a> -- break previous line every time RW or EW is invoked
-    <a href="typesetting.html#LIGATURES">LIGATURES</a>       -- turn automatic generation of ligatures on or off
-    <a href="goodies.html#SMARTQUOTES">SMARTQUOTES</a>     -- turn smartquoting on or off
-
-<a name="9">+++ Horizontal and vertical movements, columnar setting</a>
-    <a href="typesetting.html#ALD">ALD</a>        -- move downards on the page
-    <a href="typesetting.html#RLD">RLD</a>        -- move upwards on the page
-    <a href="typesetting.html#SPACE">SPACE</a>      -- insert space between lines on a page
-    <a href="inlines.html#DOWN">\*[DOWN n]</a> -- temporarily move downwards in a line
-    <a href="inlines.html#UP">\*[UP n]</a>   -- temporarily move upwards in a line
-    <a href="inlines.html#FWD">\*[FWD n]</a>  -- move forward in a line
-    <a href="inlines.html#BCK">\*[BCK n]</a>  -- move backwards in a line
-    <a href="typesetting.html#MCO">MCO</a>        -- turn multiple columns on
-    <a href="typesetting.html#MCR">MCR</a>        -- return to vertical position of column start
-    <a href="typesetting.html#MCX">MCX</a>        -- turn multiple columns off, advance past longest column
-
-<a name="10">+++ Indents</a>
-    <a href="typesetting.html#IL">IL</a>  -- set and turn on a left indent
-    <a href="typesetting.html#IR">IR</a>  -- set and turn on a right indent
-    <a href="typesetting.html#IB">IB</a>  -- set and turn on indents both left and right
-    <a href="typesetting.html#IQ">IQ</a>  -- quit (exit) all indents
-    <a href="typesetting.html#TI">TI</a>  -- set and turn on a temporary (one line) indent
-    <a href="typesetting.html#HI">HI</a>  -- set and turn on a hanging indent
-    <a href="typesetting.html#IQ">ILX</a> -- turn left indents off
-    <a href="typesetting.html#IQ">IRX</a> -- turn right indents off
-    <a href="typesetting.html#IQ">IBX</a> -- turn both left and right indents off
-
-<a name="11">+++ Tabs</a>
-    <a href="typesetting.html#TAB_SET">TAB_SET</a>            -- set up a typesetting tab
-    <a href="typesetting.html#TAB">TAB &lt;n&gt;</a>            -- call tab &lt;n&gt;
-    <a href="typesetting.html#TQ">TQ</a>                 -- quit (exit) tabs
-    <a href="typesetting.html#INLINE_ST">\*[STn]...\*[STnX]</a> -- mark off tab positions inline
-    <a href="typesetting.html#TN">TN</a>                 -- move to tab &lt;n+1&gt; without advancing on the page
-    <a href="typesetting.html#ST">ST</a>                 -- set up tabs whose positions were marked inline
-
-<a name="12">+++ Underscoring, underlining</a>
-    <a href="goodies.html#UNDERSCORE">UNDERSCORE</a>       -- underscore type
-    <a href="goodies.html#UNDERSCORE2">UNDERSCORE2</a>      -- double underscore type
-    <a href="goodies.html#UNDERLINE">UNDERLINE</a>        -- underline type (fixed width fonts only)
-    <a href="goodies.html#UL">\*[UL]...\*[ULX]</a> -- invoke underling inline (fixed width fonts only)
-
-<a name="13">+++ Superscipts</a>
-    <a href="goodies.html#SUP">\*[SUP]...\*[SUPX]</a>         -- set characters superscript (inline)
-    <a href="goodies.html#SUP">\*[CONDSUP]...\*[CONDSUPX]</a> -- set pseudo condensed characters superscript (inline)
-    <a href="goodies.html#SUP">\*[EXTSUP]...\*[EXTSUPX]</a>   -- set pseudo extended characters superscript (inline)
-
-<a name="14">+++ Nested lists</a>
-    <a href="docelement.html#LIST">LIST</a>            -- initiate a nested list
-    <a href="docelement.html#ITEM">ITEM</a>            -- begin an item in a list
-    <a href="docelement.html#SHIFT_LIST">SHIFT_LIST</a>      -- change the indent of a list
-    <a href="docelement.html#RESET_LIST">RESET_LIST</a>      -- clear and reset a list's enumerator
-    <a href="docelement.html#PAD_LIST_DIGITS">PAD_LIST_DIGITS</a> -- space to leave for digits in a digit-enumerated list
-
-<a name="15">+++ Colour</a>
-    <a href="color.html#NEWCOLOR">NEWCOLOR</a>        -- initialize (define) a colour
-    <a href="color.html#COLOR">COLOR</a>           -- begin using an initialized colour
-    <a href="color.htmlXCOLOR">XCOLOR</a>          -- initialize a &quot;named&quot; X colour
-    <a href="color.html#COLOR_INLINE">\*[&lt;colorname&gt;]</a> -- being using an initialized colour inline
-
-<a name="16">+++ Dropcaps</a>
-    <a href="goodies.html#DROPCAP">DROPCAP</a>        -- set a dropcap
-    <a href="goodies.html#DROPCAP_FAMILY">DROPCAP_FAMILY</a> -- set a dropcap's family
-    <a href="goodies.html#DROPCAP_FONT">DROPCAP_FONT</a>   -- set a dropcap's font style
-    <a href="goodies.html#DROPCAP_COLOR">DROPCAP_COLOR</a>  -- set a dropcap's colour
-    <a href="goodies.html#DROPCAP_ADJUST">DROPCAP_ADJUST</a> -- adjust size of a dropcap
-    <a href="goodies.html#DROPCAP_GUTTER">DROPCAP_GUTTER</a> -- adjust space between a dropcap and regular text
-
-<a name="17">+++ Utilities</a>
-    <a href="goodies.html#CAPS">CAPS</a>             -- set type all caps
-    <a href="goodies.html#SILENT">COMMENT</a>          -- silently embed comments in a document
-    <a href="goodies.html#ESC_CHAR">ESC_CHAR</a>         -- change the default escape character
-    <a href="goodies.html#LEADER">\*[LEADER]</a>       -- insert leaders at the end of a line
-    <a href="goodies.html#LEADER_CHARACTER">LEADER_CHARACTER</a> -- change the character used for leaders
-    <a href="typesetting.html#NEWPAGE">NEWPAGE</a>          -- break to a new page
-    <a href="goodies.html#PAD">PAD</a>              -- insert equalized regions of whitespace into a line
-    <a href="goodies.html#PAD_MARKER">PAD_MARKER</a>       -- change the character that identifes padding locations
-    <a href="inlines.html#INLINE_RULE_MOM">\*[RULE]</a>         -- draw a full measure rule
-    <a href="goodies.html#SILENT">SILENT</a>           -- turn output processing off or on
-    <a href="goodies.html#TRAP">TRAP</a>             -- enable or disable page position traps
-</pre>
-
-<hr width="66%" align="left"/>
-
-<pre>
-DOCUMENT PROCESSING MACROS
-==========================
-
-<a name="18">+++ Reference macros</a>
-    <a href="docprocessing.html#TITLE">TITLE</a>           -- document title
-    <a href="docprocessing.html#DOCTITLE">DOCTITLE</a>        -- overall document title (if different from TITLE)
-    <a href="docelement.html#ENDNOTE_TITLE">ENDNOTE_TITLE</a>   -- document/chapter identification string for endnotes
-    <a href="docprocessing.html#CHAPTER">CHAPTER</a>         -- chapter number
-    <a href="docprocessing.html#CHAPTER">CHAPTER_TITLE</a>   -- chapter title
-    <a href="docprocessing.html#DRAFT_STRING">CHAPTER_STRING</a>  -- what to use in place of &quot;Chapter&quot;
-    <a href="docprocessing.html#SUBTITLE">SUBTITLE</a>        -- document subtitle
-    <a href="docprocessing.html#AUTHOR">AUTHOR</a>          -- document author(s)
-    <a href="docprocessing.html#COVERTITLE">DOC_COVERTITLE</a>  -- document title cover
-    <a href="docprocessing.html#COVERTITLE">COVERTITLE</a>      -- section cover title
-    <a href="docprocessing.html#COVERTITLE">COPYRIGHT</a>       -- copyright
-    <a href="docprocessing.html#COVERTITLE">MISC</a>            -- miscellaneous cover information
-    <a href="docprocessing.html#DRAFT">DRAFT</a>           -- document's draft number
-    <a href="docprocessing.html#DRAFT_STRING">DRAFT_STRING</a>    -- what to use in place of &quot;Draft&quot;
-    <a href="docprocessing.html#REVISION">REVISION</a>        -- document's revision number
-    <a href="docprocessing.html#REVISION_STRING">REVISION_STRING</a> -- what to use in place of &quot;Revision&quot;
-
-<a name="19">+++ General document formatting directives</a>
-    <a href="docprocessing.html#DOCTYPE">DOCTYPE</a>    -- general document type
-    <a href="docprocessing.html#COPYSTYLE">COPYSTYLE</a>  -- draft or final copy
-    <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a> -- typeset or &quot;typewritten&quot;
-
-<a name="20">+++ Line numbering</a>
-    <a href="docelement.html#NUMBER_LINES">NUMBER_LINES</a>              -- turn automatic line numbering on or off
-     <a href="docelement.html#NUMBER_LINES_CONTROL">Control macros</a>
-      <a href="docelement.html#NUMBER_QUOTE_LINES">NUMBER_QUOTE_LINES</a>      -- turn numbering of lines inside QUOTE on or off
-      <a href="docelement.html#NUMBER_BLOCKQUOTE_LINES">NUMBER_BLOCKQUOTE_LINES</a> -- turn numbering of lines inside BLOCKQUOTE on or off
-
-<a name="21">+++ Set documents in columns</a>
-    <a href="docprocessing.html#COLUMNS">COLUMNS</a>
-    <a href="docprocessing.html#COL_NEXT">COL_NEXT</a>
-    <a href="docprocessing.html#COL_BREAK">COL_BREAK</a>
-
-<a name="22">+++ TYPEWRITE control macros</a>
-    <a href="docprocessing.html#TYPEWRITE_CONTROL">UNDERLINE_ITALIC</a>    -- turn underlining of italics on
-    <a href="docprocessing.html#UNDERLINE_QUOTES">UNDERLINE_QUOTES</a>    -- turn underlining of line for line quotes on or off
-    <a href="docprocessing.html#TYPEWRITE_CONTROL">ITALIC_MEANS_ITALIC</a> -- turn underlining of italics off (use italics)
-    <a href="docprocessing.html#TYPEWRITE_CONTROL">UNDERLINE_SLANT</a>     -- turn underlining of pseudo italics on
-    <a href="docprocessing.html#TYPEWRITE_CONTROL">SLANT_MEANS_SLANT</a>   -- turn underlining of pseudo italics off (use pseudo italics)
-
-<a name="23">+++ Initiate document processing</a>
-    <a href="docprocessing.html#START">START</a> -- begin document processing
-
-<a name="24">+++ Epigraphs</a>
-    <a href="docelement.html#EPIGRAPH">EPIGRAPH</a>        -- set an epigraph underneath the docheader
-     <a href="docelement.html#EPIGRAPH_CONTROL">Control macros</a> -- change default style of epigraphs
-
-<a name="25">+++ Main heads</a>
-    <a href="docelement.html#HEAD">HEAD</a>                    -- set a main head
-     <a href="docelement.html#HEAD_GENERAL">Control macros</a>         -- change default style of heads
-      <a href="docelement.html#HEAD_SPACE">HEAD_SPACE</a>            -- control spacing around heads
-      <a href="docelement.html#NUMBER_HEADS">NUMBER_HEADS</a>          -- number heads
-      <a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a> -- prefix chapter number to head numbering scheme
-      <a href="docelement.html#RESET_HEAD_NUMBER">RESET_HEAD_NUMBER</a>     -- reset head number to &quot;1&quot;
-
-<a name="26">+++ Subheads</a>
-    <a href="docelement.html#SUBHEAD">SUBHEAD</a>                 -- set a subhead
-     <a href="docelement.html#SUBHEAD_GENERAL">Control macros</a>         -- change default style of subheads
-      <a href="docelement.html#NUMBER_SUBHEADS">NUMBER_SUBHEADS</a>       -- number subheads
-      <a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a> -- prefix chapter number to subhead numbering scheme
-      <a href="docelement.html#RESET_SUBHEAD_NUMBER">RESET_SUBHEAD_NUMBER</a>  -- reset subhead number to &quot;1&quot;
-
-<a name="27">+++ Paragraph heads</a>
-    <a href="docelement.html#PARAHEAD">PARAHEAD</a>                -- set a paragraph head (joined to body of paragraph)
-     <a href="docelement.html#PARAHEAD_GENERAL">Control macros</a>         -- change default style of paraheads
-      <a href="docelement.html#NUMBER_PARAHEADS">NUMBER_PARAHEADS</a>      -- number paraheads
-      <a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a> -- prefix chapter number to parahead numbering scheme
-      <a href="docelement.html#RESET_PARAHEAD_NUMBER">RESET_PARAHEAD_NUMBER</a> -- reset parahead number to &quot;1&quot;
-
-<a name="28">+++ Paragraphs</a>
-    <a href="docelement.html#PP">PP</a>                   -- set a paragraph
-     <a href="docelement.html#PP_CONTROL">Paragraph style</a>     -- managing paragraph style concerns
-      <a href="docelement.html#PP_FONT">PP_FONT</a>            -- globally change the font used in regular paragraphs
-      <a href="docelement.html#PARA_INDENT">PARA_INDENT</a>        -- set the paragraph first-line indent
-      <a href="docelement.html#INDENT_FIRST_PARAS">INDENT_FIRST_PARAS</a> -- indenting of paragraph first-lines on or off
-      <a href="docelement.html#PP_SPACE">PARA_SPACE</a>         -- spacing of paragraphs (single blank line) on or off
-
-<a name="29">+++ Quotes (line by line verbatim quotes)</a>
-    <a href="docelement.html#QUOTE">QUOTE</a>                     -- set cited text line by line 
-     <a href="docelement.html#QUOTE_GENERAL">Control macros</a>           -- change default style of quotes
-      <a href="docelement.html#ALWAYS_FULLSPACE_QUOTES">ALWAYS_FULLSPACE_QUOTES</a> -- control spacing around quotes
-    <a href="docelement.html#BREAK_QUOTE">BREAK_QUOTE</a>               -- deprecated
-
-<a name="30">+++ Blockquotes (cited passages of text)</a>
-    <a href="docelement.html#BLOCKQUOTE">BLOCKQUOTE</a>                -- set longer passages of cited text
-     <a href="docelement.html#BLOCKQUOTE_GENERAL">Control macros</a>           -- change default style of blockquotes
-      <a href="docelement.html#ALWAYS_FULLSPACE_QUOTES">ALWAYS_FULLSPACE_QUOTES</a> -- control spacing around quotes
-    <a href="docelement.html#BREAK_QUOTE">BREAK_BLOCKQUOTE</a>          -- deprecated
-
-<a name="31">+++ Code snippets</a>
-    <a href="docelement.html#CODE">CODE</a> -- set a code snippet
-
-<a name="32">+++ Author linebreaks (section breaks)</a>
-    <a href="docelement.html#LINEBREAK">LINEBREAK</a>       -- insert an author linebreak (section break)
-    <a href="docelement.html#LINEBREAK_CHAR">LINEBREAK_CHAR</a>  -- character to use for author linebreaks
-    <a href="docelement.html#LINEBREAK_COLOR">LINEBREAK_COLOR</a> -- colour of author linebreak character
-
-<a name="33">+++ Document termination string</a>
-    <a href="docelement.html#FINIS">FINIS</a>        -- insert a document termination string (e.g. --END--)
-    <a href="docelement.html#FINIS_STRING">FINIS_STRING</a> -- set the document termination string
-    <a href="docelement.html#FINIS_COLOR">FINIS_COLOR</a>  -- set the document termination string colour
-
-<a name="34">+++ Footnotes</a>
-    <a href="docelement.html#FOOTNOTE">FOOTNOTE</a>                -- set a footnote
-     <a href="docelement.html#FOOTNOTE_GENERAL">Control macros</a>         -- change default style of footnotes
-      <a href="docelement.html#FOOTNOTE_MARKERS">FOOTNOTE_MARKERS</a>      -- turn footnote markers on or off
-      <a href="docelement.html#FOOTNOTE_MARKER_STYLE">FOOTNOTE_MARKER_STYLE</a> -- type of footnote marker to use
-      <a href="docelement.html#RESET_FOOTNOTE_NUMBER">RESET_FOOTNOTE_NUMBER</a> -- reset footnote numbering
-      <a href="docelement.html#FOOTNOTE_RULE">FOOTNOTE_RULE</a>         -- turn footnote separator rule on or off
-      <a href="docelement.html#FOOTNOTE_RULE_ADJ">FOOTNOTE_RULE_ADJ</a>     -- adjust vertical position of footnote rule
-      <a href="docelement.html#FOOTNOTE_RULE_LENGTH">FOOTNOTE_RULE_LENGTH</a>  -- adjust length of footnote rule
-      <a href="docelement.html#FOOTNOTES_RUN_ON">FOOTNOTES_RUN_ON</a>      -- instruct footnotes to be continuous (i.e. not to
-                               begin on a new line; only for use with footnotes
-                               identified by document line number)
-
-<a name="35">+++ Endnotes</a>
-    <a href="docelement.html#ENDNOTE">ENDNOTE</a>                        -- set an endnote
-    <a href="docelement.html#EN-MARK">\*[EN-MARK]</a>                    -- mark initial line of a range of line numbers
-                                     (for use with line numbered endnotes)
-    <a href="docelement.html#ENDNOTES">ENDNOTES</a>                       -- output endnotes pages
-     <a href="docelement.html#ENDNOTE_CONTROL">Control macros</a>                -- change just about anything to do with endnotes
-      <a href="docelement.html#ENDNOTES_GENERAL">Endnotes pages general style control</a>
-      <a href="docelement.html#ENDNOTES_HEADER_CONTROL">Endotes pages header/footer control</a>
-      <a href="docelement.html#ENDNOTES_MAIN_TITLE">Endnotes pages main title control</a>
-      <a href="docelement.html#ENDNOTES_MAIN_TITLE">Endnotes pages document/section identification control</a>
-      <a href="docelement.html#ENDNOTES_NUMBERING">Endnote identification style</a>
-
-<a name="36">+++ Margin notes</a>
-    <a href="docelement.html#MN_INIT">MN_INIT</a> -- initialize margin notes
-    <a href="docelement.html#MN">MN</a>      -- set a margin note
-
-<a name="37">+++ Bibliographic references</a>
-    <a href="refer.html#REF">REF</a>                 -- begin a bibliographic reference
-    <a href="refer.html#FOOTNOTE_REFS">FOOTNOTE_REFS</a>       -- place bibliographic references in footnotes
-    <a href="refer.html#ENDNOTE_REFS">ENDNOTE_REFS</a>        -- place bibliographic references in endnotes
-    <a href="refer.html#BRACKET_REFS">REF( / REF)</a>         -- put parentheses around embedded bibliographic references
-    <a href="refer.html#BRACKET_REFS">REF[ / REF]</a>         -- put square brackets around embedded bibliographic references
-    <a href="refer.html#BRACKET_REFS">REF{ / REF}</a>         -- put curly braces around mbedded bibliographic references
-    <a href="refer.html#BIBLIOGRAPHY">BIBLIOGRAPHY</a>        -- output a bibliography
-     <a href="refer.html#BIBLIO_CONTROL">Control macros</a>     -- change just about anything to do with bibliography pages
-      <a href="refer.html#BIBLIOGRAPHY_TYPE">BIBLIOGRAPHY_TYPE</a> -- &quot;plain&quot; or enumerated list bibliography
-      <a href="refer.html#BIBLIO_GENERAL">Bibliography pages general style control</a>
-      <a href="refer.html#BIBLIO_HEADER_CONTROL">Bibliography pages header/footer control</a>
-      <a href="refer.html#BIBLIO_MAIN_TITLE">Bibliography pages main head control</a>
-
-<a name="38">+++ Tables of contents</a>
-    <a href="docelement.html#TOC">TOC</a>
-     <a href="docelement.html#TOC_CONTROL">Control macros</a> -- change just about anything to do with table of contents pages
-      <a href="docelement.html#TOC_GENERAL">Table of contents general style control</a>
-      <a href="docelement.html#TOC_PAGENUMBERING">Table of contents page numbering</a>
-      <a href="docelement.html#TOC_HEADER">Table of contents main title control</a>
-      <a href="docelement.html#TOC_STYLE">Changing the style of the different table of contents entry types</a>
-      <a href="docelement.html#TOC_ADDITIONAL">Additional table of contents control macros</a>
-
-<a name="39">+++ Letter (correspondence) macros</a>
-    <a href="letters.html#DATE">DATE</a>     -- letter's date
-    <a href="letters.html#FROM">FROM</a>     -- letter's addresser
-    <a href="letters.html#TO">TO</a>       -- letter's addressee
-    <a href="letters.html#GREETING">GREETING</a> -- letter's salutation
-    <a href="letters.html#CLOSING">CLOSING</a>  -- letter's closing salutation
-    <a href="letters.html#NO_SUITE">NO_SUITE</a> -- turn printing of &quot;next page number&quot; off or on
-
-<a name="40">+++ Changing global print style parameters after START</a>
-    <a href="docprocessing.html#DOC_LEFT_MARGIN">DOC_LEFT_MARGIN</a>  -- left margin of everything on the page
-    <a href="docprocessing.html#DOC_RIGHT_MARGIN">DOC_RIGHT_MARGIN</a> -- right margin of everything on the page
-    <a href="docprocessing.html#DOC_LINE_LENGTH">DOC_LINE_LENGTH</a>  -- document's base line length
-    <a href="docprocessing.html#DOC_FAMILY">DOC_FAMILY</a>       -- document's base family
-    <a href="docprocessing.html#DOC_PT_SIZE">DOC_PT_SIZE</a>      -- document's base point size
-    <a href="docprocessing.html#DOC_LEAD">DOC_LEAD</a>         -- document's base lead
-    <a href="docprocessing.html#DOC_QUAD">DOC_QUAD</a>         -- document's base quad directions
-
-<a name="41">+++ Managing a document's first-page header</a>
-    <a href="docprocessing.html#DOCHEADER">DOCHEADER</a>       -- document first-page header on or off
-     <a href="docprocessing.html#DOCHEADER_CONTROL_INDEX">Control macros</a> -- change default style of docheader elements
-
-<a name="42">+++ Managing page headers and footers</a>
-    <a href="headfootpage.html#HEADERS">HEADERS</a>             -- turn page headers on or off
-    <a href="headfootpage.html#FOOTERS">FOOTERS</a>             -- turn page footers on or off
-    <a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a> -- enable or disable generation of both headers and footers
-     <a href="headfootpage.html#INDEX_REFERENCE">Header/footer control macros</a>
-      <a href="headfootpage.html#STRINGS">Strings</a>            -- left-right-center strings
-      <a href="headfootpage.html#STYLE">Style</a>              -- change style defaults for headers and/or footers
-      <a href="headfootpage.html#GLOBAL">Global</a>             -- global style changes
-      <a href="headfootpage.html#PART_BY_PART">Part-by-part</a>       -- part-by-part style changes
-      <a href="headfootpage.html#VERTICAL">Vertical placement</a> -- vertical location of headers and/or footers
-      <a href="headfootpage.html#SEPARATOR_RULE">Separator rule</a>     -- manage the header/footer separator rule
-
-<a name="43">+++ Recto/verso page headers and footers</a>
-    <a href="rectoverso.html#RECTO_VERSO">RECTO_VERSO</a>    -- turn recto/verso headers and/or footers on or off
-    <a href="rectoverso.html#SWITCH_HDRFTR">SWITCH_HEADERS</a> -- switch recto or verso header
-    <a href="rectoverso.html#SWITCH_HDRFTR">SWITCH_FOOTERS</a> -- switch recto or verso footer
-    <a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_RECTO</a>   -- string that constitutes a recto header
-    <a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_VERSO</a>   -- string that constitutes a verso header
-    <a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_RECTO</a>   -- string that constitutes a recto footer
-    <a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_VERSO</a>   -- string that constitutes a recto footer
-
-<a name="44">+++ Pagination</a>
-    <a href="headfootpage.html#PAGINATE">PAGINATE</a>                -- pagination on or off
-     <a href="headfootpage.html#PAGINATE_CONTROL">Control macros</a>         -- change default style for pagination
-      <a href="headfootpage.html#PAGENUMBER">PAGENUMBER</a>            -- user-defined (starting) page number
-      <a href="headfootpage.html#PAGENUM_STYLE">PAGENUM_STYLE</a>         -- digits, roman numerals, etc
-      <a href="headfootpage.html#PAGENUM_ON_FIRST_PAGE">PAGENUM_ON_FIRST_PAGE</a> -- when footers are enabled
-      <a href="headfootpage.html#DRAFT_WITH_PAGENUMBER">DRAFT_WITH_PAGENUMBER</a> -- attach draft/revision information to page numbers
-
-<a name="45">+++ Document and section cover (title) pages</a>
-    <a href="cover.html#COVER">COVER</a>          -- information to include in a section cover
-    <a href="cover.html#COVER">DOC_COVER</a>      -- information to include in a document cover
-    <a href="cover.html#ON_OFF">COVERS</a>         -- turn printing of section covers on or off
-    <a href="cover.html#ON_OFF">DOC_COVERS</a>     -- turn printing of document covers on or off
-    <a href="cover.html#COVER_CONTROL_INDEX">Control macros</a> -- change style defaults for covers
-
-<a name="46">+++ Utilities</a>
-    <a href="docelement.html#BLANK_PAGE">BLANKPAGE</a>       -- output one or more blank pages
-    <a href="docprocessing.html#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a> -- adjust document linespacing (lead) to fill pages
-    <a href="rectoverso.html#COLLATE">COLLATE</a>         -- join documents or chapters of a document together
-    <a href="docprocessing.html#SHIM">SHIM</a>            -- move vertical position to nearest next valid baseline
-</pre>
+<div class="macro-list-container" style="padding-left: 9px; padding-right: 9px; padding-bottom: 1px;">
+<h2 class="docs" style="text-align: center; padding-top: 15px;">Index to the quick reference guide</h2>
+<div style="width: 50%; float: left; margin-right: 9px;">
+<h3 class="docs" style="margin-top: 1.25em;">TYPESETTING MACROS</h3>
+<ul style="margin-top: .5em; margin-left: 0; padding-left: 0; list-style-type: none;">
+  <li><a href="#qr-1">Paper size, margins, line length</a></li>
+  <li><a href="#qr-2">Family, font, point size</a></li>
+  <li><a href="#qr-3">Font modifications</a></li>
+  <li><a href="#qr-4">Linespacing (leading)</a></li>
+  <li><a href="#qr-5">Justification, quad, breaking lines</a></li>
+  <li><a href="#qr-6">Hyphenation</a></li>
+  <li><a href="#qr-7">Word and sentence spacing</a></li>
+  <li><a href="#qr-8">Kerning, ligatures, smartquotes</a></li>
+  <li><a href="#qr-9">Horizontal/vertical motions, columns</a></li>
+  <li><a href="#qr-10">Indents</a></li>
+  <li><a href="#qr-11">Tabs</a></li>
+  <li><a href="#qr-12">Underscoring, underlining</a></li>
+  <li><a href="#qr-13">Superscipts</a></li>
+  <li><a href="#qr-14">Nested lists</a></li>
+  <li><a href="#qr-15">Colour</a></li>
+  <li><a href="#qr-16">Dropcaps</a></li>
+  <li><a href="#qr-17">Utilities</a></li>
+  <li><a href="#qr-18">Graphical Objects</a></li>
+</ul>
+<h3 class="docs" style="margin-top: -.5em;">DOCUMENT PROCESSING MACROS</h3>
+<ul style="margin-top: .5em; margin-left: 0; padding-left: 0; list-style-type: none;">
+  <li><a href="#qr-19">Reference macros</a></li>
+  <li><a href="#qr-20">General document formatting directives</a></li>
+  <li><a href="#qr-21">Line numbering</a></li>
+  <li><a href="#qr-22">Set documents in columns</a></li>
+  <li><a href="#qr-23">TYPEWRITE control macros</a></li>
+  <li><a href="#qr-24">Initiate document processing</a></li>
+</ul>
+</div>
+<ul style="margin-top: 1.75em; margin-left: 0; padding-left: 0; list-style-type: none;">
+  <li><a href="#qr-25">Epigraphs</a></li>
+  <li><a href="#qr-26">Main heads</a></li>
+  <li><a href="#qr-27">Subheads</a></li>
+  <li><a href="#qr-28">Paragraph heads</a></li>
+  <li><a href="#qr-19">Reference macros</a></li>
+  <li><a href="#qr-29">Paragraphs</a></li>
+  <li><a href="#qr-30">Quotes (line for line quotes)</a> </li>
+  <li><a href="#qr-31">Blockquotes (cited passages of text)</a></li>
+  <li><a href="#qr-32">Code snippets (inserting bits of programming code)</a></li>
+  <li><a href="#qr-33">Author linebreaks (section breaks)</a></li>
+  <li><a href="#qr-34">Document termination string</a></li>
+  <li><a href="#qr-35">Footnotes</a></li>
+  <li><a href="#qr-36">Endnotes</a></li>
+  <li><a href="#qr-37">Margin notes</a></li>
+  <li><a href="#qr-38">Bibliographic references</a></li>
+  <li><a href="#qr-39">Tables of contents</a></li>
+  <li><a href="#qr-40">Letter (correspondence) macros</a></li>
+  <li><a href="#qr-41">Changing global print style parameters after<br/><span style="margin-left: 1.25em;">START</span></a></li>
+  <li><a href="#qr-42">Managing a document&#8217;s first-page header<br/><span style="margin-left: 1.25em;">(the &#8220;docheader&#8221;)</span></a></li>
+  <li><a href="#qr-43">Managing page headers and footers</a></li>
+  <li><a href="#qr-44">Recto/verso page headers and footers</a></li>
+  <li><a href="#qr-45">Pagination</a></li>
+  <li><a href="#qr-46">Document and section cover (title) pages</a></li>
+  <li><a href="#qr-47">Utilities</a></li>
+</ul>
+</div>
+
+<h2 class="docs">Quick reference guide</h2>
+
+<div style="display: inline-block; margin-top: 1em; margin-bottom: .5em; border-bottom: 2px solid #302419;"><kbd>TYPESETTING MACROS</kbd></div>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-1" class="quick-ref" colspan="2" >+++ Paper size, margins, line length</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#paper">PAPER</a></td><td>-- set common paper sizes (letter, A4, etc)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#pagewidth">PAGEWIDTH</a></td><td>-- set a custom page width</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#pagelength">PAGELENGTH</a></td><td>-- set a custom page length</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#page">PAGE</a></td><td>-- set explicit page dimensions and margins</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#t-margin">T_MARGIN</a></td><td>-- set a top margin</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#b-margin">B_MARGIN</a></td><td>-- set a bottom margin</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#l-margin">L_MARGIN</a></td><td>-- set a left margin (page offset)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#r-margin">R_MARGIN</a></td><td>-- set a right margin</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#linelength">LL</a></td><td>-- set a line length</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr><th id="qr-2" class="quick-ref" colspan="2">+++ Family, font, point size</th></tr>
+<tr>
+<td><a href="typesetting.html#family">FAMILY</a></td><td>-- set the family of type</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#font">FT</a></td><td>-- set the font style (roman, italic, etc)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#fallback-font">FALLBACK_FONT</a></td><td>-- establish a fallback font (for missing fonts)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ps">PT_SIZE</a></td><td>-- set the point size</td>
+</tr>
+<tr>
+<td><a href="inlines.html#inline-size-mom">\*[SIZE n]</a></td><td>-- change the point size inline</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-3" class="quick-ref" colspan="2" >+++ Font modifications</th>
+</tr>
+<tr><td style="padding-left: 0;">Pseudo italic</td></tr>
+<tr>
+<td><a href="typesetting.html#setslant">SETSLANT</a></td><td>-- set the degree of slant</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#slant-inline">\*[SLANT]</a></td><td>-- invoke pseudo italic inline</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#slant-inline">\*[SLANTX]</a></td><td>-- off pseudo italic inline</td>
+</tr>
+<tr><td style="padding-left: 0;">Pseudo bold</td></tr>
+<tr>
+<td><a href="typesetting.html#setbolder">SETBOLDER</a></td><td>-- set the amount of emboldening</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#bolder-inline">\*[BOLDER]</a></td><td>-- invoke pseudo bold inline</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#bolder-inline">\*[BOLDERX]</a></td><td>-- off pseudo bold inline</td>
+</tr>
+<tr><td style="padding-left: 0;">Pseudo condensed</td></tr> 
+<tr>
+<td><a href="typesetting.html#condense">CONDENSE</a></td><td>-- set the amount to pseudo condense</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#cond-inline">\*[COND]</a></td><td>-- invoke pseudo condensing inline</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#cond-inline">\*[CONDX]</a></td><td>-- off pseudo condensing inlines</td>
+</tr>
+<tr><td style="padding-left: 0;">Pseudo extended</td></tr>
+<tr>
+<td><a href="typesetting.html#extend">EXTEND</a></td><td>-- set the amount to pseudo extend</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ext-inline">\*[EXT]</a></td><td>-- invoke pseudo extending inline</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ext-inline">\*[EXTX]</a></td><td>-- off pseudo condensing inlinee</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-4" class="quick-ref" colspan="2" >+++ Linespacing (leading)</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#leading">LS</a></td><td>-- set the linespacing (leading)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#autolead">AUTOLEAD</a></td><td>-- set the linespacing relative to the point size</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-5" class="quick-ref" colspan="2" >+++ Justification, quad direction, line-by-line setting, breaking lines</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#justify">JUSTIFY</a></td><td>-- justify text to both margins</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#quad">QUAD</a></td><td>-- "justify" text left, centre, or right</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#lrc">LEFT</a></td><td>-- set line-by-line quad left</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#lrc">CENTER</a></td><td>-- set line-by-line quad centre</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#lrc">RIGHT</a></td><td>-- set line-by-line quad right</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#br">BR</a></td><td>-- break a justified line</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#spread">SPREAD</a></td><td>-- force justify a line</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#el">EL</a></td><td>-- break a line without advancing on the page</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-6" class="quick-ref" colspan="2" >+++ Hyphenation</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#hy">HY</a></td><td>-- automatic hyphenation on or off</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#hy-set">HY_SET</a></td><td>-- set automatic hyphenation parameters</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-7" class="quick-ref" colspan="2" >+++ Word and sentence spacing</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#ws">WS</a></td><td>-- set the minimum word space size</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ss">SS</a></td><td>-- set the sentence space size</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-8" class="quick-ref" colspan="2" >+++ Kerning, ligatures, smartquotes</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#kern">KERN</a></td><td>-- automatic character pair kerning on or off</td>
+</tr>
+<tr>
+<td><a href="inlines.html#inline-kerning-mom">\*[BU n]</a></td><td>-- move characters pairs closer together inline</td>
+</tr>
+<tr>
+<td><a href="inlines.html#inline-kerning-mom">\*[FU n]</a></td><td>-- move character pairs further apart inline</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#rw">RW</a></td><td>-- uniformly reduce space between characters (tighten)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ew">EW</a></td><td>-- uniformly increase space between characters (loosen)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#br-at-line-kern">BR_AT_LINE_KERN</a></td><td>-- break previous line every time RW or EW is invoked</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ligatures">LIGATURES</a></td><td>-- automatic generation of ligatures on or off</td>
+</tr>
+<tr>
+<td><a href="goodies.html#smartquotes">SMARTQUOTES</a></td><td>-- smartquoting on or off</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-9" class="quick-ref" colspan="2" >+++ Horizontal and vertical movements, columnar setting</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#ald">ALD</a></td><td>-- move downards on the page</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#rld">RLD</a></td><td>-- move upwards on the page</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#space">SPACE</a></td><td>-- insert space between lines on a page</td>
+</tr>
+<tr>
+<td><a href="inlines.html#down">\*[DOWN n]</a></td><td>-- temporarily move downwards in a line</td>
+</tr>
+<tr>
+<td><a href="inlines.html#up">\*[UP n]</a></td><td>-- temporarily move upwards in a line</td>
+</tr>
+<tr>
+<td><a href="inlines.html#fwd">\*[FWD n]</a></td><td>-- move forward in a line</td>
+</tr>
+<tr>
+<td><a href="inlines.html#bck">\*[BCK n]</a></td><td>-- move backwards in a line</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#mco">MCO</a></td><td>-- multiple columns on</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#mcr">MCR</a></td><td>-- recto vertical position of column start</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#mcx">MCX</a></td><td>-- multiple columns off, advance past longest column</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-10" class="quick-ref" colspan="2" >+++ Indents</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#il">IL</a></td><td>-- set and turn on a left indent</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ir">IR</a></td><td>-- set and turn on a right indent</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ib">IB</a></td><td>-- set and turn on indents both left and right</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#iq">IQ</a></td><td>-- quit (exit) all indents</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#ti">TI</a></td><td>-- set and turn on a temporary (one line) indent</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#hi">HI</a></td><td>-- set and turn on a hanging indent</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#iq">ILX</a></td><td>-- left indents off</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#iq">IRX</a></td><td>-- right indents off</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#iq">IBX</a></td><td>-- both left and right indents off</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-11" class="quick-ref" colspan="2" >+++ Tabs</th>
+</tr>
+<tr>
+<td><a href="typesetting.html#tab-set">TAB_SET</a></td><td>-- set up a typesetting tab</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#tab">TAB &lt;n&gt;</a></td><td>-- call tab &lt;n&gt;</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#tq">TQ</a></td><td>-- quit (exit) tabs</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#inline-st">\*[STn]...\*[STnX]</a></td><td>-- string tabs (mark tab positions inline)</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#tn">TN</a></td><td>-- move to tab &lt;n+1&gt; without advancing on the page</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#st">ST</a></td><td>-- set quad/fill for string tabs</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-12" class="quick-ref" colspan="2" >+++ Underscoring, underlining</th>
+</tr>
+<tr>
+<td><a href="goodies.html#underscore">UNDERSCORE</a></td><td>-- underscore</td>
+</tr>
+<tr>
+<td><a href="goodies.html#UNDERSCORE2">UNDERSCORE2</a></td><td>-- double underscore</td>
+</tr>
+<tr>
+<td><a href="goodies.html#underline">UNDERLINE</a></td><td>-- underline (fixed width fonts only)</td>
+</tr>
+<tr>
+<td><a href="goodies.html#ul">\*[UL]...\*[ULX]</a></td><td>-- invoke underling inline (fixed width fonts only)</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-13" class="quick-ref" colspan="2" >+++ Superscipts</th>
+</tr>
+<tr>
+<td><a href="goodies.html#sup">\*[SUP]...\*[SUPX]</a></td><td>-- superscript (inline)</td>
+</tr>
+<tr>
+<td><a href="goodies.html#sup">\*[CONDSUP]...\*[CONDSUPX]</a></td><td>-- pseudo-condensed superscript (inline)</td>
+</tr>
+<tr>
+<td><a href="goodies.html#sup">\*[EXTSUP]...\*[EXTSUPX]</a></td><td>-- pseudo extended supercript (inline)</td>
+</tr>
+<tr>
+<td><a href="goodies.html#sup-raise">SUPERSCRIPT_RAISE_AMOUNT</a></td><td>-- vertical offset of superscripts</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-14" class="quick-ref" colspan="2" >+++ Nested lists</th>
+</tr>
+<tr>
+<td><a href="docelement.html#list">LIST</a></td><td>-- begin a list</td>
+</tr>
+<tr>
+<td><a href="docelement.html#item">ITEM</a></td><td>-- begin an item in a list</td>
+</tr>
+<tr>
+<td><a href="docelement.html#shift-list">SHIFT_LIST</a></td><td>-- change the indent of a list</td>
+</tr>
+<tr>
+<td><a href="docelement.html#reset-list">RESET_LIST</a></td><td>-- clear and reset a list&#8217;s enumerator</td>
+</tr>
+<tr>
+<td><a href="docelement.html#pad-list-digits">PAD_LIST_DIGITS</a></td><td>-- space to leave for digits in a digit-enumerated list</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-15" class="quick-ref" colspan="2" >+++ Colour</th>
+</tr>
+<tr>
+<td><a href="color.html#newcolor">NEWCOLOR</a></td><td>-- initialize (define) a colour</td>
+</tr>
+<tr>
+<td><a href="color.html#color">COLOR</a></td><td>-- begin using an initialized colour</td>
+</tr>
+<tr>
+<td><a href="color.htmlxcolor">XCOLOR</a></td><td>-- initialize a "named" X colour</td>
+</tr>
+<tr>
+<td><a href="color.html#color-inline">\*[&lt;colorname&gt;]</a></td><td>-- begin using an initialized colour inline</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-16" class="quick-ref" colspan="2" >+++ Dropcaps</th>
+</tr>
+<tr>
+<td><a href="goodies.html#dropcap">DROPCAP</a></td><td>-- set a dropcap</td>
+</tr>
+<tr>
+<td><a href="goodies.html#dropcap-family">DROPCAP_FAMILY</a></td><td>-- set a dropcap&#8217;s family</td>
+</tr>
+<tr>
+<td><a href="goodies.html#dropcap-font">DROPCAP_FONT</a></td><td>-- set a dropcap&#8217;s font style</td>
+</tr>
+<tr>
+<td><a href="goodies.html#dropcap-color">DROPCAP_COLOR</a></td><td>-- set a dropcap&#8217;s colour</td>
+</tr>
+<tr>
+<td><a href="goodies.html#dropcap-adjust">DROPCAP_ADJUST</a></td><td>-- adjust size of a dropcap</td>
+</tr>
+<tr>
+<td><a href="goodies.html#dropcap-gutter">DROPCAP_GUTTER</a></td><td>-- adjust space between a dropcap and regular text</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-17" class="quick-ref" colspan="2" >+++ Utilities</th>
+</tr>
+<tr>
+<td><a href="goodies.html#alias">ALIAS</a></td><td>-- give a macro a new name</td>
+</tr>
+<tr>
+<td><a href="goodies.html#caps">CAPS</a></td><td>-- set type all caps</td>
+</tr>
+<tr>
+<td><a href="goodies.html#silent">COMMENT</a></td><td>-- silently embed comments in a document</td>
+</tr>
+<tr>
+<td><a href="goodies.html#esc-char">ESC_CHAR</a></td><td>-- change the default escape character</td>
+</tr>
+<tr>
+<td><a href="goodies.html#leader">\*[LEADER]</a></td><td>-- insert leaders at the end of a line</td>
+</tr>
+<tr>
+<td><a href="goodies.html#leader-character">LEADER_CHARACTER</a></td><td>-- change the character used for leaders</td>
+</tr>
+<tr>
+<td><a href="typesetting.html#newpage">NEWPAGE</a></td><td>-- break to a new page</td>
+</tr>
+<tr>
+<td><a href="goodies.html#pad">PAD</a></td><td>-- insert equalized regions of whitespace into a line</td>
+</tr>
+<tr>
+<td><a href="goodies.html#pad-marker">PAD_MARKER</a></td><td>-- change the pad marker</td>
+</tr>
+<tr>
+<td><a href="inlines.html#inline-rule-mom">\*[RULE]</a></td><td>-- draw a full measure rule</td>
+</tr>
+<tr>
+<td><a href="goodies.html#sizespecs">SIZESPECS</a></td><td>-- get font's cap-height, x-height and descender depth</td>
+</tr>
+<tr>
+<td><a href="goodies.html#silent">SILENT</a></td><td>-- output processing off or on</td>
+</tr>
+<tr>
+<td><a href="goodies.html#trap">TRAP</a></td><td>-- enable or disable page position traps</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-18" class="quick-ref" colspan="2" >+++ Graphical objects</th>
+</tr>
+<tr>
+<td><a href="graphical.html#drh">DRH</a></td><td>-- draw a horizontal rule</td>
+</tr>
+<tr>
+<td><a href="graphical.html#drv">DRV</a></td><td>-- draw a vertical rule</td>
+</tr>
+<tr>
+<td><a href="graphical.html#dbx">DBX</a></td><td>-- draw a box</td>
+</tr>
+<tr>
+<td><a href="graphical.html#dcl">DCL</a></td><td>-- draw a circle (ellipse)</td>
+</tr>
+<tr>
+<td><a href="inlines.html#rule-weight">RULE_WEIGHT</a></td><td>-- set weight of rules drawn with \*[RULE]</td>
+</tr>
+<tr>
+<td><a href="docelement.html#pspic">PSPIC</a></td><td>-- insert a PostScript image</td>
+</tr>
+</table>
+
+<div style="display: inline-block; margin-top: 1em; margin-bottom: .5em; border-bottom: 2px solid #302419;"><kbd>DOCUMENT PROCESSING MACROS</kbd></div>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-19" class="quick-ref" colspan="2" >+++ Reference macros</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#title">TITLE</a></td><td>-- document title</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doctitle">DOCTITLE</a></td><td>-- overall document title (if different from TITLE)</td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnote-title">ENDNOTE_TITLE</a></td><td>-- document/chapter identification string for endnotes</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#chapter">CHAPTER</a></td><td>-- chapter number</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#chapter">CHAPTER_TITLE</a></td><td>-- chapter title</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#draft-string">CHAPTER_STRING</a></td><td>-- what to use in place of &#8220;Chapter&#8221;</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#subtitle">SUBTITLE</a></td><td>-- document subtitle</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#author">AUTHOR</a></td><td>-- document author(s)</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#covertitle">DOC_COVERTITLE</a></td><td>-- document title cover</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#covertitle">COVERTITLE</a></td><td>-- section cover title</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#covertitle">COPYRIGHT</a></td><td>-- copyright</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#covertitle">MISC</a></td><td>-- miscellaneous cover information</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#draft">DRAFT</a></td><td>-- document&#8217;s draft number</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#draft-string">DRAFT_STRING</a></td><td>-- what to use in place of &#8220;Draft&#8221;</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#revision">REVISION</a></td><td>-- document&#8217;s revision number</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#revision-string">REVISION_STRING</a></td><td>-- what to use in place of &#8220;Revision&#8221;</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-20" class="quick-ref" colspan="2" >+++ General document formatting directives</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doctype">DOCTYPE</a></td><td>-- general document type</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#copystyle">COPYSTYLE</a></td><td>-- draft or final copy</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#printstyle">PRINTSTYLE</a></td><td>-- typeset or &#8220;typewritten&#8221;</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-21" class="quick-ref" colspan="2" >+++ Line numbering</th>
+</tr>
+<tr>
+<td><a href="docelement.html#number-lines">NUMBER_LINES</a></td><td>-- automatic line numbering on or off</td>
+</tr>
+<tr>
+<td><a href="docelement.html#number-lines-control">Control macros</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#number-quote-lines">&nbsp;NUMBER_QUOTE_LINES</a></td><td>-- numbering of QUOTE lines on or off</td>
+</tr>
+<tr>
+<td><a href="docelement.html#number-blockquote-lines">&nbsp;NUMBER_BLOCKQUOTE_LINES</a></td><td>-- numbering of BLOCKQUOTE lines on or off</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-22" class="quick-ref" colspan="2" >+++ Set documents in columns</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#columns">COLUMNS</a></td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#col-next">COL_NEXT</a></td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#col-break">COL_BREAK</a></td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-23" class="quick-ref" colspan="2" >+++ TYPEWRITE control macros</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#typewrite-control">UNDERLINE_ITALIC</a></td><td>--  underlining of italics on</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#underline-quotes">UNDERLINE_QUOTES</a></td><td>--  underlining of QUOTEs on or off</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#typewrite-control">ITALIC_MEANS_ITALIC</a></td><td>--  use real italics (not underlining)</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#typewrite-control">UNDERLINE_SLANT</a></td><td>--  underlining of pseudo-italics on</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#typewrite-control">SLANT_MEANS_SLANT</a></td><td>--  use pseudo italics (not underlining)</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-24" class="quick-ref" colspan="2" >+++ Initiate document processing</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#start">START</a></td><td>-- begin document processing</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-25" class="quick-ref" colspan="2" >+++ Epigraphs</th>
+</tr>
+<tr>
+<td><a href="docelement.html#epigraph">EPIGRAPH</a></td><td>-- set an epigraph underneath the docheader</td>
+</tr>
+<tr>
+<td><a href="docelement.html#epigraph-control">Control macros</a></td><td>-- change default style of epigraphs</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-26" class="quick-ref" colspan="2" >+++ Main heads</th>
+</tr>
+<tr>
+<td><a href="docelement.html#head">HEAD</a></td><td>-- set a main head</td>
+</tr>
+<tr>
+<td><a href="docelement.html#head-general">Control macros</a></td><td>-- change default style of heads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#head-space">&nbsp;HEAD_SPACE</a></td><td>-- control vertical space around heads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#number-heads">&nbsp;NUMBER_HEADS</a></td><td>-- number heads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#prefix-chapter-number">&nbsp;PREFIX_CHAPTER_NUMBER</a></td><td>-- prefix chapter number to head numbers</td>
+</tr>
+<tr>
+<td><a href="docelement.html#reset-head-number">&nbsp;RESET_HEAD_NUMBER</a></td><td>-- reset head number to "1"</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-27" class="quick-ref" colspan="2" >+++ Subheads</th>
+</tr>
+<tr>
+<td><a href="docelement.html#subhead">SUBHEAD</a></td><td>-- set a subhead</td>
+</tr>
+<tr>
+<td><a href="docelement.html#subhead-general">Control macros</a></td><td>-- change default style of subheads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#number-subheads">&nbsp;NUMBER_SUBHEADS</a></td><td>-- number subheads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#prefix-chapter-number">&nbsp;PREFIX_CHAPTER_NUMBER</a></td><td>-- prefix chapter number to subhead numbers</td>
+</tr>
+<tr>
+<td><a href="docelement.html#reset-subhead-number">&nbsp;RESET_SUBHEAD_NUMBER</a></td><td>-- reset subhead number to "1"</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-28" class="quick-ref" colspan="2" >+++ Paragraph heads</th>
+</tr>
+<tr>
+<td><a href="docelement.html#parahead">PARAHEAD</a></td><td>-- set a paragraph head</td>
+</tr>
+<tr>
+<td><a href="docelement.html#parahead-general">Control macros</a></td><td>-- change default style of paraheads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#number-paraheads">&nbsp;NUMBER_PARAHEADS</a></td><td>-- number paraheads</td>
+</tr>
+<tr>
+<td><a href="docelement.html#prefix-chapter-number">&nbsp;PREFIX_CHAPTER_NUMBER</a></td><td>-- prefix chapter number to parahead numbers</td>
+</tr>
+<tr>
+<td><a href="docelement.html#reset-parahead-number">&nbsp;RESET_PARAHEAD_NUMBER</a></td><td>-- reset parahead number to "1"</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-29" class="quick-ref" colspan="2" >+++ Paragraphs</th>
+</tr>
+<tr>
+<td><a href="docelement.html#pp">PP</a></td><td>-- set a paragraph</td>
+</tr>
+<tr>
+<td><a href="docelement.html#pp-control">Control macros</a></td><td>-- managing paragraph style concerns</td>
+</tr>
+<tr>
+<td><a href="docelement.html#pp-font">&nbsp;PP_FONT</a></td><td>-- globally change font of regular paragraphs</td>
+</tr>
+<tr>
+<td><a href="docelement.html#para-indent">&nbsp;PARA_INDENT</a></td><td>-- set the paragraph first-line indent</td>
+</tr>
+<tr>
+<td><a href="docelement.html#indent-first-paras">&nbsp;INDENT_FIRST_PARAS</a></td><td>-- indenting of paragraph first-lines on or off</td>
+</tr>
+<tr>
+<td><a href="docelement.html#pp-space">&nbsp;PARA_SPACE</a></td><td>-- linespace between paragraphs on or off</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-30" class="quick-ref" colspan="2" >+++ Quotes (line for line verbatim quotes)</th>
+</tr>
+<tr>
+<td><a href="docelement.html#quote">QUOTE</a></td><td>-- set quoted text line for line </td>
+</tr>
+<tr>
+<td><a href="docelement.html#quote-general">Control macros</a></td><td>-- change default style of quotes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#always-fullspace-quotes">&nbsp;ALWAYS_FULLSPACE_QUOTES</a></td><td>-- control vertical space around quotes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#break-quote">&nbsp;BREAK_QUOTE</a></td><td>-- deprecated</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-31" class="quick-ref" colspan="2" >+++ Blockquotes (cited passages of text)</th>
+</tr>
+<tr>
+<td><a href="docelement.html#blockquote">BLOCKQUOTE</a></td><td>-- set longer passages of cited text</td>
+</tr>
+<tr>
+<td><a href="docelement.html#blockquote-general">Control macros</a></td><td>-- change default style of blockquotes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#always-fullspace-quotes">&nbsp;ALWAYS_FULLSPACE_BLOCKQUOTES</a></td><td>-- control vertical space around quotes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#break-quote">&nbsp;BREAK_BLOCKQUOTE</a></td><td>-- deprecated</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-32" class="quick-ref" colspan="2" >+++ Code snippets</th>
+</tr>
+<tr>
+<td><a href="docelement.html#code">CODE</a></td><td>-- set a code snippet</td>
+</tr>
+<tr>
+<td><a href="docelement.html#code-control">Control macros</a></td><td>-- change default style of code snippets</td>
+</tr>
+<tr>
+<td><a href="docelement.html#code-general">&nbsp;General</a></td><td>-- family, font, and colour</td>
+</tr>
+<tr>
+<td><a href="docelement.html#code-size">&nbsp;CODE_SIZE</a></td><td>-- code size as a percentage of prevailing text</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-33" class="quick-ref" colspan="2" >+++ Author linebreaks (section breaks)</th>
+</tr>
+<tr>
+<td><a href="docelement.html#linebreak">LINEBREAK</a></td><td>-- insert an author linebreak (section break)</td>
+</tr>
+<tr>
+<td><a href="docelement.html#linebreak-control">Control macros</a></td><td>-- change default style of linebreaks</td>
+</tr>
+<tr>
+<td><a href="docelement.html#linebreak-char">&nbsp;LINEBREAK_CHAR</a></td><td>-- character to use for author linebreaks</td>
+</tr>
+<tr>
+<td><a href="docelement.html#linebreak-color">&nbsp;LINEBREAK_COLOR</a></td><td>-- colour of author linebreak character</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-34" class="quick-ref" colspan="2" >+++ Document termination string</th>
+</tr>
+<tr>
+<td><a href="docelement.html#finis">FINIS</a></td><td>-- insert a document termination string (e.g. --END--)</td>
+</tr>
+<tr>
+<td><a href="docelement.html#finis-control">Control macros</a></td><td>-- change default style finis string</td>
+</tr>
+<tr>
+<td><a href="docelement.html#finis-string">&nbsp;FINIS_STRING</a></td><td>-- set the document termination string</td>
+</tr>
+<tr>
+<td><a href="docelement.html#finis-color">&nbsp;FINIS_COLOR</a></td><td>-- set the document termination string colour</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-35" class="quick-ref" colspan="2" >+++ Footnotes</th>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote">FOOTNOTE</a></td><td>-- set a footnote</td>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote-general">Control macros</a></td><td>-- change default style of footnotes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote-markers">&nbsp;FOOTNOTE_MARKERS</a></td><td>-- footnote markers on or off</td>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote-marker-style">&nbsp;FOOTNOTE_MARKER_STYLE</a></td><td>-- type of footnote marker to use</td>
+</tr>
+<tr>
+<td><a href="docelement.html#reset-footnote-number">&nbsp;RESET_FOOTNOTE_NUMBER</a></td><td>-- reset footnote numbering</td>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote-rule">&nbsp;FOOTNOTE_RULE</a></td><td>-- footnote separator rule on or off</td>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote-rule-adj">&nbsp;FOOTNOTE_RULE_ADJ</a></td><td>-- adjust vertical position of footnote rule</td>
+</tr>
+<tr>
+<td><a href="docelement.html#footnote-rule-length">&nbsp;FOOTNOTE_RULE_LENGTH</a></td><td>-- adjust length of footnote rule</td>
+</tr>
+<tr>
+<td style="vertical-align: top;"><a href="docelement.html#footnotes-run-on">&nbsp;FOOTNOTES_RUN_ON</a></td>
+  <td>-- instruct footnotes to be continuous (i.e. not to<br />
+&nbsp;&nbsp;&nbsp;begin on a new line; only for use with footnotes<br />
+&nbsp;&nbsp;&nbsp;identified by document line number)</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-36" class="quick-ref" colspan="2" >+++ Endnotes</th>
+</tr>
+<tr>
+<td><a href="docelement.html#endnote">ENDNOTE</a></td><td>-- set an endnote</td>
+</tr>
+<tr>
+<td style="vertical-align: top;"><a href="docelement.html#EN-mark">\*[EN-MARK]</a></td>
+  <td>-- mark initial line of a range of line numbers<br />
+&nbsp;&nbsp;&nbsp;(for use with line numbered endnotes)</td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnotes">ENDNOTES</a></td><td>-- output endnotes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnote-control">Control macros</a></td><td>-- change just about anything to do with endnotes</td>
+</tr>
+</table>
+
+<table class="quick-ref" style="margin-top: -.5em; margin-left: 1em;">
+<tr>
+<td><a href="docelement.html#endnotes-general">General style control</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnotes-pagination">Pagination</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnotes-header-control">Header/footer control</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnotes-main-title">Title control</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnotes-main-title">Document/section identification control</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#endnotes-numbering">Identification style</a></td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-37" class="quick-ref" colspan="2" >+++ Margin notes</th>
+</tr>
+<tr>
+<td><a href="docelement.html#mn-init">MN_INIT</a></td><td>-- initialize margin notes</td>
+</tr>
+<tr>
+<td><a href="docelement.html#mn">MN</a></td><td>-- set a margin note</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-38" class="quick-ref" colspan="2" >+++ Bibliographic references</th>
+</tr>
+<tr>
+<td><a href="refer.html#ref">REF</a></td><td>-- begin a reference</td>
+</tr>
+<tr>
+<td><a href="refer.html#footnote-refs">FOOTNOTE_REFS</a></td><td>-- place references in footnotes</td>
+</tr>
+<tr>
+<td><a href="refer.html#endnote-refs">ENDNOTE_REFS</a></td><td>-- place references in endnotes</td>
+</tr>
+<tr>
+<td><a href="refer.html#bracket-refs">REF( / REF)</a></td><td>-- put parentheses around embedded references</td>
+</tr>
+<tr>
+<td><a href="refer.html#bracket-refs">REF[ / REF]</a></td><td>-- put square brackets around embedded references</td>
+</tr>
+<tr>
+<td><a href="refer.html#bracket-refs">REF{ / REF}</a></td><td>-- put curly braces around mbedded references</td>
+</tr>
+<tr>
+<td><a href="refer.html#bibliography">BIBLIOGRAPHY</a></td><td>-- output a bibliography</td>
+</tr>
+<tr>
+<td><a href="refer.html#biblio-control">Control macros</a></td><td>-- change just about anything to do with bibliographies</td>
+</tr>
+</table>
+
+<table class="quick-ref" style="margin-top: -.5em; margin-left: 1em;">
+<tr>
+<td><a href="refer.html#bibliography-type">BIBLIOGRAPHY_TYPE</a>&nbsp;-- "plain" or enumerated list</td>
+</tr>
+<tr>
+<td><a href="refer.html#biblio-general">General style control</a></td>
+</tr>
+<tr>
+<td><a href="refer.html#biblio-header-control">Header/footer control</a></td>
+</tr>
+<tr>
+<td><a href="refer.html#biblio-main-title">Main head control</a></td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-39" class="quick-ref" colspan="2" >+++ Tables of contents</th>
+</tr>
+<tr>
+<td><a href="docelement.html#toc">TOC</a></td><td>-- output a table of contents</td>
+</tr>
+<tr>
+<td><a href="docelement.html#toc-control">Control macros</a></td><td>-- change just about anything to do with tables of contents</td>
+</tr>
+</table>
+
+<table class="quick-ref" style="margin-top: -.5em; margin-left: 1em;">
+<tr>
+<td><a href="docelement.html#toc-general">General style control</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#toc-pagenumbering">Page numbering</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#toc-header">Title control</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#toc-style">Changing the style of the different table of contents entry types</a></td>
+</tr>
+<tr>
+<td><a href="docelement.html#toc-additional">Additional table of contents control macros</a></td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-40" class="quick-ref" colspan="2" >+++ Letter (correspondence) macros</th>
+</tr>
+<tr>
+<td><a href="letters.html#date">DATE</a></td><td>-- letter&#8217;s date</td>
+</tr>
+<tr>
+<td><a href="letters.html#from">FROM</a></td><td>-- letter&#8217;s addresser</td>
+</tr>
+<tr>
+<td><a href="letters.html#to">TO</a></td><td>-- letter&#8217;s addressee</td>
+</tr>
+<tr>
+<td><a href="letters.html#greeting">GREETING</a></td><td>-- letter&#8217;s salutation</td>
+</tr>
+<tr>
+<td><a href="letters.html#closing">CLOSING</a></td><td>-- letter&#8217;s closing salutation</td>
+</tr>
+<tr>
+<td><a href="letters.html#closing-indent">CLOSING_INDENT</a></td><td>-- indentation of the closing salutation</td>
+</tr>
+<tr>
+<td><a href="letters.html#signature-space">SIGNATURE_SPACE</a></td><td>-- room to leave for the signature</td>
+</tr>
+<tr>
+<td><a href="letters.html#no-suite">NO_SUITE</a></td><td>-- printing of &quot;next page number&quot; off or on</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-41" class="quick-ref" colspan="2" >+++ Changing global print style parameters after START</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-left-margin">DOC_LEFT_MARGIN</a></td><td>-- left margin of everything on the page</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-right-margin">DOC_RIGHT_MARGIN</a></td><td>-- right margin of everything on the page</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-line-length">DOC_LINE_LENGTH</a></td><td>-- document&#8217;s base line length</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-family">DOC_FAMILY</a></td><td>-- document&#8217;s base family</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-pt-size">DOC_PT_SIZE</a></td><td>-- document&#8217;s base point size</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-lead">DOC_LEAD</a></td><td>-- document&#8217;s base lead</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-quad">DOC_QUAD</a></td><td>-- document&#8217;s base quad directions</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-42" class="quick-ref" colspan="2" >+++ Managing a document&#8217;s first-page header</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#docheader">DOCHEADER</a></td><td>-- document first-page header on or off</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#docheader-control-index">Control macros</a></td><td>-- change default style of docheader elements</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-43" class="quick-ref" colspan="2" >+++ Managing page headers and footers</th>
+</tr>
+<tr>
+<td><a href="headfootpage.html#headers">HEADERS</a></td><td>-- page headers on or off</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#footers">FOOTERS</a></td><td>-- page footers on or off</td>
+</tr>
+<tr>
+<td style="vertical-align: top;"><a href="headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a></td><td>-- enable generation of both headers and footers</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#index-reference">Control macros</a></td>
+</tr>
+</table>
+
+<table class="quick-ref" style="margin-top: -.5em; margin-left: 1em;">
+<tr>
+<td><a href="headfootpage.html#strings">Strings</a></td><td>-- left-right-center strings</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#style">Style</a></td><td>-- change style defaults for headers and/or footers</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#global">Global</a></td><td>-- global style changes</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#part-by-part">Part-by-part</a></td><td>-- part-by-part style changes</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#vertical">Vertical placement</a></td><td>-- adjust postion of headers and/or footers</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#separator-rule">Separator rule</a></td><td>-- manage the header/footer separator rule</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-44" class="quick-ref" colspan="2" >+++ Recto/verso page headers and footers</th>
+</tr>
+<tr>
+<td><a href="rectoverso.html#recto-verso">RECTO_VERSO</a></td><td>-- recto/verso headers and/or footers on or off</td>
+</tr>
+<tr>
+<td><a href="rectoverso.html#switch-hdrftr">SWITCH_HEADERS</a></td><td>-- switch recto or verso header</td>
+</tr>
+<tr>
+<td><a href="rectoverso.html#switch-hdrftr">SWITCH_FOOTERS</a></td><td>-- switch recto or verso footer</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#hdrftr-rectoverso">HEADER_RECTO</a></td><td>-- string that constitutes a recto header</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#hdrftr-rectoverso">HEADER_VERSO</a></td><td>-- string that constitutes a verso header</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#hdrftr-rectoverso">FOOTER_RECTO</a></td><td>-- string that constitutes a recto footer</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#hdrftr-rectoverso">FOOTER_VERSO</a></td><td>-- string that constitutes a recto footer</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-45" class="quick-ref" colspan="2" >+++ Pagination</th>
+</tr>
+<tr>
+<td><a href="headfootpage.html#paginate">PAGINATE</a></td><td>-- pagination on or off</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#paginate-control">Control macros</a></td><td>-- change default style for pagination</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#pagenumber">&nbsp;PAGENUMBER</a></td><td>-- user-defined (starting) page number</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#pagenum-style">&nbsp;PAGENUM_STYLE</a></td><td>-- digits, roman numerals, etc</td>
+</tr>
+<tr>
+<td><a href="headfootpage.html#pagenum-on-first-page">&nbsp;PAGENUM_ON_FIRST_PAGE</a></td><td>-- when footers are enabled</td>
+</tr>
+<tr>
+<td style="vertical-align: top;"><a href="headfootpage.html#draft-with-pagenumber">&nbsp;DRAFT_WITH_PAGENUMBER</a></td><td>-- attach draft/revision information to page<br />
+&nbsp;&nbsp;&nbsp;numbers</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-46" class="quick-ref" colspan="2" >+++ Document and section cover (title) pages</th>
+</tr>
+<tr>
+<td><a href="cover.html#cover">COVER</a></td><td>-- information to include in a section cover</td>
+</tr>
+<tr>
+<td><a href="cover.html#cover">DOC_COVER</a></td><td>-- information to include in a document cover</td>
+</tr>
+<tr>
+<td><a href="cover.html#on-off">COVERS</a></td><td>-- printing of section covers on or off</td>
+</tr>
+<tr>
+<td><a href="cover.html#on-off">DOC_COVERS</a></td><td>-- printing of document covers on or off</td>
+</tr>
+<tr>
+<td><a href="cover.html#cover-control-index">Control macros</a></td><td>-- change style defaults for covers</td>
+</tr>
+</table>
+
+<table class="quick-ref">
+<tr>
+<th id="qr-47" class="quick-ref" colspan="2" >+++ Utilities</th>
+</tr>
+<tr>
+<td><a href="docprocessing.html#add-space">ADD_SPACE</a></td><td>-- add space to the top of a page</td>
+</tr>
+<tr>
+<td><a href="docelement.html#blank-page">BLANKPAGE</a></td><td>-- output one or more blank pages</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#doc-lead-adjust">DOC_LEAD_ADJUST</a></td><td>-- adjust document linespacing (lead) to fill pages</td>
+</tr>
+<tr>
+<td><a href="rectoverso.html#collate">COLLATE</a></td><td>-- join documents or chapters of a document together</td>
+</tr>
+<tr>
+<td><a href="docprocessing.html#shim">SHIM</a></td><td>-- move vertical position to next valid baseline</td>
+</tr>
+</table>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="appendices.html">Next: Appendices</a></td>
+</tr>
+</table>
 
-<hr/>
+</div>
 
-<p>
-<a href="appendices.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="typemacdoc.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/rectoverso.html groff-1.21/contrib/mom/momdoc/rectoverso.html
--- groff-1.20.1/contrib/mom/momdoc/rectoverso.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/rectoverso.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,289 +16,324 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Document Processing, Recto/verso printing</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Recto/verso printing, collating</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
 
-<a name="TOP"></a>
-
-<p>
-<a href="cover.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="headfootpage.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<body style="background-color: #f5faff;">
 
-<a name="RECTOVERSO"><h1 align="center"><u>Recto/verso printing, collating</u></h1></a>
+<!-- ==================================================================== -->
 
-<a name="INDEX_RECTOVERSO"></a>
+<div id="top" class="page">
 
-<ul>
-    <li><a href="#RECTOVERSO_INTRO">Introduction to recto/verso</a></li>
-    <ul>
-        <li><a href="#RECTOVERSO_LIST">Macro list</a></li>
-    </ul>
-    <li><a href="#COLLATE_INTRO">Introduction to collating</a></li>
-    <ul>
-        <li><a href="#COLLATE">The COLLATE macro</a></li>
-    </ul>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="cover.html#top">Next: Cover pages</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Recto/verso printing, collating</h1>
+
+<div style="width: 37%; margin: auto;">
+<ul class="no-enumerator" style="margin-left: -1em;">
+  <li><a href="#rectoverso-intro">Introduction to recto/verso printing</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#rectoverso-list">Macro list</a></li>
+  </ul></li>
+  <li><a href="#collate-intro">Introduction to collating</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#collate">The COLLATE macro</a></li>
+  </ul></li>
 </ul>
+</div>
+
+<div class="rule-medium"><hr/></div>
 
-<a name="RECTOVERSO_INTRO"><h2><u>Introduction to recto/verso</u></h2></a>
+<h2 id="rectoverso-intro" class="docs">Introduction to recto/verso printing</h2>
 
 <p>
-Recto/verso printing allows you to set up a <strong>mom</strong>
-document in such a way that it can be printed on both sides of a
-printer sheet and subsequently bound.
+Recto/verso printing allows you to set up a mom document in such
+a way that it can be printed on both sides of a printer sheet and
+subsequently bound.
 </p>
 
 <p>
-With recto/verso, <strong>mom</strong> automatically takes control
-of the following aspects of alternating page layout:
-</p>
-
-<ul>
-    <li>switching left and right margins (if they're not equal)</li>
-    <li>switching the left and right parts of the default 3-part
-        <a href="definitions.html#TERMS_HEADER">headers</a>
-        or
-        <a href="definitions.html#TERMS_FOOTER">footers</a>
-        (see the
-        <a href="headfootpage.html#DESCRIPTION_GENERAL">General description of headers</a>)
-    </li>
-    <li>switching
-        <a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_RECTO</a>
-        and
-        <a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_VERSO</a>
-        if user-defined, single string recto/verso headers
-        or footers are used in place of the default 3-part
-        headers or footers
-    </li>
-    <li>switching the page number position (if page numbers are not centred)</li>
+With recto/verso, mom automatically takes control of the following
+aspects of alternating page layout:
+</p>
+<ul style="margin-top: -.5em; margin-left: -.5em; margin-bottom: -.5em;">
+  <li>switching left and right margins (if they&#8217;re not equal)</li>
+  <li>switching the left and right parts of the default 3-part
+      <a href="definitions.html#header">headers</a>
+      or
+      <a href="definitions.html#footer">footers</a>
+      (see the
+      <a href="headfootpage.html#description-general">General description of headers</a>)
+  </li>
+  <li>switching
+      <a href="headfootpage.html#hdrftr-rectoverso">HEADER_RECTO</a>
+      and
+      <a href="headfootpage.html#hdrftr-rectoverso">HEADER_VERSO</a>
+      if user-defined, single string recto/verso headers
+      or footers are used in place of the default 3-part
+      headers or footers
+  </li>
+  <li>switching the page number position (if page numbers are not centred)</li>
 </ul>
 
 <p>
 It is beyond the scope of this documentation to cover the different
-ways in which you can make your printer print on both sides of a sheet.
-A simple but effective method for those of us with &quot;dumb&quot;
-printers is to open the document (after it's been processed into
-PostScript by groff &mdash; see
-<a href="using.html#USING_INVOKING">How to invoke groff with mom</a>)
-in <strong>gv</strong> (ghostview), click the &quot;odd pages&quot;
-icon, then click &quot;Print Marked&quot;.  After printing
-is complete, rearrange the sheets appropriately, put them
-back in your printer, and have <strong>gv</strong> print the
-&quot;even pages&quot;.  If you prefer to work from the command
-line, check out the man pages for <strong>pstops</strong> and
-<strong>psbook</strong>.  There are other programs out there as well
-to help with two-sided printing.
-</p>
-
-<a name="RECTOVERSO_LIST"><h3><u>Recto/verso macros list</u></h3></a>
-
-<ul>
-    <li><a href="#RECTO_VERSO">RECTO_VERSO</a></li>
-    <li><a href="#SWITCH_HDRFTR">SWITCH_HEADERS (also FOOTERS)</a>
-        &mdash; switch position of the header parts (left and right)
-    </li>
+ways in which you can make your printer print on both sides of
+a sheet.  A simple but effective method for those of us with
+&#8220;dumb&#8221; printers is to open the document (after
+it&#8217;s been processed into PostScript by groff&mdash;see
+<a href="using.html#using-invoking">How to invoke groff with mom</a>)
+in <b>gv</b> (ghostview), click the &#8220;odd pages&#8221; icon,
+then click &#8220;Print Marked&#8220;.  After printing is complete,
+rearrange the sheets appropriately, put them back in your printer,
+and have <b>gv</b> print the &#8220;even pages&#8220;.  If you
+prefer to work from the command line, check out the man pages for
+<kbd>pstops</kbd> and <kbd>psbook</kbd>.  There are other programs
+out there as well to help with two-sided printing.
+</p>
+
+<div class="macro-list-container">
+<h3 id="rectoverso-list" class="macro-list">Recto/verso macros</h3>
+<ul class="macro-list">
+  <li><a href="#recto-verso">RECTO_VERSO</a></li>
+  <li><a href="#switch-hdrftr">SWITCH_HEADERS (also FOOTERS)</a>
+      &ndash; switch starting position of the header parts (left and right)
+  </li>
 </ul>
+</div>
 
 <!-- -RECTO_VERSO- -->
 
-<hr align="left" width="66%"/>
-
-<a name="RECTO_VERSO"></a>
-
-<p>
-Macro: <strong>RECTO_VERSO</strong>
-</p>
-
-<p>
-If you want <strong>mom</strong> to set up alternating pages for
-recto/verso printing, simply invoke <strong>RECTO_VERSO</strong>
-with no argument.
-</p>
-
-<p>
-<strong>NOTE:</strong> Recto/verso always switches the left and
-right parts of
-<a href="definitions.html#TERMS_HEADER">headers</a>
+<div id="recto-verso" class="box-macro-args">
+Macro: <b>RECTO_VERSO</b>
+</div>
+
+<p>
+If you want mom to set up alternating pages for recto/verso
+printing, simply invoke RECTO_VERSO, with no argument, anywhere in
+your document (most likely before
+<a href="docprocessing.html#start">START</a>).
+</p>
+
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+Recto/verso always switches the left and right parts of
+<a href="definitions.html#header">headers</a>
 or
-<a href="definitions.html#TERMS_FOOTER">footers</a>
+<a href="definitions.html#footer">footers</a>
 on odd/even pages.  However, it only switches the left and right
-margins if the margins aren't equal.  Consequently, it is your
-responsibility to set the appropriate differing left and right
+margins if the margins aren&#8217;t equal.  Consequently, it is
+your responsibility to set the appropriate differing left and right
 margins with
-<a href="typesetting.html#L_MARGIN">L_MARGIN</a>
+<a href="typesetting.html#l-margin">L_MARGIN</a>
 and
-<a href="typesetting.html#R_MARGIN">R_MARGIN</a>
+<a href="typesetting.html#r-margin">R_MARGIN</a>
 (prior to
-<a href="docprocessing.html#START">START</a>)
+<a href="docprocessing.html#start">START</a>)
 or with
-<a href="docprocessing.html#DOC_LEFT_MARGIN">DOC_LEFT_MARGIN</a>
+<a href="docprocessing.html#doc-left-margin">DOC_LEFT_MARGIN</a>
 and
-<a href="docprocessing.html#DOC_RIGHT_MARGIN">DOC_RIGHT_MARGIN</a>
-(before or after <strong>START</strong>).
+<a href="docprocessing.html#doc-right-margin">DOC_RIGHT_MARGIN</a>
+(before or after START).
 </p>
 
-<p>
+<p class="tip-bottom">
 Equally, recto/verso only switches the page number position if page
-numbers aren't centred, which means you have to set the page number
-position with
-<a href="headfootpage.html#PAGENUM_POS">PAGENUM_POS</a>
-(before or after <strong>START</strong>).
+numbers aren&#8217;t centred, which means you have to set the page
+number position with
+<a href="headfootpage.html#pagenum-pos">PAGENUM_POS</a>
+(before or after START).
 </p>
+</div>
 
 <!-- -SWITCH_HDRFTR- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SWITCH_HDRFTR"></a>
+<div id="switch-hdrftr" class="box-macro-args" style="margin-top: 1em;">
+Macro: <b>SWITCH_HEADERS</b>
+</div>
 
 <p>
-Macro: <strong>SWITCH_HEADERS</strong>
+SWITCH_HEADERS switches the location of the header left string
+(by default, the author) and the header right string (by default,
+the document title).  If you don&#8217;t like mom&#8217;s default
+placement of author and title, use SWITCH_HEADERS to reverse it.
 </p>
 
 <p>
-<strong>SWITCH_HEADERS</strong> switches the location of the
-header left string (by default, the author) and the header right
-string (by default, the document title).  If you don't like
-<strong>mom</strong>'s default placement of author and title, use
-<strong>SWITCH_HEADERS</strong> to reverse it.
+SWITCH_HEADERS can also be useful in conjunction with
+<a href="#recto-verso">RECTO_VERSO</a>.
+The assumption of RECTO_VERSO is that the first page of a document
+(i.e. recto/odd) represents the norm for header-left and header-right,
+meaning that the second (and all subsequent verso/even) pages of the
+document will reverse the order of header-left and header-right.
 </p>
 
 <p>
-<strong>SWITCH_HEADERS</strong> can also be useful in conjunction
-with
-<a href="#RECTO_VERSO">RECTO_VERSO</a>.
-The assumption of <strong>RECTO_VERSO</strong> is that the first
-page of a document (recto/odd) represents the norm for header-left
-and header-right, meaning that the second (and all subsequent even)
-page(s) of the document exchange header-left and header-right.
+If mom&#8217;s behaviour in this matter is not what you want, simply
+invoke SWITCH_HEADERS on the first page of your recto/verso document
+to reverse her default treatment of header parts.  The remainder of
+your document (with respect to headers) will come out as you want.
 </p>
 
-<p>
-If <strong>mom</strong>'s behaviour in this matter is not what you
-want, simply invoke <strong>SWITCH_HEADERS</strong> on the first
-page of your recto/verso document to reverse her default treatment
-of header parts.  The remainder of your document (with respect to
-headers) will come out as you want.
-</p>
-
-<hr/>
+<div class="rule-medium"><hr/></div>
 
 <!-- ===================================================================== -->
 
-<a name="COLLATE_INTRO"><h2><u>Introduction to collating</u></h2></a>
+<h2 id="collate-intro" class="docs">Introduction to collating</h2>
 
 <p>
-The macro <strong>COLLATE</strong> lets you join documents together.
-Primarily, it's a convenience for printing long documents that
-comprise several chapters, although it could be used for any
-document type (except <strong>LETTER</strong>).
+Many people wisely keep chapters of a long work in separate
+files, previewing or printing them as needed during the draft
+phase.  However, when it comes to the final version, mom requires
+a single, collated file in order to keep track of page numbering
+and recto/verso administration, generating tables of contents and
+endnotes, ensuring that
+<a href="definitions.html#docheader">docheaders</a>
+get printed correctly, and a host of other details.
 </p>
 
 <p>
-Personally, I prefer to keep chapters in separate files and print
-them out as needed.  However, that means keeping track of the correct
-starting page number for each chapter, a problem circumvented by the
-use of <strong>COLLATE</strong>.
-</p>
-
-<p>
-When collating chapters, you need only put <kbd>.COLLATE</kbd> at
-the end of a chapter, follow it with any
-<a href="docprocessing.html#REFERENCE_MACROS">reference macros</a>
+The COLLATE macro, which can be used with any
+<a href="docprocessing.html#doctype">DOCTYPE</a>
+except <kbd>LETTER</kbd>, lets you glue mom-formatted text files
+together.  You need only concatenate chapters into a single file
+(most likely with the <kbd>cat</kbd> command), put <kbd>.COLLATE</kbd> at the end of each
+concatenated chapter, follow it with the
+<a href="docprocessing.html#reference-macros">reference macros</a>
 needed for the new chapter, e.g.
-<a href="docprocessing.html#CHAPTER">CHAPTER</a>
+<a href="docprocessing.html#chapter">CHAPTER</a>
 or
-<a href="docprocessing.html#CHAPTER_STRING">CHAPTER_STRING</a>,
-make any pertinent style changes to the document (unlikely, but
-possible), and re-invoke the
-<a href="docprocessing.html#START">START</a>
-macro.  Your new chapter will begin on a fresh page and behave
+<a href="docprocessing.html#chapter-string">CHAPTER_STRING</a>,
+make any pertinent style changes to the upcoming chapter (unlikely,
+but possible), and re-invoke the
+<a href="docprocessing.html#start">START</a>
+macro.  (Most likely, the reference macros and <kbd>.START</kbd> are
+already there.)  Each chapter will begin on a fresh page and behave
 as expected.
 </p>
 
 <p>
-<strong>COLLATE</strong> assumes you are collating documents/files
-with similar type-style parameters hence there's no need for
-<strong>PRINTSTYLE</strong> to appear after <strong>COLLATE</strong>,
-although if you're collating documents that were created as separate
-files, chances are the <strong>PRINTSTYLE</strong>'s already there.
-</p>
-
-<a name="CAUTION"></a>
-
-<p>
-<strong><u>Two words of caution:</u></strong>
-
-<ol>
-    <li>Do not collate documents of differing
-        <strong>PRINTSTYLES</strong> (i.e. don't try to
-        collate a TYPESET document and TYPEWRITE document).
-    </li>
-    <li>Use <kbd>.DOC_FAMILY</kbd> instead of
-        <kbd>.FAMILY</kbd> if, for some reason, you want to
-        change the family of all the document elements after
-        <kbd>.COLLATE</kbd>. <kbd>.FAMILY</kbd>, by itself, will
-        change the family of paragraph text only.
-    </li>
+Even if you always work with monolithic, multi-chapter files, every
+chapter and its associated reference macros plus <kbd>.START</kbd>
+still needs to be preceded by a <kbd>.COLLATE</kbd> command.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+COLLATE assumes you are collating documents/files with similar
+type-style parameters hence there&#8217;s no need for PRINTSTYLE
+to appear after COLLATE, although if you&#8217;re collating
+documents that were created as separate files, chances are the
+PRINTSTYLE&#8217;s already there.
+</p>
+</div>
+
+<div class="box-tip">
+<p id="caution" class="tip">
+<b>Two words of caution:</b>
+</p>
+<ol style="margin-top: -1.25em; margin-left: -1.25em; padding-bottom: .5em;">
+  <li>Do not collate documents of differing
+      PRINTSTYLES (i.e. don&#8217;t try to
+      collate a <kbd>TYPESET</kbd> document and <kbd>TYPEWRITE</kbd>
+      document).
+  </li>
+  <li>Use <kbd>.DOC_FAMILY</kbd> instead of
+      <kbd>.FAMILY</kbd> if, for some reason, you want to
+      change the family of all the document elements after
+      <kbd>.COLLATE</kbd>. <kbd>.FAMILY</kbd>, by itself, will
+      change the family of paragraph text only.
+  </li>
 </ol>
-</p>
+</div>
 
 <!-- -COLLATE- -->
 
-<hr width="66%" align="left"/>
-
-<a name="COLLATE"></a>
-
-<p>
-Macro: <strong>COLLATE</strong>
-</p>
+<div class="macro-id-overline">
+<h3 id="collate" class="macro-id">collate</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>COLLATE</b>
+</div>
 
 <p>
 The most basic (and most likely) collating situation looks like
 this:
-
-<pre>
-    .COLLATE
-    .CHAPTER 17
-    .START
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .COLLATE
+  .CHAPTER 17
+  .START
+</span>
 </p>
 
 <p>
 A slightly more complex version of the same thing, for chapters
 that require their own titles, looks like this:
-
-<pre>
-    .COLLATE
-    .CHAPTER_TITLE "Geek Fatigue: Symptoms and Causes"
-    .START
-</pre>
-</p>
-
-<p>
-<strong>NOTE:</strong> See the
-<a href="#CAUTION">two words of caution</a>,
+<br/>
+<span class="pre-in-pp">
+  .COLLATE
+  .CHAPTER_TITLE "Geek Fatigue: Symptoms and Causes"
+  .START
+</span>
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+If the last
+<a href="definitions.html#outputline">output line</a>
+of a document before COLLATE falls too close to the bottom margin
+for running text, mom may output a blank page with only a header
+or footer between collated documents.  In order to avoid this, I
+recommend always preceding COLLATE with
+<kbd><a href="typesetting.html#el">.EL</a></kbd>,
+like this
+<br/>
+<span class="pre-in-pp">
+  .EL
+  .COLLATE
+</span>
+</p>
+</div>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+See the
+<a href="#caution">two words of caution</a>,
 above.
 </p>
+</div>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="cover.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="headfootpage.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="cover.html">Next: Cover pages</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/refer.html groff-1.21/contrib/mom/momdoc/refer.html
--- groff-1.20.1/contrib/mom/momdoc/refer.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/refer.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,1822 +16,2047 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Bibliographies and References</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Document processing, bibliographies and references</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
-
-<a name="TOP"></a>
-
-<a href="letters.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="cover.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
 
-<h1 align="center"><a name="REF_INTRO"><u>Bibliographies and references</u></a></h1>
+<body style="background-color: #f5faff;">
 
-<a href="#INTRO_REF">Introduction to bibliographies and references</a>
-<br/>
+<!-- ==================================================================== -->
 
-<a href="#TUTORIAL_REF">Tutorial</a>
+<div id="top" class="page">
 
-<ul>
-    <li><a href="#DB_REF">Creating a <strong>refer</strong> database</a></li>
-    <li><a href="#RCOMMANDS_REF">Required <strong>refer</strong> commands</a></li>
-    <li><a href="#ACCESSING_REF">Accessing references</a></li>
-    <li><a href="#WHERE_REF">Telling mom where to put references</a></li>
-    <li><a href="#BIBLIO_REF">Creating bibliography pages</a></li>
-    <li><a href="#INVOKING_REF">Invoking <strong>groff</strong> with <strong>mom</strong> and <strong>refer</strong></a></li>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="letters.html#top">Next: Writing letters</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Bibliographies and references</h1>
+
+<div style="width: 75%; margin: auto;">
+<ul class="no-enumerator">
+  <li><a href="#intro-ref">Introduction to bibliographies and references</a></li>
+  <li><a href="#tutorial-ref">Tutorial on <kbd>refer</kbd> usage with mom</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#db-ref">Create a <kbd>refer</kbd> database</a></li>
+    <li><a href="#rcommands-ref">Insert a <kbd>refer</kbd> block</a></li>
+    <li><a href="#placement-ref">Tell mom where you want your references (footnotes/endnotes or a bibliography)</a></li>
+    <li><a href="#accessing-ref">Accessing references in the database</a></li>
+    <li><a href="#fn-en-recipe">Entering footnote/endnote references</a></li>
+    <li><a href="#bibliography-recipe">Creating a bibliography</a></li>
+    <li><a href="#invoking-ref">Invoking groff with mom and <kbd>refer</kbd></a></li>
+  </ul></li>
+  <li><a href="#mla">MLA (Modern Language Association) style</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#ref-styles">Types of references (endnote/footnote or bibliographic)</a></li>
+    <li><a href="#parenthetical">Inserting parenthetical references into the text</a></li>
+  </ul></li>
+  <li><a href="#database">The <kbd>refer</kbd> database</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#database-intro">Introduction</a></li>
+    <li><a href="#database-rules">Rules</a></li>
+    <li><a href="#fields-quick">Quick guide to field identifiers (%A for author, %T for title, etc)</a></li> 
+    <li><a href="#fields-specifics">Field identifiers: specifics, usage and examples</a>
+    <ul style="margin-left: -.5em; list-style-type: square;">
+      <li><a href="#ibid">avoiding ibid, idem and their ilk</a></li>
+    </ul></li> 
+  </ul></li>
+  <li><a href="#index-ref">The bibliography and reference macros</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#biblio-control">Bibliography control macros and defaults</a></li>
+  </ul></li>
 </ul>
+</div>
 
-<a href="#MACROS_REF">Index of bibliography and reference macros</a>
-<ul>
-    <li><a href="#BIBLIO_CONTROL">Bibliography page style control macros</a></li>
-</ul>
+<div class="rule-medium"><hr/></div>
 
-<a name="INTRO_REF"><h2><u>Introduction to bibliographies and references</u></h2></a>
+<h2 id="intro-ref" class="docs">Introduction to bibliographies and references</h2>
 
 <p>
-<strong>Mom</strong> provides the ability to automatically format
-and generate bibliography pages, as well as footnote or endnote
-bibliographic references, or references embedded in text.  She
-accomplishes this by working in conjunction with a special
-<strong>groff</strong> program called &quot;refer&quot;.
+Mom provides the ability to format and generate bibliographies, as
+well as footnote or endnote references, in MLA (Modern Language
+Association) style.  She accomplishes this by working in conjunction
+with a special groff program called <kbd>refer</kbd>.
 </p>
 
 <p>
-<strong>refer</strong> is a <strong>groff</strong>
-&quot;pre-processor&quot;, which is to say that it scans your files
-looking for very specific commands (i.e. lines that begin with a
-period [dot], just like macros and document element tags).  If
-the commands aren't there, <strong>refer</strong> can't do it's
-job, and neither can <strong>mom</strong>.  The scanning is done
-<strong>before</strong> any actual <strong>mom</strong> processing
-occurs.
+<kbd>Refer</kbd> requires first that you create a database of works
+that will be cited in your documents.  Once that&#8217;s done, special
+macros let you briefly key in references to entries in the database
+and have mom format them with respect to order, punctuation and
+italicization in footnotes, endnotes, or a full bibliography.
 </p>
 
 <p>
-<strong>refer</strong> is a program that's been around for
-a long time.  It's powerful and has many, many features.
-Unfortunately, the manpage <nobr>(<kbd>man refer</kbd>),</nobr>
-while complete and accurate, is dense and not a good introduction
-to <strong>refer</strong>.  (It's a classic manpage Catch-22: the
-documentation is useful only after you already understand it.)
+<kbd>Refer</kbd> has been around for a long time.  It&#8217;s
+powerful and has many, many features.  Unfortunately, the manpage
+(<kbd>man&nbsp;refer</kbd>), while complete and accurate, is
+dense and not a good introduction.  (It&#8217;s a classic manpage
+Catch-22: the manpage is useful only after you know how to use the
+program.)
 </p>
 
 <p>
-In order to get <strong>mom</strong> users up and running with
-<strong>refer</strong>, this section of <strong>mom</strong>'s
-documentation focuses exclusively, in a recipe-like manner, on
-what you need to know to use <strong>refer</strong> satisfactorily
-in conjunction with <strong>mom</strong>.  The information and
-instructions are <strong><em><u>not</u></em></strong> to be taken as
-a manual or tutorial on full <strong>refer</strong> usage.  Much has
-been left out, on purpose.
+In order to get mom users up and running with <kbd>refer</kbd>,
+this section of mom&#8217;s documentation focuses exclusively, in a
+recipe-like manner, on what you need to know to use <kbd>refer</kbd>
+satisfactorily in conjunction with mom.  The instructions are not to
+be taken as a manual on full <kbd>refer</kbd> usage.
 </p>
 
 <p>
-It is tempting to provide two levels of documentation, one for
-users familiar with <strong>refer</strong> and one for newcomers
-to <strong>groff</strong> and <strong>mom</strong>, but such an
-approach may muddy the waters for newcomers. <strong>Mom</strong>'s
-allegiance, first and foremost, is to newcomers.  If you're already
-a <strong>refer</strong> user, the information herein will be useful
-for adapting your current <strong>refer</strong> usage to
-<strong>mom</strong>'s way of doing things.  If you've never used
-<strong>refer</strong>, the information is essential, and, in many
+If you&#8217;re already a <kbd>refer</kbd> user, the information
+herein will be useful for adapting your current <kbd>refer</kbd>
+usage to mom&#8217;s way of doing things.  If you&#8217;ve never
+used <kbd>refer</kbd>, the information is essential, and, in many
 cases, may be all you need.
 </p>
 
 <p>
-(For the benefit of old groff-hands: <strong>refer</strong>
-support in <strong>mom</strong> is heavily based on the
-<strong>refer</strong> module of the &quot;ms&quot; macros.  The
-choice was deliberate so that those wishing to play around with
-<strong>mom</strong>'s bibliography formatting style would be
-tinkering with the familiar.)
-</p>
-
-<p>
-<strong>refer</strong> requires first that you create a
-bibliographic database.  From the information contained in the
-database, <strong>mom</strong> formats and generates bibliographies
-and references in MLA (Modern Language Association) style.  MLA
-style is clean, contemporary and flexible, and is widely used in the
-humanities, where the range of material that has to be referenced
-can run from simple books to live interviews and film.
-</p>
-
-<p>
-Once you have created your database, you instruct
-<strong>refer</strong> (and <strong>mom</strong>) to access entries
-in it by supplying keywords from the entries.  Depending on what
-you've instructed <strong>mom</strong> to do, she will put the
-entries &mdash; fully and properly formatted with respect to order,
-punctuation and italicization &mdash; in footnotes, endnotes, or a
-full bibliography.
-</p>
-
-<p>
-I encourage anyone interested in what MLA style looks like &mdash;
-and, by extension, how your bibliographies and references will look
-after <strong>mom</strong> formats them &mdash; to check out
-
-<pre>
-    http://www.aresearchguide.com/12biblio.html
-</pre>
-
+I encourage anyone interested in what MLA style looks
+like&mdash;and, by extension, how your bibliographies and references
+will look after mom formats them&mdash;to check out
+<br/>
+<span class="pre-in-pp">
+  http://www.aresearchguide.com/12biblio.html
+</span>
 or any other website or reference book on MLA style.
 </p>
 
-<p>
-<strong>NOTE:</strong> MLA style requires that second and subsequent
-lines of individual references be indented. <strong>Mom</strong>
-takes care of this for you with a default indent, which can be
-changed with the macro
-<a href="#INDENT_REFS">INDENT_REFS</a>.
-</p>
-
-<hr align="left" width="66%"/>
-
-<a name="TUTORIAL_REF"><h2><u>Tutorial</u></h2></a>
-
-<ol>
-    <li><a href="#DB_REF">Creating a refer database</a></li>
-    <li><a href="#RCOMMANDS_REF">Required "refer" commands</a></li>
-    <li><a href="#ACCESSING_REF">Accessing references</a></li>
-    <li><a href="#WHERE_REF">Telling mom where to put references</a></li>
-    <li><a href="#BIBLIO_REF">Creating bibliography pages</a></li>
-    <li><a href="#INVOKING_REF">Invoking groff with mom and refer</a></li>
+<div class="rule-short" style="margin-top: 1em;"><hr/></div>
+
+<div class="examples-container" style="margin-top: 1.5em; margin-bottom: 1.5em;">
+<h3 id="tutorial-ref" class="docs">Tutorial on refer usage with mom</h3>
+<ol style="margin-top: 1em; margin-bottom: -.5em;">
+  <li><a href="#db-ref">Create a <kbd>refer</kbd> database</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#example-refer-database">example <kbd>refer</kbd> database</a></li>
+  </ul></li>
+  <li><a href="#rcommands-ref">Insert a <kbd>refer</kbd> block</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#fn-en-block">refer block for footnotes/endnotes</a></li>
+    <li><a href="#bibliography-block">refer block for bibliographies</a></li>
+  </ul></li>
+  <li><a href="#placement-ref">Tell mom where you want your references (footnotes/endnotes or a bibliography)</a></li>
+  <li><a href="#accessing-ref">Accessing references in the database</a></li>
+  <li><a href="#fn-en-recipe">Entering footnote/endnote references</a></li>
+  <li><a href="#bibliography-recipe">Creating a bibliography</a></li>
+  <li><a href="#invoking-ref">Invoking groff with mom and <kbd>refer</kbd></a></li>
 </ol>
 
-<a name="DB_REF"><h3><u>1. Creating a refer database</u></h3></a>
+<h4 id="db-ref" class="docs">1. Create a refer database</h4>
 
 <p>
-The first step in using <strong>refer</strong> with
-<strong>mom</strong> is setting up your bibliographic database.  The
-database is a file containing separate entries for each reference
-you want to access from your <strong>mom</strong> files.  The file
-is <em>not</em> a &quot;mom file&quot;; it is a separate database.  You
-may set up individual databases for individual documents, or create
-a large database that contains all the references you'll ever need.
+The first step in using <kbd>refer</kbd> with mom is creating a
+database.  The database is a text file containing entries for the
+works you will be citing.  You may set up separate databases for
+individual documents, or create a large database that can be
+accessed by many documents.
 </p>
 
 <p>
-Entries (&quot;records&quot;) in the database file are separated
-from each other by a single, blank line.  The records themselves
-are composed of single lines (&quot;fields&quot;) with no blank
-lines between them.  Each field begins with a percent sign
-and a single letter (the &quot;field identifier&quot;) e.g.
-<kbd>%A</kbd> or <kbd>%T</kbd>.  The letter identifies what part
-of a bibliographic entry the field refers to: Author, Title,
-Publisher, Date, etc.  After the field identifier comes a single
-space, followed by the information appropriate to field.  No
-punctuation should go at the ends of fields; <strong>mom</strong>
-adds what's correct automatically.  Do note, however, that author(s)
-<nobr>(<kbd>%A</kbd>)</nobr> requires that you enter the author
-information exactly as you wish it to come out (minus the period),
-including the comma after the first author's last name.
+Entries (&#8220;records&#8221; in refer-speak) in the database
+are separated from each other by a single, blank line.  The records
+themselves are composed of single lines (&#8220;fields&#8221;) with
+no blank lines between them.  Each field begins with a percent
+sign and a single letter (the &quot;field identifier&quot;)
+e.g. <kbd>%A</kbd> or <kbd>%T</kbd>.  The letter identifies
+what part of a bibliographic entry the field refers to: Author,
+Title, Publisher, Date, etc.  After the field identifier comes
+a single space, followed by the information appropriate to
+field.
 </p>
 
+<!-- Add rules for punctuation and italics -->
+
 <p>
-Here's a sample database containing two records so you can
-visualize what the above paragraph says:
-
-<pre>
-%A Schweitzer, Albert
-%A C.M. Widor
-%T J.S. Bach
-%l Ernest Newman
-%V Vol 2
+Here&#8217;s an example database containing two records so you can
+visualize what the above paragraph says.
+</p>
+
+<div id="example-refer-database" class="examples" style="margin-top: -.5em;">Example <kbd>refer</kbd> database</div>
+<div class="examples-container" style="padding-bottom: 1em;">
+<span class="pre">
+%A Terry Pratchett
+%A Neil Gaiman
+%T Good Omens
 %C London
-%I Adam and Charles Black
-%D 1923
-%O 2 vols
-%K bach vol 2
+%I Gollancz
+%D 1990
 
-%A Schaffter, Peter
+%A Peter Schaffter
 %T The Schumann Proof
 %C Toronto
 %I RendezVous Press
 %D 2004
-%K schumann schaffter
-</pre>
-</p>
+</span>
+</div>
 
 <p>
-The order in which you enter fields doesn't matter.
-<strong>mom</strong> and <strong>refer</strong> will re-arrange them
-in the correct order for you.
-</p>
-
-<p>
-The meaning of the letters follows.  There are, with
-<strong>refer</strong>, quite a few &mdash; all uppercase
-&mdash; which have, over time, come to be &quot;standard&quot;.
-<strong>Mom</strong> respects these.  However, she adds to the list
-(mostly the lowercase letters).
-</p>
-
-<pre>
-    %A Author           &mdash; additional authors may be entered on separate %A
-                           lines as in first entry of the sample, above; mom 
-                           and refer will figure out what to do with multiple
-                           authors according to MLA rules
-    %T Title            &mdash; either the primary title (e.g. of a book), or the
-                           title of an article (e.g. within a book or
-                           journal or magazine)
-    %B Book title       &mdash; the title of a book when %T contains the title
-                           of an article; otherwise, use %T for book
-                           titles
-    %R Report number    &mdash; for technical reports
-    %J Journal name     &mdash; the name of a journal or magazine when %T
-                           contains the title of an article
-    %E Editor           &mdash; additional editors may be entered on separate %E
-                           lines (like authors); mom and refer will figure
-                           out what to do with them according to MLA rules
-    %e Edition          &mdash; the number of name of a specific edition
-                           (e.g. Second, 2nd, Collector's, etc.)
-    %V Volume           &mdash; volume number of a journal or series of books
-    %N Journal number   &mdash; journal or magazine number
-    %S Series           &mdash; series name for books or journals that are part of
-                           a series
-    %C City             &mdash; the city of publication
-    %I Publisher        &mdash; the publisher; %I stands for "Issuer"
-    %D Publication date
-    %P Page number(s)   &mdash; enter page ranges as, e.g., 22-25
-    %G Gov't.
-       ordering number  &mdash; for government publications
-    %O Other            &mdash; additional information or comments you want
-                           to appear at the end of the reference
-    %K Keywords         &mdash; any words that will clear up ambiguities
-                           resulting from database entries that
-                           contain, say, the same author or the
-                           same title
-    %d original
-       publication date &mdash; if different from the date
-                                       of publication
-    %a additions        &mdash; for books, any additions to the original work,
-                           such as the preface to a new edition or a new
-                           introduction
-    %t reprint title    &mdash; if different from a work's original title
-    %l translator       &mdash; if the translator is not the editor; if more
-                            than one translator, this field should contain
-                            all the names, with appropriate punctuation
-    %r translator
-       and editor       &mdash; if tr. and ed. are one in the same;
-    %s site name        &mdash; for web sites, the site name
-    %c content
-       of site          &mdash; for web sites, the content, if unclear
-                           (i.e. advertisement, cartoon, blog)
-    %o organization     &mdash; for web sites, the organization, group or
-                           sponsor of the site
-    %a access date      &mdash; for a website, the date you accessed it
-    %u URL              &mdash; for websites, the full URL of the site
-</pre>
-
-<a name="REF_DISC_HY"></a>
-
-<p>
-<strong>Tip:</strong> If you have hyphenation turned on in your
-document (you probably do), <strong>mom</strong> will hyphenate
-your references.  This can be a problem because references
-typically contain several proper names.  Proper names shouldn't be
-hyphenated.  The solution is to prepend to any proper name in the
-database the <strong>groff</strong>
-<a href="definitions.html#TERMS_DISCRETIONARYHYPHEN">discretionary hyphen</a>
-character, <kbd>\%</kbd>, like this:
-
-<pre>
-    %A Hill, \%Reginald
-</pre>
-</p>
-
-<p>
-Alternatively, you can turn hyphenation off entirely in
-references with the macro,
-<a href="#HYPHENATE_REFS">HYPHENATE_REFS</a> <kbd>OFF</kbd>.
+The order in which you enter fields doesn&#8217;t matter.
+<kbd>Refer</kbd> will re-arrange them for you.
 </p>
 
-<a name="RCOMMANDS_REF"><h3><u>2. Required &quot;refer&quot; commands</u></h3></a>
+<h4 id="rcommands-ref" class="docs">2. Insert a refer block</h4>
 
 <p>
 Having set up your database, you now need to put some
-<strong>refer</strong>-specific commands at the top of your
-<strong>mom</strong> file.  You cannot skip this step, nor can you
-&quot;source&quot; these commands with the <strong>groff</strong>
-<a href="definitions.html#TERMS_PRIMITIVES">primitive</a>,
-<kbd>.so</kbd> or the <strong>mom</strong> macro,
-<a href="docprocessing.html#INCLUDE">INCLUDE</a>.
-They <strong><em>must</em></strong> appear, exactly as shown, in
-every file requiring bibliographic references.
+<kbd>refer</kbd>-specific commands in your mom file.
 </p>
 
 <p>
-<strong>refer</strong> commands are introduced with a single
-line containing <kbd>.R1</kbd>, and concluded with a single line
-containing <kbd>.R2</kbd>.  What you put between the <kbd>.R1</kbd>
-and <kbd>.R2</kbd> lines are the commands themselves.  The commands
-should be entered one per line, in lowercase letters, <em><u>with
-no initial period (dot)</u></em>.
+<kbd>Refer</kbd> commands are introduced by a single line
+containing <kbd>.R1</kbd>, and concluded with a single line
+containing <kbd>.R2</kbd>.  What goes between the <kbd>.R1</kbd>
+and <kbd>.R2</kbd> lines is called a &#8220;refer block&#8221;.
+<kbd>Refer</kbd> commands in a refer block should be entered one per
+line, in lowercase letters, <i>with no initial period</i> (dot).
+The specific commands, and the placement of the block, depend on
+whether you want your references in footnotes/endnotes or in a
+bibliography.
 </p>
 
-<p>
-Here's an example:
-
-<pre>
-    .R1
-    no-label-in-text
-    no-label-in-reference
-    .R2
-</pre>
-</p>
+<h5 id="fn-en-block" class="docs" style="font-size: 90%; margin-top: .25em;">Refer block for footnotes/endnotes</h5>
 
-<p>
-There are an awful lot of <strong>refer</strong> commands.  We will
-focus only on those required to get <strong>mom</strong> cooperating
-with <strong>refer</strong>.  If you're interested, study the
-<strong>refer</strong> manpage to discover what other commands are
-available and how to manipulate them.
+<p style="margin-top: .5em;">
+If you want footnote or endnote references, place this block at
+the <i>top</i> of your mom file.
 </p>
 
-<p>
-At a minimum, all <strong>mom</strong> files accessing
-a bibliographic database must contain the following
-<strong>refer</strong> commands, exactly as shown:
-
-<a name="REFER_BLOCK1"></a>
-
-<pre>
+<div id="refer-block1" class="examples" style="margin-top: -.5em;">
+<div class="examples-container" style="padding-bottom: 1em;">
+<span class="pre">
 .R1
 no-label-in-text
 no-label-in-reference
-join-authors &quot;, and &quot; &quot;, &quot; &quot;, and &quot;
-database &lt;full path to the database&gt;
+join-authors " and " ", " ", and "
+database &lt;full path to database&gt;
 .R2
-</pre>
-</p>
-
-<p>
-The first two commands tell <strong>refer</strong> to let
-<strong>mom</strong> handle everything associated with footnote
-and endnote markers, both in the body of the document, and in the
-footnotes/endnotes themselves.
-</p>
-
-<p>
-The third command is required for <strong>mom</strong> to handle
-multiple authors in proper, MLA style.
-</p>
-
-<p>
-The last command, <kbd>database</kbd>, assumes you have created
-your own database, and do not otherwise have a system-wide
-&quot;default&quot; database. &quot;...full path to the
-database&quot; means the full path <em>including</em> the database
-filename, e.g. <nobr><kbd>/home/user/refer/my_database.</kbd></nobr>
-</p>
-
-<p> If you're already a <strong>refer</strong> user, feel free to
-enter whatever <strong>refer</strong> commands are necessary to
-access the database(s) you want.
-</p>
-
-<p>
-With the above <strong>refer</strong> block, you can embed
-references directly into the text of your document, or have them
-output as footnotes or endnotes.  If you want to &quot;collect&quot;
-references for later output on a bibliography page, the block must
-read:
-
-<pre>
+</span>
+</div>
+</div>
+<p style="margin-top: .5em; font-size: 95%; line-height: 120%;">
+<kbd>&lt;full&nbsp;path&nbsp;to&nbsp;the&nbsp;database&gt;</kbd>
+means the full path including the filename, e.g.
+<kbd>/home/user/refer/my-database-file</kbd>.
+</p>
+
+<h5 id="bibliography-block" class="docs" style="font-size: 90%; margin-top: .25em;">Refer block for bibliographies</h5>
+
+<p style="margin-top: .5em;">
+If you want a bibliography, place this block at the <i>bottom</i> of
+your mom file, prior to invoking
+<a href="#bibliography">BIBLIOGRAPHY</a>.
+</p>
+
+<div id="refer-block2" class="examples" style="margin-top: -.5em;">
+<div class="examples-container" style="padding-bottom: 1em;">
+<span class="pre">
 .R1
 no-label-in-text
 no-label-in-reference
 join-authors ", and " ", " ", and "
-database &lt;full path to the database&gt;
-sort
-accumulate
+sort A1Q1T1B1E1
+reverse A1
+database &lt;full path to database&gt;
 .R2
-</pre>
+</span>
+</div>
+</div>
+
+<p style="margin-top: .5em; font-size: 95%; line-height: 120%;">
+<kbd>&lt;full&nbsp;path&nbsp;to&nbsp;the&nbsp;database&gt;</kbd>
+means the full path including the filename, e.g.
+<kbd>/home/user/refer/my-database</kbd>.
 </p>
 
-<a name="ACCESSING_REF"><h3><u>3. Accessing references</u></h3></a>
-
-<p>
-References are accessed by putting keywords, all on one line,
-between the <strong>refer</strong> commands <kbd>.[</kbd> and
-<kbd>.]</kbd>.  Both of these commands must appear on separate
-</p>
+<!-- Some sort of header saying "these blocks for these kinds of refs", followed
+     by en/fn block and bib block.  Make embedded refs, and a discussion of why they're
+     not really a good idea, another section.
+-->
 
-<pre>
-    .[
-    keyword(s)
-    .]
-</pre>
-lines, by themselves, like this:
+<h4 id="placement-ref" class="docs">3. Tell mom where you want your references (footnotes/endnotes or a bibliography)</h4>
 
 <p>
-Keywords are any word, or set of words, that identify a database
-record (i.e. a reference) unambiguously. (<strong>refer</strong>
-doesn't like ambiguity.)
+If you want references in footnotes, issue the instruction
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE_REFS
+</span>
+anywhere before the first citation in your file.
 </p>
 
 <p>
-If, for example, you want to reference a book by Ray Bradbury,
-and the database contains only one book by Bradbury, a suitable
-keyword would be "Bradbury".  If your database contains several
-books by Bradbury, say, <em>Fahrenheit 451</em> and <em>The Martian
-Chronicles</em>, you could reference them with the keywords, "451"
-and "Martian".  If, in addition to the two books by Bradbury, you
-also had one whose title was <em>The Martian Mission</em>, suitable
-keywords to reference <em>The Martian Chronicles</em> might be:
-
-<pre>
-    .[                or    .[                   or  .[
-    Bradbury Martian        Bradbury Chronicles      Martian Chronicles
-    .]                      .]                       .]
-</pre>
+If you want references in endnotes, issue the instruction
+<br/>
+<span class="pre-in-pp">
+  .ENDNOTE_REFS
+</span>
+anywhere before the first citation in your file.
 </p>
 
 <p>
-The database field identifier, <kbd>%K</kbd>, lets you create
-special keywords for references.  This can be very handy if you need
-both a &quot;short&quot; and a &quot;long&quot; reference to the
-same work.  The short reference might be used in footnotes; the long
-one in a bibliography.  Consider the following:
-
-<pre>
-    %A Isherwood, Christopher      %A Isherwood
-    %T Mr. Norris Changes Trains   %T Mr. Norris Changes Trains
-    %d 1935                        %K Nor short
-    %t The Last of Mr. \%Norris
-    %a Intro. Tom Crawford
-    %C New York
-    %I New Directions
-    %D 1945
-    %K Norris
-</pre>
+If you want your references in a bibliography, issue the instruction
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY
+</span>
+at the end of your file, before
+<a href="tables-of-contents.html#TOC">TOC</a>
+(Table of Contents).
 </p>
 
-<p>
-To access the shorter reference, you'd do
+<h4 id="accessing-ref" class="docs">4. Accessing references in the database</h4>
 
-<pre>
-    .[
-    Nor short
-    .]
-</pre>
+<p>
+References are accessed by putting keywords from the desired database
+record between two special <kbd>refer</kbd> commands:
+<br/>
+<span class="pre-in-pp">
+  .[
+</span>
+and
+<br/>
+<span class="pre-in-pp">
+  .]
+</span>
+Keywords are any word, or set of words, that identify a database
+record unambiguously.  Thus, if you have only one database record for
+the author Ray Bradbury, 
+<br/>
+<span class="pre-in-pp">
+  .[
+  bradbury
+  .]
+</span>
+is sufficient.  However, if your database contains several records
+for books by Bradbury, say, <i>Fahrenheit 451</i> and <i>The
+Martian Chronicles</i>,
+&#8220;<kbd>bradbury&nbsp;451</kbd>&#8221; and
+&#8220;<kbd>bradbury&nbsp;martian</kbd>&#8221; would identify the two records unambiguously.
 </p>
 
 <p>
-To access the longer one, you'd do
-
-<pre>
-    .[
-    Norris
-    .]
-</pre>
+A special database field identifier, <kbd>%K</kbd>, lets you create
+unique keywords for database records to help clear up any ambiguity.
 </p>
 
-<a name="WHERE_REF"><h3><u>4. Telling mom where to put references</u></h3></a>
-
 <p>
-<strong>Mom</strong> provides several mechanisms for outputting
-references where you want.
+Notice that you don&#8217;t have to worry about capitalization when
+entering keywords.
 </p>
 
-<h4><u>Embedding references in the document body</u></h4>
+<h4 id="fn-en-recipe" class="docs">5. Entering footnote/endnote references</h4> 
 
 <p>
-References may be embedded in the document body, surrounded by
-parentheses, square brackets, or braces.  Use whichever you prefer,
-following the recipes below.
-
-<pre>
-    Parentheses    Square brackets    Braces
-    -----------    ---------------    ------
+Depending on which you have issued, a
+<kbd><a href="#footnote-refs">.FOOTNOTE_REFS</a></kbd>
+or an
+<kbd><a href="#endnote-refs">.ENDNOTE_REFS</a></kbd>
+command, entering references is done like this:
+<br/>
+<span class="pre-in-pp">
+  .REF
+  .[
+  keyword(s)
+  .]
+  .REF
+</span>
+If FOOTNOTE_REFS is in effect, the reference between the first
+and second <kbd>.REF</kbd> will be treated as a footnote.  If
+ENDNOTE_REFS, it will be treated as an endnote.  Endnote references
+must be explictly output with
+<a href="docelement.html#ENDNOTES">ENDNOTES</a>
+at the end of your file, before
+<a href="tables-of-contents.html#TOC">TOC</a>.
+</p>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">Important:</span>
+REF behaves identically to
+<a href="docelement.html#footnote">FOOTNOTE</a>
+and
+<a href="docelement.html#endnote">ENDNOTE</a>
+with respect to the use of the <kbd>\c</kbd> inline escape.  Please
+read the
+<a href="docelement.html#footnote-note">HYPER IMPORTANT NOTE</a>
+found in the document entry for FOOTNOTE (which also applies to
+ENDNOTE).
+</p>
+</div>
+
+<h4 id="bibliography-recipe" class="docs">6. Creating a bibliography</h4>
+
+<p>
+Bibliographic references come between
+<kbd><a href="#bibliography">.BIBLIOGRAPHY</a></kbd>
+and
+<kbd><a href="#bibliography">.BIBLIOGRAPHY&nbsp;OFF</a></kbd>.
+They require no <kbd>.REF</kbd>&#8217;s surrounding the
+&nbsp;&nbsp;<kbd>.[</kbd>&nbsp;&nbsp;and&nbsp;&nbsp;<kbd>.]</kbd>&nbsp;&nbsp;commands.
+Once you have input the desired references, issue the
+following, exactly as shown:
+<br/>
+<span class="pre-in-pp">
+  .[
+  $LIST$
+  .]
+</span>
+and follow it with <kbd>.BIBLIOGRAPHY&nbsp;OFF</kbd>.
+Study the example provided below if you&#8217;re having trouble
+visualizing this.
+</p>
 
-    .REF(          .REF[              .REF{
-    .[             .[                 .[
-    keyword(s)     keyword(s)         keyword(s)
-    .]             .]                 .]
-    .REF)          .REF]              .REF}
-</pre>
+<div id="example-bibliography" class="examples" style="margin-top: -.5em;">Example bibliography</div>
+<div class="examples-container" style="padding-bottom: 1em;">
+<span class="pre">
+.BIBLIOGRAPHY
+.R1
+no-label-in-text
+no-label-in-reference
+join-authors ", and " ", " ", and "
+sort A1Q1T1B1E1
+reverse A1
+database &lt;full path to database&gt;
+.R2
+.[
+bradbury
+.]
+.[
+pratchett
+.]
+.[
+$LIST$
+.]
+.BIBLIOGRAPHY OFF
+</span>
+</div>
+
+<p>
+Alternatively, if you wish to output your entire database as a
+bibliography, do the following at the end of your document, before
+<kbd><a href="tables-of-contest.html#TOC">.TOC</a></kbd>:
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY
+  .R1
+  no-label-in-text
+  no-label-in-reference
+  join-authors ", and " ", " ", and "
+  sort A1Q1T1B1E1
+  reverse A1
+  bibliography &lt;full path to database&gt;
+  .R2
+  .BIBLIOGRAPHY OFF
+</span>
 </p>
 
-<h4><u>Footnote or endnote references</u></h4>
+<h4 id="invoking-ref" class="docs">7. Invoking groff with mom and refer</h4>
 
 <p>
-Most times, you'll probably want references in either footnotes or
-endnotes. <strong>Mom</strong> provides a simple mechanism whereby
-you can choose which, or even switch back and forth.  The primary
-tag is
-<a href="#REF">REF</a>, which is used like this:
-
-<pre>
-    .REF
-    .[
-    keyword(s)
-    .]
-    .REF
-</pre>
+So, now you&#8217;ve got a document formatted properly to use
+references processed with <kbd>refer</kbd>, what do you do to output
+the document?
 </p>
 
 <p>
-<strong>REF</strong> collects references and outputs them
-where you say with the macros,
-<a href="#FOOTNOTE_REFS">FOOTNOTE_REFS</a>
-or
-<a href="#ENDNOTE_REFS">ENDNOTE_REFS</a>.
-Neither <strong>FOOTNOTE_REFS</strong> nor
-<strong>ENDNOTE_REFS</strong> requires an argument.  All they do is
-tell <strong>REF</strong>, whenever it's invoked, where to put the
-references.
+It&#8217;s simple.  Instead of invoking groff with just the
+<kbd>-mom</kbd> option, as explained
+<a href="using.html#using-saving">here</a>,
+invoke groff with the <kbd>-R</kbd> option as well, like this:
+<br/>
+<span class="pre-in-pp">
+  groff -R -mom &lt;filename&gt; ...
+</span>
 </p>
+</div>
 
-<p>
-A recipe for footnote references looks like this:
-<pre>
-    .FOOTNOTE_REFS
-    .REF
-    .[
-    keyword(s)
-    .]
-    .REF
-</pre>
-</p>
+<div class="rule-medium" style="margin-top: 1em;"><hr/></div>
+
+<h2 id="mla" class="docs">MLA (Modern Language Association) style</h2>
+
+<h3 id="ref-styles" class="docs">Types of references (endnote/footnote or bibliographic)</h3>
 
 <p>
-When <strong>FOOTNOTE_REFS</strong> are enabled,
-<strong>REF</strong> behaves identically to
-<a href="docelement.html#FOOTNOTE">FOOTNOTE</a>,
-so please read the
-<a href="docelement.html#FOOTNOTE_NOTE">HYPER IMPORTANT NOTE</a>
-found in the document entry for <strong>FOOTNOTE</strong>.
+MLA allows for three types of references, or referencing styles:
 </p>
+<ul style="margin-top: -.5em;">
+  <li>short, parenthetical references in the text, linked to a list
+      of works cited (a bibliography) at the end of the document</li>
+  <li>footnote references</li>
+  <li>endnote references</li>
+</ul>
 
-<p>
-The reference between the first and second <strong>REF</strong>
-will be treated as a footnote, as will all subsequent
-<strong>REF</strong> pairs unless you invoke the macro,
-<kbd>.ENDNOTE_REFS</kbd>.
+<p style="margin-top: -.5em;">
+There are significant differences between the way footnote/endnote
+references should be formatted, and the formatting style of
+bibliographies.  One example is that footnote/endnote references
+should have their first lines indented, whereas bibliographic
+references should have their second lines indented.  Fortunately,
+with mom, there&#8217;s no need to concern yourself with the differences;
+they&#8217;re taken care of automatically.
 </p>
 
 <p>
-A recipe for endnote references looks like this:
+In terms of inserting references into your documents,
+footnote/endnote references are input in a manner similar to
+entering any other kind of
+<a href="docelement.html#footnote-into">footnote</a>
+or
+<a href="docelement.html#endnote-into">endnote</a>.
+Parenthetical references linked to a bibliography, however, need to
+be handled differently.
+</p>
+
+<h3 id="parenthetical" class="docs">Inserting parenthetical references into the text</h3>
+
+<p>
+MLA style prefers restricting the information in parenthetical
+references to the barest minimum needed to find the cited work in
+the bibliography.  Human judgment is usually required, therefore
+it is generally best to enter the parenthetical references by hand
+rather than asking mom and <kbd>refer</kbd> to generate them.  While
+the latter is possible with the macro pair,
+<kbd><a href="#bracket-refs-parens">.REF(</a> /<a href="#bracket-refs-parens">.REF)</a></kbd>,
+it requires more work to set up your
+<a href="#db-ref">database</a>
+and interrupts the flow of your input file.  Consider these two
+examples, which accomplish exactly the same thing:
+</p>
+<div class="examples-container" style="padding-bottom: .25em;">
+<span class="pre-in-pp">
+  Ancient writers attributed the invention of the monochord
+  to Pythagoras, who lived in the sixth century BC (Marcuse,
+  \*[IT]Survey\*[ROM] 197).  Marcone, however, discovered
+  precursors of the instrument dating at least two centuries
+  earlier (\*[IT]Plectrum\*[ROM] 98).
+</span>
+</div>
+<span style="display: inline-block; padding-top: .5em; padding-bottom: .5em;">versus</span>
+<div class="examples-container" style="padding-bottom: .25em;">
+<span class="pre-in-pp">
+  Ancient writers attributed the invention of the monochord
+  to Pythagoras, who lived in the sixth century BC
+  .REF(
+  .[
+  survey
+  %P 197
+  .]
+  .REF)
+  .  Marcone, however, discovered precursors of the instrument
+  dating at least two centuries earlier
+  .REF(
+  .[
+  plectrum
+  %P 98
+  .]
+  .REF)
+  .
+</span>
+</div>
+
+<p>
+Clearly, the first example takes less work, and is much easier to read.
+</p>
+
+<div class="rule-medium" style="margin-top: 1em;"><hr/></div>
+
+<h2 id="database" class="docs">The refer database</h2>
+
+<h3 id="database-intro" class="docs">Introduction</h3>
+
+<p style="margin-top: .5em;">
+The heart and soul of <kbd>refer</kbd> is the bibliographic
+database.  Knowing how to create records (ie. the entries for works
+cited in a document) is largely a question matching data (author,
+title, publisher, etc) with the correct field identifier.  For
+example, if you&#8217;re citing from a scholarly journal, you need to know
+that <kbd>%J</kbd> is the field identifier for journal names and
+<kbd>%N</kbd> is the field identifier for the journal number.  Use
+the
+<a href="#fields-quick">Quick list of field identifiers</a>
+as your guide.
+</p>
+
+<h3 id="database-rules" class="docs">The rules</h3>
+
+<p style="margin-top: .5em;">
+Entering the data correctly is also important.  Fortunately, there
+are very few rules, and those there are make sense.  In a nutshell:
+</p>
+<ul style="margin-top: -.5em;">
+  <li>enter the data in each field in natural order; author John Smith is
+      &#8220;John Smith&#8221;, editor Jane Doe is &#8220;Jane Doe&#8221;</li>
+  <li>capitalize all proper nouns and words in titles as you expect
+      to see them; otherwise, use lowercase</li>
+  <li>use no terminating punctuation unless required; typically,
+      required punctuation is the period after a shortform
+      (&#8220;ed.&#8221; or &#8220;eds.&#8221;, &#8220;Jr.&#8221;,
+      etc) or a question mark or exclamation mark at the end of a
+      title</li>
+  <li>if part of a field needs to be set off in single-quotes, use
+      <kbd>\[oq]</kbd> and <kbd>\[cq]</kbd> (openquote, closequote) rather than the
+      single-quote (or apostrophe) character on your keyboard</li>
+  <li>if part of a field needs to be forced into italics, use the
+      escapes <kbd>\*[IT]</kbd> and <kbd>\*[PREV]</kbd>; if the italicized
+      portion concludes the field, omit <kbd>\*[PREV]</kbd></li>
+  <li>if you require characters with accents, ligatures or special
+      symbols, use groff&#8217;s &#8220;named&#8221; glyphs (eg.
+      <kbd>\['e]</kbd> for <kbd>é</kbd>); a full list can be found in
+      <kbd>man groff_char</kbd></li>
+</ul>
 
-<pre>
-    .ENDNOTE_REFS
-    .REF
-    .[
-    keyword(s)
-    .]
-    .REF
-</pre>
-</p>
+<h3 id="fields-quick" class="docs" style="margin-top: 1.25em; margin-bottom: .5em;">Quick guide to field identifiers <span style="text-transform: none;">(click on any that are links for more information)</span></h3>
 
-<p>
-The reference between the first and second <strong>REF</strong>
-will be treated as an endnote, as will all subsequent
-<strong>REF</strong> pairs unless you invoke the macro,
-<kbd>.FOOTNOTE_REFS</kbd>.
+<div class="examples-container" style="padding-bottom: 1em;">
+<span class="pre">
+<a class="quick" href="#A">%A</a> author           &ndash; records may contain multiple authors,
+                      one per line
+<a class="quick" href="#Q">%Q</a> non-human author &ndash; corporate author, eg. National Geographic;
+                      may also be used for exceptional reference types
+<a class="quick" href="#m">%m</a> multiple authors &ndash; whenever "et al." is desirable
+<a class="quick" href="#i">%i</a> idem             &ndash; multiple works by the same author
+<a class="quick" href="#p">%p</a> post-author      &ndash; post-author information (eg appendix,
+                      foreword, letter)
+%T title            &ndash; primary title (of a book) or the
+                      title of an article (within a scholarly
+                      journal or a magazine)
+%B book title       &ndash; when %T contains the title of an article;
+<a class="quick" href="#q">%q</a> force quote      &ndash; force a title into double-quotes
+%t reprint title    &ndash; if different from a work's original title
+%b main author      &ndash; when citing a preface, foreword,
+                      introduction, or afterword, the author of
+                      the complete original work
+<a class="quick" href="#E">%E</a> editor           &ndash; records may contain multiple editors,
+                      one per line
+<a class="quick" href="#l">%l</a> translator       &ndash; if more than one translator, all the
+                      names
+%r translator       &ndash; if tr. and ed. are one in the same
+    and editor
+%M magazine or      &ndash; when %T contains the title of an article
+    newspaper
+%J journal          &ndash; when %T contains the title of an article
+%e edition          &ndash; number or name of an edition
+                      (e.g. Second, 2nd, Collector's, etc.)
+%S series           &ndash; series name of books or journals
+%V volume           &ndash; volume number (of books)
+%N journal number   &ndash; journal or magazine number
+%R report number    &ndash; technical report number
+%G gov&#8217;t.           &ndash; government ordering number
+<a class="quick" href="#O">%O</a> other            &ndash; information or which there is no appropriate
+                      field letter
+<a class="quick" href="#C">%C</a> city             &ndash; city of publication
+%I publisher        &ndash; publisher
+%D date             &ndash; publication date
+<a class="quick" href="#d">%d</a> original        
+   publication date &ndash; if different from date of publication
+<a class="quick" href="#P">%P</a> page(s)          &ndash; page number or range
+<a class="quick" href="#n">%n</a> annotation       &ndash; annotation to the reference
+%s site name        &ndash; for internet references, the website name
+%c content          &ndash; for internet references, the source of
+                      the material (eg. Web or Email); for websites,
+                      the content, if unclear
+%o organization     &ndash; for internet sites, the organization, group
+                      or sponsor of the site
+%a access date      &ndash; for internet sites, the date of access
+%u URL              &ndash; for internet sites, the full URL
+<a class="quick" href="#K">%K</a> keywords         &ndash; words that help clear up ambiguities in
+                      the database
+</span>
+</div>
+
+<h3 id="fields-specifics" class="docs">Field identifiers: specifics, usage and examples</h3>
+
+<h4 id="A" class="docs fields">%A &ndash; author field</h4>
+
+<p>
+For multiple authors, enter each in a separate <kbd>%A</kbd>
+field in the order in which they should appear.  If the author on
+the title page is the editor (say, a book of short stories edited by
+Ray Bradbury), add <kbd>, ed.</kbd> to the end of the
+<kbd>%A</kbd> field, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Ray Bradbury, ed.
+</span>
+Do not use the <kbd>%E</kbd> field in these instances.  If the work
+has several such editors, enter each in a separate <kbd>%A</kbd>
+field, as for multiple authors, and add <kbd>, eds.</kbd> to the
+last one, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Jane Dearborne
+  %A Bill Parsons, eds.
+</span>
 </p>
 
-<p>
-When <strong>ENDNOTE_REFS</strong> are enabled, <strong>REF</strong>
-behaves identically to
-<a href="docelement.html#FOOTNOTE">ENDNOTE</a>,
-so please read the
-<a href="docelement.html#ENDNOTE_NOTE">HYPER IMPORTANT NOTE</a>
-found in the document entry for <strong>ENDNOTE</strong>.
-</p>
+<h4 id="Q" class="docs fields">%Q &ndash; exceptional entries</h4>
 
 <p>
-The innate flexibility of this scheme allows you to have both
-footnote references and endnote references in the same document.
-This would be desirable if, say, you wanted &quot;short&quot;
-references in footnotes, and complete references in endnotes.
+Sometimes, a work has no author or title information, for example a
+book review in a newspaper.  In such cases, use <kbd>%Q</kbd>, like
+this:
+<br/>
+<span class="pre-in-pp">
+  %Q Rev. of \*[IT]Mean Streets Omnibus\*[PREV], ed. Raymond Hammett
+  %M Times Literary Supplement
+  %D 7 July 1972
+</span>
 </p>
 
-<a name="COLLECTED_REF"><h4><u>Collected references</u></h4></a>
+<h4 id="m" class="docs fields">%m &ndash; multiple authors (et al.)</h4>
 
 <p>
-Sometimes, you may want to put references in input text near
-sections of text to which they pertain, but not actually want
-them output until later (typically, on a bibliography page).
-<strong>REF</strong> is used for this, too, but you have to make
-sure your <strong>refer</strong> commands block is set up properly.
-The recipe for this is:
-
-<a name="REFER_BLOCK2"></a>
-
-<pre>
-.R1
-no-label-in-text
-no-label-in-reference
-join-authors &quot;, and &quot; &quot;, &quot; &quot;, and &quot;
-database &lt;full path to the database&gt;
-sort
-accumulate
-.R2
-</pre>
+Whenever it&#8217;s desirable to abbreviate a list of authors with
+&#8220;et al.&#8221; enter it in the <kbd>%m field</kbd>, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Paul Lauter
+  %A Doug Scofield
+  %m et al.
+</span>
 </p>
 
-<p>
-After this set up, and provided you don't issue a
-<kbd>.FOOTNOTE_REFS</kbd> or <kbd>.ENDNOTE_REFS</kbd> command, all
-reference between <strong>REF</strong> pairs will be collected for
-later output.
-</p>
+<h4 id="i" class="docs fields">%i &ndash; idem</h4>
 
 <p>
-As a precaution, <strong>mom</strong> will issue a message
-the first time you call <kbd>.REF</kbd> if neither
-<strong>FOOTNOTE_REFS</strong> nor <strong>ENDNOTE_REFS</strong>
-is in effect.  If collected references are what you want, and you
-have set up your <kbd>.R1 -.R2</kbd> block as above, you may safely
-ignore the message.
+Whenever there are several works by the same author, fill out the
+<kbd>%A</kbd> field with the author&#8217;s name and follow it with the
+<kbd>%i idem</kbd>, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Jonathon Schmidt
+  %i idem
+</span>
+Per MLA style, the author&#8217;s name will be replaced by a long dash.
 </p>
 
 <p>
-<strong>LIMITATION:</strong> You cannot combine
-&quot;collected&quot; references (plain <strong>REF</strong>)
-with <strong>REF</strong>s that are instructed to go into
-footnotes (with <strong>FOOTNOTE_REFS</strong>) or endnotes (with
-<strong>ENDNOTE_REFS</strong>).  This is a limitation imposed by
-<strong>refer</strong>, not <strong>mom</strong>.
+If it&#8217;s necessary to state the role the author served (say,
+editor or translator), fill out the <kbd>%i</kbd> field with the
+information minus <kbd>idem</kbd>, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Ray Bradbury
+  %i ed.
+  %T Timeless Stories for Today and Tomorrow
+</span>
 </p>
 
-<a name="BIBLIO_REF"><h3><u>5. Creating bibliography pages</u></h3></a>
+<h4 id="p" class="docs fields">%p &ndash; post-author information</h4>
 
 <p>
-Bibliography pages are separate pages, like endnotes, on which
-complete bibliographies are output.  And, like endnotes pages, just
-about every element on them can be designed to your specifications
-with control macros.  (See
-<a href="#BIBLIO_CONTROL_MACROS">Control macros for bibliographies</a>.)
-A bibliography page that uses <strong>mom</strong>'s defaults
-begins with the macro,
-<a href="#BIBLIOGRAPHY">BIBLIOGRAPHY</a>,
+When citing from a preface, foreword, introduction, afterword or
+appendix, MLA requires that the information come between the
+author&#8217;s name and the work&#8217;s title, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Martin Packham, Jr.
+  %p appendix
+  %T Why the West was Won
+</span>
+Do not capitalize the first word in the <kbd>%p</kbd> field unless
+it is a proper noun.
+</p>
+
+<h4 id="q" class="docs fields">%q &ndash; force title into double-quotes</h4>
+
+<p>
+Occasionally, you may not be able to use <kbd>%T</kbd> for the
+title because doing so will cause it to come out in italics when
+double-quotes are called for.  An example of this is when citing
+from a dissertation.  Use <kbd>%q</kbd> to get around the problem,
 like this:
-
-<pre>
-    .BIBLIOGRAPHY
-</pre>
+<br/>
+<span class="pre-in-pp">
+  %A Carol Sakala
+  %q Maternity Care Policy in the United States
+  %O diss., Boston U, 1993
+</span>
 </p>
 
-<p>
-Following <strong>BIBLIOGRAPHY</strong>, you have three choices of
-how to proceed.
-</p>
+<h4 id="E" class="docs fields">%E &ndash; editor</h4>
 
 <p>
-If you have elected to have references collected from within the
-body of a document (see above,
-<a href="#COLLECTED_REF">Collected references</a>, 
-for instructions), which assumes you have a <strong>refer</strong>
-command block like the one
-<a href="#REFER_BLOCK2">here</a>
-at the top of your document, you need only do
-
-<pre>
-    .BIBLIOGRAPHY
-    .[
-    $LIST$
-    .]
-</pre>
+Use this only if the author and the editor are not one in the same,
+e.g.
+<br/>
+<span class="pre-in-pp">
+  %A Geoffrey Chaucer
+  %T The Works of Geoffrey Chaucer
+  %E F. W. Robinson
+</span>
 </p>
 
-<p>
-If you want to create the bibliography by hand (which may be the
-case if you've used footnote and/or endnote references throughout
-your document), follow this recipe, which assumes you already have a
-<strong>refer</strong> block like the one
-<a href="#REFER_BLOCK1">here</a>
-at the top of your document:
-
-<pre>
-    .BIBLIOGRAPHY
-    .R1
-    sort
-    accumulate
-    .R2
-    .[          -+
-    keyword(s)   |
-    .]           | &quot;keyword(s)&quot; are keywords identifying the
-    .[           | particular bibliographic reference you want
-    keyword(s)   | from your database.  Order doesn't matter here;
-    .]           | the refer command, sort, takes care of that.
-    .[           |
-    keyword(s)   |
-    .]          -+
-    .[
-    $LIST$
-    .]
-</pre>
-</p>
+<h4 id="l" class="docs fields">%l &ndash; translator</h4>
 
 <p>
-Your final choice is to output your whole database.  Again,
-assuming you have a <strong>refer</strong> block like the one
-<a href="#REFER_BLOCK1">here</a>
-at the top of your file, you need only do:
-
-<pre>
-    .BIBLIOGRAPHY
-    .R1
-    bibliography &lt;full path to database&gt;
-    .R2
-</pre>
+If there is more than one translator, enter all the names, with
+appropriate conjunctions and punctuation, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Feodor Dostoevsky
+  %T Crime and Punishment
+  %l Jessie Coulson, Marjorie Benton, and George Bigian
+</span>
 </p>
 
+<h4 id="O" class="docs fields">%O &ndash; other</h4>
+
 <p>
-If you haven't put a <strong>refer</strong> block in
-your file already, you can put the whole thing after
-<strong>BIBLIOGRAPHY</strong>, like this:
+Occasionally, MLA requires additional information after the title
+but before the publication data (city/publisher/date), for instance,
+the number of volumes in a series, or the fact that the work cited
+is a dissertation.  Here are two examples:
+<br/>
+<span class="pre-in-pp">
+  %A Arthur M. Schlesinger
+  %T History of U.S. Political Parties
+  %O 4 vols.
+  %C New York
+  %I Chelsea
+  %D 1973
 
-<pre>
-    .BIBLIOGRAPHY
-    .R1
-    no-label-in-text                       -+
-    no-label-in-reference                   | These are actually optional
-    database &lt;full path to the database&gt;   -+ 
-    join-authors &quot;, and &quot; &quot;, &quot; &quot;, and &quot;
-    bibliography &lt;full path to database&gt;
-    .R2
-</pre>
+  %A Carol Sakala
+  %q Maternity Care Policy in the United States
+  %O diss., Boston U, 1993
+</span>
+Do not capitalize the first word of the <kbd>%O</kbd> field unless
+it is a proper noun.
 </p>
 
 <p>
-Whichever option you choose, <strong>mom</strong> will output a full
-bibliography page, complete with a title (&quot;BIBLIOGRAPHY&quot;
-by default, but that can be changed).
+Generally, consider <kbd>%O</kbd> a catch-all for information that
+does not match the criterion of any existing field identifier.
 </p>
 
-<a name="INVOKING_REF"><h3><u>6. Invoking groff with mom and refer</u></h3></a>
+<h4 id="C" class="docs fields">%C &ndash; city</h4>
 
 <p>
-So, now you've got a document, formatted properly to use references
-processed with <strong>refer</strong>, what do you do to output the
-document?
+Normally, <kbd>%C</kbd> takes the name of the city of publication,
+and that&#8217;s all.  In the case of a republished book, if new material
+has been added, put such information in the <kbd>%C</kbd>
+field, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Theodore Dreiser
+  %T Sister Carrie
+  %d 1900
+  %C Introd. E. L. Doctorow, New York
+</span>
 </p>
 
-<p>
-It's simple.  Instead of invoking <strong>groff</strong> with just
-the <kbd>-mom</kbd> option, as explained
-<a href="using.html#USING_INVOKING">here</a>,
-invoke groff with the <kbd>-R</kbd> option as well, like this:
-
-<pre>
-    groff -R -mom filename
-</pre>
-</p>
-
-<hr align="left" width="66%"/>
-
-<a name="MACROS_REF"><h3><u>Index of bibliography and reference macros</u></h3></a>
-
-<ul>
-    <li><a href="#REF">Tag: REF</a> &mdash; collected, footnote or endnote references tag</li>
-    <li><a href="#FOOTNOTE_REFS">FOOTNOTE_REFS</a> &mdash; REFs go to footnotes</li>
-    <li><a href="#ENDNOTE_REFS">ENDNOTE_REFS</a> &mdash; REFs go to endnotes</li>
-    <li><a href="#BRACKET_REFS">REF(</a> &mdash; references embedded in text between parentheses</li>
-    <li><a href="#BRACKET_REFS">REF[</a> &mdash; references embedded in text between square brackets</li>
-    <li><a href="#BRACKET_REFS">REF{</a> &mdash; references embedded in text between braces</li>
-    <li><a href="#INDENT_REFS">INDENT_REFS</a> &mdash; manage the 2nd line indent of references</li>
-    <li><a href="#HYPHENATE_REFS">HYPHENATE_REFS</a> &mdash; en/disable hyphenation of references</li>
-    <li><a href="#BIBLIOGRAPHY">BIBLIOGRAPHY</a> &mdash; begin a bibliography page</li>
-    <li><a href="#BIBLIOGRAPHY_TYPE">BIBLIOGRAPHY_TYPE</a> &mdash; plain, or numbered list bibliography</li>
-    <li><a href="#BIBLIO_CONTROL">Bibliography page style control macros</a></li>
-</ul>
-
-<!-- -REF- -->
-
-<hr width="33%" align="left"/>
-
-<a name="REF"><h4><u>Marking off references for footnotes, endnotes, or collection</u></h4></a>
+<h4 id="d" class="docs fields">%d &ndash; original date of publication</h4>
 
 <p>
-Tag: <strong>REF</strong>
+Normally, all that is required in the <kbd>%d</kbd> field is the
+original date of publication.  However, if supplementary original
+publication data is desired, include it in the field, like this:
+<br/>
+<span class="pre-in-pp">
+  %A Kazuo Ishiguro
+  %T The Remains of the Day
+  %d London: Faber, 1989
+  %D New York
+  %I Knopf
+  %D 1990
+</span>
 </p>
 
-<p>
-The macro, <strong>REF</strong>, tells <strong>mom</strong>
-that what follows is <strong>refer</strong>-specific, a
-keyword-identified reference from a <strong>refer</strong> database.
-Depending on whether you've issued a
-<a href="#FOOTNOTE_REFS">FOOTNOTE_REFS</a>
-or
-<a href="#ENDNOTE_REFS">ENDNOTE_REFS</a>
-instruction, <strong>REF</strong> also tells <strong>mom</strong>
-where to place the reference.  If <strong>FOOTNOTE_REFS</strong>,
-the reference will be formatted and placed in a footnote.  If
-<strong>ENDNOTE_REFS</strong>, the reference will be collected for
-output as an endnote.  If you have issued neither instruction, the
-reference will be collected for later output, most likely on a
-<a href="#BIBLIOGRAPHY">bibliography page</a>.
-</p>
+<h4 id="K" class="docs fields">%K &ndash; keywords</h4>
 
 <p>
-Before you use <strong>REF</strong>, you must create a
-<strong>refer</strong> block containing <strong>refer</strong>
-commands (see
-<a href="#RCOMMANDS_REF">Required refer commands</a>
-in the tutorial, above).
+<kbd>Refer</kbd> hates ambiguity, and complains when encountering
+it.  Ambiguities result from the duplication of any word in more
+than one database record when that word is used to identify a
+reference in your input file.  Use <kbd>%K</kbd> to create unique
+keywords found nowhere else in the database.
 </p>
 
 <p>
-<strong>REF</strong> usage always looks like this:
-
-<pre>
-    .REF
-    .[
-    keyword(s)
-    .]
-    .REF
-</pre>
+Imagine, for example, that your database contains records for
+Ray Bradbury&#8217;s <i>The Illustrated Man</i>, another record for
+<i>The Illustrated Bradbury</i> and a third for <i>Bradbury,
+Illustrated</i>.  <kbd>%K</kbd> can be used to clear up any
+ambiguities by assigning a unique word to each record, for example
+<kbd>%K ill-man</kbd> for the first, <kbd>%K ill-brad</kbd> for the
+second, and <kbd>%K brad-ill</kbd> for the third.
 </p>
 
-<p>
-Notice that <strong>REF</strong> &quot;brackets&quot; the
-<strong>refer</strong> call, and never takes an argument.
-</p>
+<h4 id="P" class="docs fields">%P &ndash; pages</h4>
 
 <p>
-What <strong>REF</strong> really is is a convenience.  One could,
-for example, put a reference in a footnote by doing
+When citing page numbers, which is often the case with footnotes
+and endnotes, it is not necessary to put the numbers in the database
+records.  The <kbd>%P</kbd> field can be added underneath the
+keyword(s) in the <kbd>.[</kbd> / <kbd>.]</kbd> entries in your
+input file, allowing you to recycle database records.  For example,
+<br/>
+<span class="pre-in-pp">
+  %A Frye
+  %T Anatomy
+  %K frye-anat
+</span>
+could be your short record for Northrop Frye&#8217;s <i>The Anatomy of
+Criticism</i>.  Any time you wanted to cite a particular page or
+range of pages from that work in a footnote or endnote, you can
+put
+<br/>
+<span class="pre-in-pp">
+  .REF
+  .[
+  frye-anat
+  %P 67-8
+  .]
+  .REF
+</span>
+in your input file, and have it show up with the correct page(s).
+</p>
+
+<h4 id="n" class="docs fields">%n &ndash; annotations</h4>
+
+<p>
+Annotations come at the very end of references.  Capitalize all
+words that require it, including, for bibliographic references (but not
+for footnotes/endnotes) the first.
+</p>
+
+<div class="rule-short"><hr/></div>
+
+<div class="macro-list-container">
+<h3 id="index-ref" class="macro-list">The bibliography and reference macros</h3>
+<ul class="macro-list">
+  <li><a href="#ref">REF</a> &ndash; begin/end a <kbd>refer</kbd> reference</li>
+  <li><a href="#footnote-refs">FOOTNOTE_REFS</a> &ndash; instruct mom to put REFs in footnotes</li>
+  <li><a href="#endnote-refs">ENDNOTE_REFS</a> &ndash; instruct mom to put REFs in endnotes</li>
+  <li><a href="#bracket-refs">Embed references in the text</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#bracket-refs-parens">REF(</a> &ndash; embed a reference in the text between parentheses</li>
+    <li><a href="#bracket-refs-brackets">REF[</a> &ndash; embed a reference in the text between square brackets</li>
+    <li><a href="#bracket-refs-braces">REF{</a> &ndash; embed a reference in the text between braces</li>
+    <li><a href="#bracket-refs-angle">REF&lt;</a> &ndash; embed a reference in the text between angle brackets</li>
+    <li><a href="#refs-style">REF_STYLE</a> &ndash; bibliography or footnote/endnote</li>
+  </ul></li>
+  <li><a href="#indent-refs">INDENT_REFS</a> &ndash; manage indenting of references, per MLA standards</li>
+  <li><a href="#hyphenate-refs">HYPHENATE_REFS</a> &ndash; enable/disable hyphenation of references</li>
+  <li><a href="#bibliography">BIBLIOGRAPHY</a> &ndash; begin a bibliography</li>
+  <li><a href="#bibliography-type">BIBLIOGRAPHY_TYPE</a> &ndash; plain, or numbered list bibliography</li>
+  <li><a href="#biblio-control">Bibliography control macros and defaults</a></li>
+</ul>
+</div>
 
-<pre>
-    .FOOTNOTE
-    .[
-    keyword(s)
-    .]
-    .FOOTNOTE OFF
-</pre>
-</p>
+<!-- -REF- -->
+
+<div class="macro-id-overline">
+<h3 id="ref" class="macro-id">Begin/end a <kbd style="text-transform: none;">refer</kbd> reference</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>REF</b>
+</div>
 
 <p>
-However, if you have a lot of references going into footnotes (or
-endnotes), it's much shorter to type <kbd>.REF/.REF</kbd> than
-<kbd>.FOOTNOTE/.FOOTNOTE OFF</kbd>.  It also helps you distinguish
-&mdash; visually, in your input file &mdash; between footnotes (or
-endnotes) which are references, and footnotes (or endnotes) which
-are explanatory, or expand on the text.
+The macro, REF, tells mom that what follows is
+<kbd>refer</kbd>-specific, a keyword-identified reference from a
+<kbd>refer</kbd> database.  Depending on whether you&#8217;ve issued
+a
+<kbd><a href="#footnote-refs">.FOOTNOTE_REFS</a></kbd>
+or
+<kbd><a href="#endnote-refs">.ENDNOTE_REFS</a></kbd>
+instruction, REF also tells mom where to place the reference.  If
+FOOTNOTE_REFS, the reference will be formatted and placed in a
+footnote.  If ENDNOTE_REFS, the reference will be collected for
+output as an endnote.  If you have issued neither instruction, the
+reference will be collected for later output, most likely in a
+<a href="#bibliography">bibliography</a>.
 </p>
 
 <p>
-<strong>Additional arguments:</strong> If you're using
-<strong>REF</strong> to put references in footnotes and your
-footnotes need to be indented, you may (indeed, should) pass
-<strong>REF</strong> the same arguments used to indent footnotes.
-See
-<a href="docelement.html#FOOTNOTE">FOOTNOTE</a>.
+Before you use REF, you must create a <kbd>refer</kbd> block
+containing <kbd>refer</kbd> commands (see
+<a href="#rcommands-ref">Required refer commands</a>
+in the tutorial, above).
 </p>
 
 <p>
-<strong>Note:</strong> When <strong>REF</strong> is used with
-<a href="#FOOTNOTE_REFS">FOOTNOTE_REFS</a>,
-it behaves identically to
-<a href="docelement.html#FOOTNOTE">FOOTNOTE</a>,
-so please read the
-<a href="docelement.html#FOOTNOTE_NOTE">HYPER IMPORTANT NOTE</a>
-found in the document entry for <strong>FOOTNOTE</strong>.
+REF usage always looks like this:
+<br/>
+<span class="pre-in-pp">
+  .REF
+  .[
+  keyword(s)
+  .]
+  .REF
+</span>
+Notice that REF &#8220;brackets&#8221; the <kbd>refer</kbd> instructions,
+and never takes an argument.
 </p>
 
 <p>
-When <strong>REF</strong> is used with
-<a href="#ENDNOTE_REFS">ENDNOTE_REFS</a>,
+What REF really is is a convenience.  One could, for example, put a
+reference in a footnote by doing
+<br/>
+<span class="pre-in-pp">
+  .FOOTNOTE
+  .[
+  keyword(s)
+  .]
+  .FOOTNOTE OFF
+</span>
+However, if you have a lot of references going into footnotes (or
+endnotes), it&#8217;s much shorter to type <kbd>.REF/.REF</kbd>
+than <kbd>.FOOTNOTE/.FOOTNOTE OFF</kbd>.  It also helps you
+distinguish&mdash;visually, in your input file&mdash;between
+footnotes (or endnotes) which are references, and footnotes (or
+endnotes) which are explanatory, or expand on the text.
+</p>
+
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span>
+If you&#8217;re using REF to put references in footnotes and your
+footnotes need to be indented, you may (indeed, should) pass REF the
+same arguments used to indent footnotes.  See
+<a href="docelement.html#footnote">FOOTNOTE</a>.
+</p>
+
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+When REF is used with
+<a href="#footnote-refs">FOOTNOTE_REFS</a>
+or
+<a href="#endnote-refs">ENDNOTE_REFS</a>,
 it behaves identically to
-<a href="docelement.html#FOOTNOTE">ENDNOTE</a>,
-so please read the
-<a href="docelement.html#ENDNOTE_NOTE">HYPER IMPORTANT NOTE</a>
-found in the document entry for <strong>ENDNOTE</strong>.
+<a href="docelement.html#footnote">FOOTNOTE</a>
+or
+<a href="docelement.html#footnote">ENDNOTE</a>,
+so please read the HYPER IMPORTANT NOTE found in the document entry
+for
+<a href="docelement.html#footnote-note">FOOTNOTE</a>
+and/or
+<a href="docelement.html#endnote-note">ENDNOTE</a>.
 </p>
+</div>
 
 <!-- -FOOTNOTE_REFS- -->
 
-<hr width="33%" align="left"/>
 
-<a name="FOOTNOTE_REFS"><h4><u>Instruct REF to put references in footnotes</u></h4></a>
+<div class="macro-id-overline">
+<h3 id="footnote-refs" class="macro-id">Instruct mom to put references in footnotes</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>FOOTNOTE_REFS</b>
+</div>
 
 <p>
-Macro: <strong>FOOTNOTE_REFS</strong>
+FOOTNOTE_REFS is an instruction to
+<a href="#ref">REF</a>,
+saying, &#8220;put all subsequent references bracketed by the REF
+macro into footnotes.&#8221; You invoke it by itself, with no
+argument.
 </p>
 
 <p>
-<strong>FOOTNOTE_REFS</strong> is an instruction to
-<a href="#REF">REF</a>,
-saying, &quot;put all subsequent references bracketed by the
-<strong>REF</strong> macro into footnotes.&quot; You invoke it by
-itself, with no argument.
+When FOOTNOTE_REFS is in effect, regular footnotes, (i.e.
+those introduced with <kbd>.FOOTNOTE</kbd> and terminated with
+<kbd>.FOOTNOTE OFF</kbd>) continue to behave normally.
 </p>
 
 <p>
-When <strong>FOOTNOTE_REFS</strong> is in effect, regular footnotes,
-(i.e. those introduced with <kbd>.FOOTNOTE</kbd> and terminated with
-<kbd>.FOOTNOTE OFF</kbd>) continue to behave normally.
+You may switch between FOOTNOTE_REFS and
+<a href="#endnote-refs">ENDNOTE_REFS</a>
+at any time.
 </p>
 
 <p>
-You may switch between <strong>FOOTNOTE_REFS</strong> and
-<a href="#ENDNOTE_REFS">ENDNOTE_REFS</a>
-at any time.
+By default, FOOTNOTE_REFS sets the
+<a href="docelement.html#footnote-marker-style">FOOTNOTE_MARKER_STYLE</a>
+to <kbd>NUMBER</kbd> (i.e. superscript numbers).  You may change
+change that if you wish by invoking FOOTNOTE_MARKER_STYLE, with the
+argument you want after FOOTNOTE_REFS.
 </p>
 
 <p>
 If you have a lot of footnote references, and are identifying
 footnotes by line number rather than by markers in the text, you may
 want to enable
-<a href="docelement.html#FOOTNOTES_RUN_ON">FOOTNOTES_RUN_ON</a>
-in conjunctions with <strong>FOOTNOTE_REFS</strong>.
+<a href="docelement.html#footnotes-run-on">FOOTNOTES_RUN_ON</a>
+in conjunctions with FOOTNOTE_REFS.
 </p>
 
 <!-- -ENDNOTE_REFS- -->
 
-<hr width="33%" align="left"/>
-
-<a name="ENDNOTE_REFS"><h4><u>Instruct REF to put references in endnotes</u></h4></a>
+<div class="macro-id-overline">
+<h3 id="endnote-refs" class="macro-id">Instruct mom to put references in endnotes</h3>
+</div>
 
-<p>
-Macro: <strong>ENDNOTE_REFS</strong>
-</p>
+<div class="box-macro-args">
+Macro: <b>ENDNOTE_REFS</b>
+</div>
 
 <p>
-<strong>ENDNOTE_REFS</strong> is an instruction to
-<a href="#REF">REF</a>,
-saying, &quot;add all subsequent references bracketed by the
-<strong>REF</strong> macro to endnotes.&quot; You invoke it by
-itself, with no argument.
+ENDNOTE_REFS is an instruction to
+<a href="#ref">REF</a>,
+saying, &#8220;add all subsequent references bracketed by the REF
+macro to endnotes.&#8221; You invoke it by itself, with no argument.
 </p>
 
 <p>
-When <strong>ENDNOTE_REFS</strong> is in effect,
-<strong>mom</strong> continues to format regular endnotes, (i.e.
-those introduced with <kbd>.ENDNOTE</kbd> and terminated with
-<kbd>.ENDNOTE OFF</kbd>) in the normal way.
+When ENDNOTE_REFS is in effect, mom continues to format regular
+endnotes, (i.e. those introduced with <kbd>.ENDNOTE</kbd> and
+terminated with <kbd>.ENDNOTE OFF</kbd>) in the normal way.
 </p>
 
 <p>
-You may switch between <strong>ENDNOTE_REFS</strong> and
-<a href="#FOOTNOTE_REFS">FOOTNOTE_REFS</a>
+You may switch between ENDNOTE_REFS and
+<a href="#footnote-refs">FOOTNOTE_REFS</a>
 at any time.
 </p>
 
 <!-- -BRACKET_REFS- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="bracket-refs" class="macro-id">Embed references in the text</h3>
+</div>
 
-<a name="BRACKET_REFS"><h4><u>References embedded in text</u></h4></a>
+<div id="bracket-refs-parens" class="box-macro-args">
+Macro pair: <b>REF(</b>&nbsp;&nbsp;...&nbsp;&nbsp;<b>REF)</b>
+</div>
 
-<p>
-Macro pair: <strong>REF(</strong>&nbsp;&nbsp;...&nbsp;&nbsp;<strong>REF)</strong>
-<br/>
+<div id="bracket-refs-brackets" class="box-macro-args" style="margin-top: 1em;">
+Macro pair: <b>REF[</b>&nbsp;&nbsp;...&nbsp;&nbsp;<b>REF]</b>
+</div>
 
-Macro pair: <strong>REF[</strong>&nbsp;&nbsp;...&nbsp;&nbsp;<strong>REF]</strong>
-<br/>
+<div id="bracket-refs-braces" class="box-macro-args" style="margin-top: 1em;">
+Macro pair: <b>REF{</b>&nbsp;&nbsp;...&nbsp;&nbsp;<b>REF}</b>
+</div>
 
-Macro pair: <strong>REF{</strong>&nbsp;&nbsp;...&nbsp;&nbsp;<strong>REF}</strong>
+<div id="bracket-refs-angle" class="box-macro-args" style="margin-top: 1em;">
+Macro pair: <b>REF&lt;</b>&nbsp;&nbsp;...&nbsp;&nbsp;<b>REF&gt;</b>
+</div>
+
+<p>
+You may sometimes want to embed fairly complete references directly
+into the body of your document, typically, but not always, inside
+parentheses.  An instance where this might be desirable would be
+when there are one or two citations in a document where footnotes or
+endnotes are inappropriate, and a bibliography just plain silly (as
+it would be for just one or two citations).
 </p>
 
 <p>
-You may sometimes want to embed references directly into the body
-of your documents, typically, but not always, inside parentheses.
-<strong>Mom</strong> makes this possible through the use of the
-<strong>REF&lt;bracket&nbsp;type&gt;</strong> macros.
+Mom allows you to embed references from your database directly into
+documents through the use of the REF&lt;bracket&nbsp;type&gt;
+macros.
 </p>
 
 <p>
-All three macro pairs, above, are invoked the same way, namely
-by introducing the reference with the first (&quot;open&quot;)
-macro of the <strong>REF&lt;bracket&nbsp;type&gt;</strong>
-pair, and terminating it with the second (&quot;close&quot;)
-<strong>REF&lt;bracket&nbsp;type&gt;</strong> of the pair.  For
+All four macro pairs, above, are invoked the same way, namely
+by introducing the reference with the first (&#8220;open&#8221;)
+macro of the REF&lt;bracket&nbsp;type&gt;
+pair, and terminating it with the second (&#8220;close&#8221;)
+REF&lt;bracket&nbsp;type&gt; of the pair.  For
 example
+<br/>
+<span class="pre-in-pp">
+  .REF(
+  .[
+  keyword(s)
+  .]
+  .REF)
+</span>
+will embed a reference in the body of your document, surrounded
+by parentheses. <kbd>.REF[</kbd>&nbsp;/&nbsp;<kbd>.REF]</kbd>
+will surround the reference with square brackets, etc.
+</p>
+
+<h3 id="ref-style" class="docs">REF_STYLE</h3>
+
+<p>
+When embedding references in the body of text, you&#8217;ll need to
+tell mom which formatting style to use: footnote/endnote or
+bibliography.  Footnote/endnote referencing style uses no periods
+between fields, only proper nouns and titles are capitalized, and
+publication data is enclosed in parentheses.  Bibliography
+referencing style separates each field with a period, every
+field begins with a capital letter, and publication data is not in
+parentheses.
+</p>
 
-<pre>
-    .REF(
-    .[
-    keyword(s)
-    .]
-    .REF)
-</pre>
-
-will embed a reference in the body of your document, surrounded by
-parentheses.  <strong>.REF[</strong>&nbsp;...&nbsp;<strong>.REF]</strong> will
-surround the reference with square brackets.
-<strong>.REF{</strong>&nbsp;...&nbsp;<strong>.REF}</strong> will surround it with
-curly braces.
+<p>
+If you want footnote/endnote style, invoke
+<kbd>.REF_STYLE&nbsp;NOTE</kbd>.  If you want bibliographic style,
+invoke <kbd>.REF_STYLE&nbsp;BIBLIO</kbd>.
 </p>
 
 <!-- -INDENT_REFS- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="indent-refs" class="macro-id">Manage indenting of references, per MLA standards</h3>
+</div>
 
-<a name="INDENT_REFS"><h4><u>Manage the second-line indent of references</u></h4></a>
+<div class="box-macro-args">
+Macro: <b>INDENT_REFS</b> <kbd class="macro-args">FOOTNOTE | ENDNOTE | BIBLIO &lt;indent&gt; </kbd>
+</div>
 
-<p>
-<nobr>Macro: <strong>INDENT_REFS</strong> <kbd>FOOTNOTE | ENDNOTE | BIBLIO &lt;indent&gt; </kbd></nobr>
-<br/>
+<p class="requires">
+&bull;&nbsp;<kbd style="font-style: normal;">&lt;indent&gt;</kbd> requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
 
-<em>*&lt;indent&gt; requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<p>
+MLA-style requires that footnote or endnote references should
+have their first lines indented, whereas bibliographic references
+should have their second and subsequent lines indented.  Thus, if
+you invoke INDENT_REFS with a first argument of <kbd>FOOTNOTE</kbd>
+or <kbd>ENDNOTE</kbd>, the value you give to
+<kbd>&lt;indent&gt;</kbd> sets the indent of the first line for
+those types of references; if you invoke it with <kbd>BIBLIO</kbd>,
+the value you give <kbd>&lt;indent&gt;</kbd> sets the indent of
+second and subsequent lines in bibliographies.
 </p>
 
 <p>
-Proper MLA-style references should have their second, and subsequent
-lines, if any, indented.  Since <strong>mom</strong> formats
-references in MLA style, she automatically indents second lines.  By
-default, the indent for the second line of references, regardless
-of whether the references appear in footnotes, endnotes, or
-bibliographies, is 1.5
-<a href="definitions.html#TERMS_EM">ems</a>
+By default, the indent for all three types of references is 1/2-inch
+for
+<a href="docprocessing.html#printstyle">PRINSTYLE <kbd>TYPEWRITE</kbd></a>
+and 2
+<a href="definitions.html#em">ems</a>
 for
-<a href="docprocessing.html#PRINTSTYLE">PRINSTYLE</a>
-<strong>TYPESET</strong>
-and 2 ems for
-<a href="docprocessing.html#PRINTSTYLE">PRINSTYLE</a>
-<strong>TYPEWRITE</strong>.
+<a href="docprocessing.html#printstyle">PRINSTYLE <kbd>TYPESET</kbd></a>.
 </p>
 
 <p>
-If you'd like to change the indent for footnotes, endnotes or
-bibliographies, just invoke <kbd>.INDENT_REFS</kbd> with a
-first argument telling <strong>mom</strong> for which you want the
-indent changed, and a second argument saying what you'd like the
-indent to be.  For example, if you want the second-line indent of
-references on a bibliography page to be 3
-<a href="definitions.html#TERMS_PICAS_POINTS">picas</a>,
-
-<pre>
-    .INDENT_REFS BIBLIO 3P
-</pre>
-
-is how you'd set it up.
+If you&#8217;d like to change the indent for footnote, endnote or
+bibliography references, just invoke <kbd>.INDENT_REFS</kbd> with
+a first argument saying which one you want the indent changed for, and
+a second argument saying what you&#8217;d like the indent to be.
+For example, if you want the second-line indent of references on a
+bibliography page to be 3
+<a href="definitions.html#picas-points">picas</a>,
+<br/>
+<span class="pre-in-pp">
+  .INDENT_REFS BIBLIO 3P
+</span>
+is how you&#8217;d set it up.
 </p>
 
-<p>
-<strong>Tip:</strong> if you are identifying endnotes by line
-number
-<nobr>(<a href="docelement.html#ENDNOTE_MARKER_STYLE">ENDNOTE_MARKER_STYLE</a> <kbd>LINE</kbd>)</nobr>
-and you have instructed <strong>mom</strong> to put references
-bracketed by
-<a href="#REF">REF</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="tip">Tip:</span>
+If you are identifying endnotes by line number
+(<a href="docelement.html#endnote-marker-style">ENDNOTE_MARKER_STYLE&nbsp;<kbd>LINE</kbd></a>)
+and have instructed mom to put references bracketed by
+<kbd><a href="#ref">.REF</a></kbd>
 into endnotes (with
-<a href="#ENDNOTE_REFS">ENDNOTE_REFS</a>),
-you will almost certainly want to adjust the second-line indent
-for references in endnotes, owing to the way <strong>mom</strong>
-formats line-numbered endnotes.  Study the output of such documents
-to see whether an indent adjustment is required.
+<a href="#endnote-refs">ENDNOTE_REFS</a>),
+you will almost certainly want to adjust the second-line indent for
+references in endnotes, owing to the way mom formats line-numbered
+endnotes.  Study the output of such documents to see whether an
+indent adjustment is required.
 </p>
 
 <p>
 The same advice applies to references in endnotes when you have enabled
-<a href="docelement.html#ENDNOTE_NUMBERS_ALIGN_LEFT">ENDNOTE_NUMBERS_ALIGN_LEFT</a>
-in favour of <strong>mom</strong>'s default
-<a href="docelement.html#ENDNOTE_NUMBERS_ALIGN_RIGHT">ENDNOTE_NUMBERS_ALIGN_RIGHT</a>.
+<br/>
+<span class="pre-in-pp">
+  <a href="docelement.html#endnote-numbers-align-left">.ENDNOTE_NUMBERS_ALIGN_LEFT</a>
+</span>
+in favour of mom&#8217;s default, which is to align them right.
 Study the output to determine what size of second-line indent works
 best.
 </p>
 
-<p>
-(Frankly, endnote references formatted in MLA-style combined
-with left-aligned endnote numbers is a no-win situation, and so is
-best avoided.  Wherever you set the indent, you'll end up with
-the endnote numbers appearing to hang into the left margin, so you
-might as well have them hang, as is the case with
-<kbd>.ENDNOTE_NUMBERS_ALIGN_RIGHT</kbd>.  Ed.)
+<p class="tip-bottom">
+<i>(Frankly, endnote references formatted in MLA-style combined with
+left-aligned endnote numbers is a no-win situation, and so is best
+avoided.  Wherever you set the indent, you&#8217;ll end up with the
+endnote numbers appearing to hang into the left margin, so you might
+as well have them hang, as is the case with
+<kbd style="font-style: normal;">.ENDNOTE_NUMBERS_ALIGN_RIGHT</kbd>.</i>&nbsp;&nbsp;&ndash;&nbsp;Ed.)
 </p>
+</div>
 
 <!-- -HYPHENATE_REFS- -->
 
-<hr width="33%" align="left"/>
-
-<a name="HYPHENATE_REFS"><h4><u>Enable/disable hyphenation of references</u></h4></a>
-
-<p>
-<nobr>Macro: <strong>HYPHENATE_REFS</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="hyphenate-refs" class="macro-id">Enable/disable hyphenation of references</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>HYPHENATE_REFS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
 If you have hyphenation turned on for a document (see
-<a href="typesetting.html#HY">HY</a>),
-and in most cases you probably do, <strong>mom</strong> will
-hyphenate references bracketed by the
-<a href="#REF">REF</a>
+<a href="typesetting.html#hy">HY</a>),
+and in most cases you probably do, mom will hyphenate references
+bracketed by the
+<a href="#ref">REF</a>
 macro.  Since references typically contain quite a lot of proper
-names, which shouldn't be hyphenated, you may want to disable
+names, which shouldn&#8217;t be hyphenated, you may want to disable
 hyphenation for references.
 </p>
 
 <p>
-<strong>HYPHENATE_REFS</strong> is a toggle macro;
-invoking it by itself will turn automatic hyphenation of
-<strong>REF</strong>-bracketed references on (the default).
-Invoking it with any other argument (<strong>OFF</strong>,
-<strong>NO</strong>, <strong>X</strong>, etc.) will disable
-automatic hyphenation for references bracketed by
-<strong>REF</strong>.
+HYPHENATE_REFS is a toggle macro; invoking it by itself will turn
+automatic hyphenation of REF-bracketed references on (the default).
+Invoking it with any other argument (<kbd>OFF, NO, X</kbd>, etc.)
+will disable automatic hyphenation for references bracketed by REF.
 </p>
 
 <p>
 An alternative to turning reference hyphenation off is to prepend
-to selected proper names in your <strong>refer</strong> database
-the <strong>groff</strong>
-<a href="definitions.html#TERMS_DISCRETIONARYHYPHEN">discretionary hyphen</a>
+to selected proper names in your <kbd>refer</kbd> database
+the groff
+<a href="definitions.html#discretionaryhyphen">discretionary hyphen</a>
 character, <kbd>\%</kbd>.  (See
-<a href="#REF_DISC_HY">here</a>
+<a href="#ref-disc-hy">here</a>
 in the tutorial for an example.)
 </p>
 
-<p>
-<strong>Note:</strong> references embedded in the body of a document
-with
-<a href="#BRACKET_REFS">REF</a><strong>&lt;bracket&nbsp;type&gt;</strong>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+References embedded in the body of a document with
+<kbd><a href="#bracket-refs">.REF &lt;bracket&nbsp;type&gt;</a></kbd>
 are considered part of
-<a href="definitions.html#TERMS_RUNNING">running text</a>,
-and are hyphenated (or not) according to whether hyphenation
-is turned on or off for running text.  Therefore, if you want to
-disable hyphenation for such references, you must do so
-temporarily, with
-<a href="typesetting.html#HY">HY</a>,
+<a href="definitions.html#running">running text</a>,
+and are hyphenated (or not) according to whether hyphenation is
+turned on or off for running text.  Therefore, if you want to
+disable hyphenation for such references, you must do so temporarily,
+with
+<a href="typesetting.html#hy">HY</a>,
 like this:
-
-<pre>
-    .HY OFF
-    .REF(
-    .[
-    keyword(s)
-    .]
-    .REF)
-    .HY
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .HY OFF
+  .REF(
+  .[
+  keyword(s)
+  .]
+  .REF)
+  .HY
+</span>
 Alternatively, sprinkle your database fields liberally with
 <kbd>\%</kbd>.
 </p>
+</div>
 
 <!-- -BIBLIOGRAPHY- -->
 
-<hr width="33%" align="left"/>
-
-<a name="BIBLIOGRAPHY"><h4><u>Begin a bibliography page</u></h4></a>
-
-<p>
-Macro: <strong>BIBLIOGRAPHY</strong>
-</p>
+<div class="macro-id-overline">
+<h3 id="bibliography" class="macro-id">Begin a bibliography</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY</b> <kbd class="marco-args">toggle</kbd>
+</div>
 
 <p>
 If you want to append a bibliography to your document, all you need
-do is invoke <kbd>.BIBLIOGRAPHY</kbd> at the place you want
-it.  <strong>BIBLIOGRAPHY</strong> breaks to a new page, prints the
-title (BIBLIOGRAPHY by default, but that can be changed), and awaits
-<strong>refer</strong> instructions.  How to create bibliographies
-is covered in the tutorial section,
-<a href="#BIBLIO_REF">Creating bibliography pages</a>.
+do is invoke <kbd>.BIBLIOGRAPHY</kbd>. <kbd>.BIBLIOGRAPHY</kbd>
+breaks to a new page, prints the title (BIBLIOGRAPHY by default, but
+that can be changed), and awaits <kbd>refer</kbd> instructions.  How
+to create bibliographies is covered in the tutorial section,
+<a href="#bibliography-recipe">Creating bibliography pages</a>.
+When all the required data has been entered, type
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY OFF
+</span>
+to complete the bibliography.
 </p>
 
 <p>
 See the
-<a href="#BIBLIO_CONTROL">Bibliography page style control macros</a>
+<a href="#biblio-control">Bibliography control macros and defaults</a>
 for macros to tweak, design and control the appearance of
 bibliography pages.
 </p>
 
 <!-- -BIBLIOGRAPHY_TYPE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="BIBLIOGRAPHY_TYPE"><h4><u>Plain, or numbered list bibliography</u></h4></a>
-
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_TYPE</strong> <kbd>PLAIN | LIST [ &lt;list separator&gt; ] [ &lt;list prefix&gt; ]</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="bibliography-type" class="macro-id">Plain, or numbered list bibliography</h3>
+</div>
 
-<p>
-<strong>Mom</strong> offers two styles of bibliography output:
-plain, or numbered list style.  With <kbd>PLAIN</kbd>, bibliography
-entries are output with no enumerators.  With <kbd>LIST</kbd>, each
-entry is numbered.
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_TYPE</b> <kbd class="macro-args">PLAIN | LIST [ &lt;list separator&gt; ] [ &lt;list prefix&gt; ]</kbd>
+</div>
 
 <p>
-Entering <kbd>.BIBLIOGRPHY_TYPE PLAIN</kbd> gives you a plain
-bibliography.
+Mom offers two styles of bibliography output: plain, or numbered
+list style.  With the argument, <kbd>PLAIN</kbd>, bibliography entries are output
+with no enumerators.  With the argument, <kbd>LIST</kbd>, each entry is numbered.
 </p>
 
 <p>
-Entering <kbd>.BIBLIOGRAPHY_TYPE LIST</kbd> gives
-you an enumerated bibliography.  The two optional
-arguments, <kbd>&lt;list&nbsp;separator&gt;</kbd> and
-<kbd>&lt;list&nbsp;prefix&gt;</kbd> have the same meaning as the
+The two optional arguments, <kbd>&lt;list&nbsp;separator&gt;</kbd>
+and <kbd>&lt;list&nbsp;prefix&gt;</kbd> have the same meaning as the
 equivalent arguments to
-<a href="docelement.html#LIST">LIST</a>
+<a href="docelement.html#list">LIST</a>
 (i.e. <kbd>&lt;separator&gt;</kbd> and <kbd>&lt;prefix&gt;</kbd>).
 </p>
 
 <p>
-You may enter <kbd>.BIBLIOGRAPHY_TYPE</kbd> either before or
-after <kbd>.BIBLIOGRAPHY</kbd>.  It must, however, always come
-before the <strong>refer</strong> command to output bibliographies.
-(See the tutorial section,
-<a href="#BIBLIO_REF">Creating bibliography pages</a>,
+You may enter the BIBLIOGRAPHY_TYPE either before or after
+<kbd>.BIBLIOGRAPHY</kbd>.  It must, however, always come before
+the <kbd>refer</kbd> command to output bibliographies.  (See the
+tutorial section,
+<a href="#biblio-ref">Creating bibliography pages</a>,
 for instructions on how to output bibliographies.)
 </p>
 
 <p>
-<strong>Mom</strong>'s default <strong>BIBLIOGRAPHY_TYPE</strong>
-is <strong>LIST</strong>, with a period (dot) as the separator, and
-no prefix.
+Mom&#8217;s default BIBLIOGRAPHY_TYPE is PLAIN.
 </p>
 
 <!-- -BIBLIO_CONTROL- -->
 
-<hr width="66%" align="left"/>
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="biblio-control" class="docs defaults">Bibliography control macros and defaults</h3> 
 
-<a name="BIBLIO_CONTROL"><h3><u>Bibliography pages style control</u></h3></a> 
-
-<p>
-<strong>Mom</strong> processes bibliography pages in a manner very
-similar to the way she processes endnotes pages.  The bibliography
-page control macros, therefore, behave in the same way as their
-endnotes pages equivalents.
-</p>
-
-<ol>
-    <li><a href="#BIBLIO_GENERAL"><strong>General bibliography pages style control</strong></a></li>
-    <ul>
-        <li><a href="#BIBLIO_STYLE">Base family/font/quad for bibliographies</a></li>
-        <li><a href="#BIBLIO_PT_SIZE">Base point size for bibliographies</a></li>
-        <li><a href="#BIBLIO_LEAD">Leading of bibliographies</a></li>
-        <li><a href="#SINGLESPACE_BIBLIO">Singlespace bibliographies (for TYPEWRITE only)</a></li>
-        <li><a href="#BIBLIO_NO_COLUMNS">Turning off column mode during bibliography output</a></li>
-        <li>Pagination of bibliographies:</li>
-        <ul>
-            <li><a href="#BIBLIO_PAGENUM_STYLE">Bibliography pages page numbering style</a></li>
-            <li><a href="#BIBLIO_FIRST_PAGENUMBER">Setting the first page number of bibliography pages</a></li>
-            <li><a href="#BIBLIO_NO_FIRST_PAGENUM">Omitting a page number on the first page of bibliographies</a></li>
-        </ul>
-        <li><a href="#SUSPEND_PAGINATION">Suspending pagination of bibliographies</a></li>
-    </ul>
-    <li><a href="#BIBLIO_HEADER_CONTROL"><strong>Bibliography pages header/footer control</strong></a></li>
-    <ul>
-        <li><a href="#BIBLIO_MODIFY_HDRFTR">Modifying what goes in the bibliography pages header/footer</a></li>
-        <li><a href="#BIBLIO_HDRFTR_CENTER">Enabling a header/footer centre when doctype is CHAPTER</a></li>
-        <li><a href="#BIBLIO_ALLOWS_HEADERS">Allow headers on bibliography pages</a></li>
-    </ul>
-    <li><a href="#BIBLIO_MAIN_TITLE"><strong>Bibliography page head (i.e. the title at the top) control</strong></a></li>
-    <ul>
-        <li><a href="#BIBLIO_STRING">Creating/modifying the bibliography page head</a></li>
-        <li><a href="#BIBLIO_STRING_CONTROL">Bibliography page head control</a></li>
-        <li><a href="#BIBLIO_STRING_UNDERLINE">Bibliography page head underlining</a></li>
-        <li><a href="#BIBLIO_STRING_CAPS">Bibliography page head capitalization</a></li>
-    </ul>
+<p style="margin-top: .25em; margin-left: 9px;">
+Mom processes bibliography pages in a manner very similar to the
+way she processes endnotes pages.  The bibliography page control
+macros, therefore, behave in the same way as their endnotes pages
+equivalents.
+</p>
+
+<ol style="margin-top: -.5em; padding-bottom: .5em;">
+  <li><a href="#biblio-general"><b>General bibliography style control</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#biblio-style">Base family/font/quad</a></li>
+    <li><a href="#biblio-pt-size">Base point size</a></li>
+    <li><a href="#biblio-lead">Leading</a></li>
+    <li><a href="#biblio-spacing">Adjust the space between bibliography entries</a></li>
+    <li><a href="#singlespace-biblio">Singlespace bibliographies (for TYPEWRITE only)</a></li>
+    <li><a href="#biblio-no-columns">Turning off column mode during bibliography output</a></li>
+  </ul></li>
+  <li><a href="#biblio-pagination"><b>Pagination of bibliographies</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#biblio-pagenum-style">Page numbering style</a></li>
+    <li><a href="#biblio-first-pagenumber">Setting the first page number of bibliographies</a></li>
+    <li><a href="#biblio-no-first-pagenum">Omitting a page number on the first page of bibliographies</a></li>
+    <li><a href="#suspend-pagination">Suspending pagination during bibliography output</a></li>
+  </ul></li>
+  <li><a href="#biblio-header-control"><b>Header/footer control</b></a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#biblio-modify-hdrftr">Modifying what goes in bibliography headers/footers</a></li>
+    <li><a href="#biblio-hdrftr-center">Header/footer centre string when doctype is CHAPTER</a></li>
+    <li><a href="#biblio-allows-headers">Allow headers on bibliography pages</a></li>
+  </ul></li>
+  <li><a href="#biblio-main-title"><b>Bibliography first-page title control</b></a>
+  <ul>
+    <li><a href="#biblio-string">Title string</a></li>
+    <li><a href="#biblio-string-control">Title string control macros and defaults</a></li>
+    <li><a href="#biblio-string-placement">Title string placement</a></li>
+    <li><a href="#biblio-string-underline">Title string underscoring</a></li>
+    <li><a href="#biblio-string-caps">Title string capitalization</a></li>
+  </ul></li>
 </ol>
+</div>
 
-<hr align="left" width="66%"/>
-
-<a name="BIBLIO_GENERAL"><h4><u>1. General bibliography page style control</u></h4></a>
+<h4 id="biblio-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. General bibliography page style control</h4>
 
-<a name="BIBLIO_STYLE"><h5>*<u>Bibliography family/font/quad</u></h5></a>
+<h5 id="biblio-style" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Base family/font/quad</h5>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
+<span class="pre defaults">
 .BIBLIOGRAPHY_FAMILY    default = prevailing document family; default is Times Roman
 .BIBLIOGRAPHY_FONT      default = roman
 .BIBLIOGRAPHY_QUAD*     default = justified
 
-*Note: BIBLIOGRAPHY_QUAD must be set to either L or J
-</pre>
+*Note: BIBLIOGRAPHY_QUAD must be set to either L (LEFT) or J (JUSTIFIED);
+ R (RIGHT) and C (CENTER) will not work.
+</span>
+</div>
 
 <!-- -BIBLIO_PT_SIZE- -->
 
-<a name="BIBLIO_PT_SIZE"><h5>*<u>Bibliography point size</u></h5></a>
+<h5 id="biblio-pt-size" class="docs" style="margin-top: -1.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Base point size</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_PT_SIZE</strong> <kbd>&lt;base type size of bibliography&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_PT_SIZE</b> <kbd class="macro-args">&lt;base type size of bibliography&gt;</kbd>
+</div>
 
 <p>
 Unlike most other control macros that deal with size of document
-elements, <strong>BIBLIOGRAPHY_PT_SIZE</strong> takes as its
-argument an absolute value, relative to nothing.  Therefore, the
-argument represents the size of bibliography type in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>,
+elements, BIBLIOGRAPHY_PT_SIZE takes as its argument an absolute
+value, relative to nothing.  Therefore, the argument represents the
+size of bibliography type in
+<a href="definitions.html#picaspoints">points</a>,
 unless you append an alternative
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 For example,
-
-<pre>
-    .BIBLIOGRAPHY_PT_SIZE 12
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_PT_SIZE 12
+</span>
 sets the base point size of type on the bibliography page to 12
 points, whereas
-
-<pre>
-    .BIBLIOGRAPHY_PT_SIZE .6i
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_PT_SIZE .6i
+</span>
 sets the base point size of type on the bibliography page to 1/6 of an
 inch.
 </p>
 
 <p>
-The type size set with <strong>BIBLIOGRAPHY_PT_SIZE</strong> is the
-size of type used for the text of the bibliographies, and forms the
-basis from which the point size of other bibliography page elements
-is calculated.
+The type size set with BIBLIOGRAPHY_PT_SIZE is the size of type used
+for the text of the bibliographies, and forms the basis from which
+the point size of other bibliography page elements is calculated.
 </p>
 
 <p>
 The default for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-is 12.5 points (the same default size used in the body of the document).
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>
+is 12.5 points (the same default size used in the body of the
+document).
 </p>
 
 <!-- -BIBLIO_LEAD- -->
 
-<a name="BIBLIO_LEAD"><h5>*<u>Bibliography lead</u></h5></a>
+<h5 id="biblio-lead" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Leading</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_LEAD</strong> <kbd>&lt;base leading of bibliographies&gt; [ ADJUST ]</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_LEAD</b> <kbd class="macro-args">&lt;base leading of bibliographies&gt; [ ADJUST ]</kbd>
+</div>
 
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>; points is assumed</em>
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>; points is assumed
 </p>
 
 <p>
 Unlike most other control macros that deal with leading of document
-elements, <strong>BIBLIOGRAPHY_LEAD</strong> takes as its argument
-an absolute value, relative to nothing.  Therefore, the argument
-represents the
-<a href="definitions.html#TERMS_LEADING">leading</a>
-of endnotes in
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+elements, BIBLIOGRAPHY_LEAD takes as its argument an absolute value,
+relative to nothing.  Therefore, the argument represents the
+<a href="definitions.html#leading">leading</a>
+of bibliographies in
+<a href="definitions.html#picaspoints">points</a>
 unless you append an alternative
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 For example,
-
-<pre>
-    .BIBLIOGRAPHY_LEAD 14
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_LEAD 14
+</span>
 sets the base leading of type on the bibliography page to 14
 points, whereas
-</p>
-
-<p>
-<pre>
-    .BIBLIOGRAPHY_LEAD .5i
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_LEAD .5i
+</span>
 sets the base leading of type on the bibliography page to 1/2 inch.
 </p>
 
 <p>
 If you want the leading of bibliographies adjusted to fill the page,
-pass <strong>BIBLIOGRAPHY_LEAD</strong> the optional argument,
+pass BIBLIOGRAPHY_LEAD the optional argument,
 <kbd>ADJUST</kbd>.  (See
-<a href="docprocessing.html#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a>
+<a href="docprocessing.html#doc-lead-adjust">DOC_LEAD_ADJUST</a>
 for an explanation of leading adjustment.)
 </p>
 
 <p>
 The default for
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>
-is 14 points, adjusted.
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>
+is the prevailing document lead (16 by default), adjusted.
 </p>
 
-<p>
-<strong>NOTE:</strong> Even if you give <strong>mom</strong>
-a <nobr><kbd>.DOC_LEAD_ADJUST OFF</kbd></nobr> command, she
-will still, by default, adjust bibliography leading.  You MUST enter
-<nobr><kbd>BIBLIOGRAPHY_LEAD &lt;lead&gt;</kbd></nobr> with no
-<kbd>ADJUST</kbd> argument to disable this default behaviour.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Even if you give mom a <kbd>.DOC_LEAD_ADJUST&nbsp;OFF</kbd> command,
+she will still, by default, adjust bibliography leading.  You
+<i>must</i> enter <kbd>BIBLIOGRAPHY_LEAD&nbsp;&lt;lead&gt;</kbd>
+with no <kbd>ADJUST</kbd> argument to disable this default
+behaviour.
 </p>
+</div>
 
-<!-- -SINGLESPACE_BIBLIO- -->
+<!-- -BIBLIO_SPACING- -->
 
-<a name="SINGLESPACE_BIBLIO"><h5>*<u>Singlespace bibliographies (TYPEWRITE only)</u></h5></a>
+<h5 id="biblio-spacing" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Adjust the space between bibliography entries</h5>
 
-<p>
-<nobr>Macro: <strong>SINGLESPACE_BIBLIOGRAPHY</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_SPACING</b> <kbd class="macro-args">&lt;amount of space&gt; </kbd>
+</div>
 
-<p>
-If your 
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a>
-is <strong>TYPEWRITE</strong> and you use TYPEWRITE's default
-double-spacing, bibliographies are double-spaced.  If your document
-is single-spaced, bibliographies are single-spaced.
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-If, for some reason, you'd prefer that bibliographies be single-spaced
-in an otherwise double-spaced document (including double-spaced
-<a href="rectoverso.html#COLLATE">collated</a>
-documents), invoke <kbd>.SINGLESPACE_BIBLIOGRAPHY</kbd> with with no
-argument.
+By default, mom inserts no space between bibliography entries.
+If you&#8217;d prefer she add some, instruct her to do so with
+BIBLIOGRAPHY_SPACING.  Say, for example, you want a half a linespace
+between entries,
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_SPACING .5v
+</span>
+would do the trick.
 </p>
 
-<!-- -BIBLIO_SPACING- -->
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+As with endnotes pages, inserting space between bibliography entries
+will most likely result in hanging bottom margins.
+</p>
+</div>
 
-<a name="BIBLIO_SPACING"><h5>*<u>Adjusting the space between bibliography entries</u></h5></a>
+<!-- -SINGLESPACE_BIBLIO- -->
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_SPACING</strong> <kbd>&lt;amount of space&gt; </kbd></nobr>
-<br/>
+<h5 id="singlespace-biblio" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Singlespace bibliography (TYPEWRITE only)</h5>
 
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
+<div class="box-macro-args">
+Macro: <b>SINGLESPACE_BIBLIOGRAPHY</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
-By default, <strong>mom</strong> inserts 1 linespaces between
-bibliography entries on bibliography pages.  If you'd prefer she
-add a different amount of space, instruct her to do so with the
-macro, <strong>BIBLIOGRAPHY_SPACING</strong>.  Say, for example,
-you'd prefer only 1/2 linespace.  That would be done with
-
-<pre>
-    .BIBLIOGRAPHY_SPACING .5v
-</pre>
+If your 
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+is <kbd>TYPEWRITE</kbd> and you use TYPEWRITE&#8217;s default
+double-spacing, bibliographies are double-spaced.  If your document
+is single-spaced, bibliographies are single-spaced.
 </p>
 
 <p>
-As with endnotes pages, owing to the space inserted between
-bibliography entries, bibliography pages may have hanging
-bottom margins.  Unlike endnotes pages, <strong>mom</strong>
-is sad to report that there's nothing you can do about
-this, except a) pray things work out, or b) set your
-<strong>BIBLIOGRAPHY_SPACING</strong> to zero.
+If, for some reason, you&#8217;d prefer that bibliographies be
+single-spaced in an otherwise double-spaced document (including
+double-spaced
+<a href="rectoverso.html#collate">collated</a>
+documents), invoke <kbd>.SINGLESPACE_BIBLIOGRAPHY</kbd> with with no
+argument.
 </p>
 
 <!-- -BIBLIO_NO_COLUMNS- -->
 
-<a name="BIBLIO_NO_COLUMNS"><h5>*<u>Turning off column mode during bibliography output</u></h5></a>
+<h5 id="biblio-no-columns" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Turning off column mode during bibliography output</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_NO_COLUMNS</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_NO_COLUMNS</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
-By default, if your document is
-<a href="docprocessing.html#COLUMNS">set in columns</a>,
-<strong>mom</strong> sets the bibliographies in columns,
-too.  However, if your document is set in columns and
-you'd like the bibliographies not to be, just invoke
-<kbd>.BIBLIOGRAPHY_NO_COLUMNS</kbd> with no argument.  The
-bibliography pages will be set to the full page measure of your
-document.
+By default, if your document is set in
+<a href="docprocessing.html#columns">columns</a>,
+mom sets the bibliographies in columns, too.  However, if your
+document is set in columns and you&#8217;d like the bibliographies
+not to be, just invoke <kbd>.BIBLIOGRAPHY_NO_COLUMNS</kbd> with
+no argument.  The bibliography pages will be set to the full page
+measure of your document.
 </p>
 
 <p>
 If you output bibliographies at the end of each document in a
-<a href="rectoverso.html#COLLATE">collated</a>
-document set in columns, column mode will automatically
-be reinstated for each document, even with
-<strong>BIBLIOGRAPHY_NO_COLUMNS</strong> turned on.
+<a href="rectoverso.html#collate">collated</a>
+document set in columns, column mode will automatically be
+reinstated for each document, even with BIBLIOGRAPHY_NO_COLUMNS
+turned on.  In such circumstances, you must re-enable
+ENDNOTES_NO_COLUMNS for each separate collated document.
 </p>
 
+<h4 id="biblio-pagination" class="docs" style="margin-bottom: .5em;">2. Pagination of bibliographies</h4>
+
 <!-- -BIBLIO_PAGENUM_STYLE- -->
 
-<a name="BIBLIO_PAGENUM_STYLE"><h5>*<u>Bibliography-page page numbering style</u></h5></a>
+<h5 id="biblio-pagenum-style" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Page numbering style</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_PAGENUM_STYLE</strong> <kbd>DIGIT | ROMAN | roman | ALPHA | alpha</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_PAGENUM_STYLE</b> <kbd class="macro-args">DIGIT | ROMAN | roman | ALPHA | alpha</kbd>
+</div>
 
 <p>
 Use this macro to set the page numbering style of bibliography
 pages.  The arguments are identical to those for
-<a href="headfootpage.html#PAGENUM_STYLE">PAGENUM_STYLE</a>.
+<a href="headfootpage.html#pagenum-style">PAGENUM_STYLE</a>.
 The default is <kbd>digit</kbd>.  You may want to change it to, say,
 <kbd>alpha</kbd>, which you would do with
-
-<pre>
-    .BIBLIOGRAPHY_PAGENUM_STYLE alpha
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_PAGENUM_STYLE alpha
+</span>
 </p>
 
 <!-- -BIBLIO_FIRST_PAGENUMBER- -->
 
-<a name="BIBLIO_FIRST_PAGENUMBER"><h5>*<u>Setting the first page number of bibliography pages</u></h5></a>
+<h5 id="biblio-first-pagenumber" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Setting the first page number of bibliographies</h5>
 
-<p>
-<nobr>Macro: <strong>BIBILOGRAPHY_FIRST_PAGENUMBER</strong> <kbd>&lt;page # that appears on page 1 of bibliographies&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBILOGRAPHY_FIRST_PAGENUMBER</b> <kbd class="macro-args">&lt;page # that appears on page 1 of bibliographies&gt;</kbd>
+</div>
 
 <p>
-Use this macro with caution.  If all bibliographies for several
-<a href="rectoverso.html#COLLATE">collated</a>
-documents are to be output at once, i.e. not at the end of each
-separate doc, <strong>BIBLIOGRAPHY_FIRST_PAGENUMBER</strong> tells
-<strong>mom</strong> what page number to put on the first page of
-the bibliography.
+Use this macro with caution.  If the bibliography for a
+<a href="rectoverso.html#collate">collated</a>
+document is to be output at the document&#8217;s end,
+BIBLIOGRAPHY_FIRST_PAGENUMBER tells mom what page number to put on
+the first page of the bibliography.
 </p>
 
 <p>
-If you set <strong>BIBLIOGRAPHY_FIRST_PAGENUMBER</strong> in collated
-documents where the bibliographies are output after each separate doc,
-you have to reset every separate document's first page number after
-<a href="rectoverso.html#COLLATE">COLLATE</a>
+However, if you&#8217;re outputting a bibliography at the end of each
+section (chapter, article, etc) of a collated document,
+you have to reset every section&#8217;s first page number after
+<a href="rectoverso.html#collate">COLLATE</a>
 and before
-<a href="docprocessing.html#START">START</a>.
+<a href="docprocessing.html#start">START</a>.
 </p>
 
 <!-- -BIBLIO_NO_FIRST_PAGENUN- -->
 
-<a name="BIBLIO_NO_FIRST_PAGENUM"><h5>*<u>Omitting a page number on the first page of bibliographies</u></h5></a>
+<h5 id="biblio-no-first-pagenum" class="docs" style="margin-top: -.25em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Omitting a page number on the first page of bibliographies</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_NO_FIRST_PAGENUM</strong> <kbd>&lt;toggle&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_NO_FIRST_PAGENUM</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
 
 <p>
 This macro is for use only if
-<a href="headfootpage.html#FOOTERS">FOOTERS</a>
+<a href="headfootpage.html#footers">FOOTERS</a>
 are on.  It tells
-<a href="#BIBLIOGRAPHY">BIBLIOGRAPHY</a>
+<kbd><a href="#bibliography">BIBLIOGRAPHY</a></kbd>
 not to print a page number on the first bibliography page.
-<strong>Mom</strong>'s default is to print the page number.
+Mom&#8217;s default is to print the page number.
 </p>
 
 <!-- -SUSPEND_PAGINATION- -->
 
-<a name="SUSPEND_PAGINATION"><h5>*<u>Suspending pagination of bibliography pages</u></h5></a>
-
-<p>
-Macro: <strong>SUSPEND_PAGINATION</strong>
-<br/>
+<h5 id="suspend-pagination" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Suspending pagination during bibliography output</h5>
 
-Macro: <strong>RESTORE_PAGINATION</strong>
-</p>
-
-<p>
-<strong>SUSPEND_PAGINATION</strong> doesn't take an argument.
-Invoked immediately prior to
-<a href="#BIBLIOGRAPHY">BIBLIOGRAPHY</a>,
-it turns off pagination for the duration of the bibliography.
-<strong>Mom</strong> continues, however to increment page numbers
-silently.
+<div class="box-macro-args" style="margin-bottom: 1em;">
+Macro: <b>SUSPEND_PAGINATION</b>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>RESTORE_PAGINATION</b>
+</div>
+
+<p>
+SUSPEND_PAGINATION doesn&#8217;t take an argument.  Invoked
+immediately prior to
+<kbd><a href="#bibliography">BIBLIOGRAPHY</a></kbd>,
+it turns off pagination for the duration of the bibliography.  Mom
+continues, however to increment page numbers silently.
 </p>
 
 <p>
 To restore normal document pagination after bibliographies, invoke
-<kbd>.RESTORE_PAGINATION</kbd> (again, with no argument)
-immediately after you've finished with your bibliography.
+<kbd>.RESTORE_PAGINATION</kbd> (again, with no argument) immediately
+after you&#8217;ve finished with your bibliography.
 </p>
 
-<a name="BIBLIO_HEADER_CONTROL"><h4><u>2. Bibliography page header/footer control</u></h4></a>
+<h4 id="biblio-header-control" class="docs" style="margin-bottom: .5em;">3. Header/footer control</h4>
 
-<a name="BIBLIO_MODIFY_HDRFTR"></a>
+<h5 id="biblio-modify-hdrftr" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Modifying what goes in the bibliography header/footer</h5>
 
 <p>
 If you wish to modify what appears in the header/footer that appears
 on bibliography pages, make the changes before you invoke
-<a href="#BIBLIOGRAPHY"><kbd>.BIBLIOGRAPHY</kbd></a>,
+<a href="#bibliography"><kbd>.BIBLIOGRAPHY</kbd></a>,
 not afterwards.
 </p>
 
 <p>
 Except in the case of
-<a href="docprocessing.html#DOCTYPE">DOCTYPE CHAPTER</a>,
-<strong>mom</strong> prints the same header or footer used throughout
-the document on bibliography pages.  Chapters get treated differently
-in that, by default, <strong>mom</strong> does not print the
-header/footer centre string (normally the chapter number or chapter
-title.)  In most cases, this is what you want.  However, should you
-<em>not</em> want <strong>mom</strong> to remove the centre string from
-the bibliography pages headers/footers, invoke
-<a href="#BIBLIOGRAPHY_HDRFTR_CENTER"><kbd>.BIBLIOGRAPHY_HEADER_CENTER</kbd></a>
+<a href="docprocessing.html#doctype">DOCTYPE <kbd>CHAPTER</kbd></a>,
+mom prints the same header or footer used throughout the document
+on bibliography pages.  Chapters get treated differently in that,
+by default, mom does not print the header/footer centre string
+(normally the chapter number or chapter title.)  In most cases, this
+is what you want.  However, should you not want mom to remove the
+centre string from the bibliography pages headers/footers, invoke
+<kbd><a href="#bibliography-hdrftr-center">.BIBLIOGRAPHY_HEADER_CENTER</a></kbd>
 with no argument. 
 </p>
 
 <p>
 An important change you may want to make is to put the word
-&quot;Bibliography&quot; in the header/footer centre position.
-To do so, do
-
-<pre>
-    .HEADER_CENTER "Bibliography"
-               or
-    .FOOTER_CENTER "Bibliography"
-</pre>
+&#8220;Bibliography&#8221; in the header/footer centre position.  To
+do so, invoke
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .HEADER_CENTER "Endnotes"
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .FOOTER_CENTER "Endnotes"
+</span>
+prior to invoking <kbd>.BIBLIOGRAPHY</kbd>.
+</p>
 
-prior to invoking <kbd>.BIBLIOGRAPHY</kbd>.  If your
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If your
+<a href="docprocessing.html#doctype">DOCTYPE</a>
 is <kbd>CHAPTER</kbd>, you must also invoke
-<a href="#BIBLIOGRAPHY_HDRFTR_CENTER"><kbd>.BIBLIOGRAPHY_HEADER_CENTER</kbd></a>
-for the <strong>HEADER_CENTER</strong> to appear.
+<a href="#endnotes-hdrftr-center">BIBLIOGRAPHY_HEADER_CENTER</a>
+for the BIBLIOGRAPHY_HEADER_CENTER to appear.
 </p>
+</div>
 
-<a name="BIBLIO_HDRFTR_CENTER"><h5>*<u>Bibliography page header/footer centre string</u></h5></a>
+<h5 id="biblio-hdrftr-center" class="docs" style="margin-top: 0; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Header/footer centre string when doctype is CHAPTER</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_HEADER_CENTER</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_HEADER_CENTER</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 If your
-<a href="docprocessing.html#DOCTYPE">DOCTYPE</a>
-is <kbd>CHAPTER</kbd> and you want <strong>mom</strong> to include
-a centre string in the headers/footers that appear on bibliography
+<a href="docprocessing.html#doctype">DOCTYPE</a>
+is <kbd>CHAPTER</kbd> and you want mom to include a centre
+string in the headers/footers that appear on bibliography
 pages, invoke <kbd>.BIBLIOGRAPHY_HEADER_CENTER</kbd> (or
 <kbd>.BIBLIOGRAPHY_FOOTER_CENTER</kbd>) with no argument.
-<strong>Mom</strong>'s default is NOT to print the centre string.
+Mom&#8217;s default is NOT to print the centre string.
 </p>
 
 <p>
 If, for some reason, having enabled the header/footer centre string
 on bibliography pages, you wish to disable it, invoke the same macro
-with any argument (<strong>OFF, QUIT, Q, X</strong>...).
-</p>
-
-<a name="BIBLIO_ALLOWS_HEADERS"><h5>*<u>Allow headers on bibliography pages</u></h5></a>
-
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_ALLOWS_HEADERS</strong> <kbd>&lt;none&gt; | ALL</kbd></nobr>
+with any argument (<kbd>OFF, QUIT, Q, X</kbd>...).
 </p>
 
-<p>
-By default, if <strong>HEADERS</strong> are on, <strong>mom</strong>
-prints page headers on all bibliography pages except the first.  If you
-don't want her to print headers on bibliography pages, do
+<h5 id="biblio-allows-headers" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Allow headers on bibliography pages</h5>
 
-<pre>
-    .BIBLIOGRAPHY_ALLOWS_HEADERS OFF
-</pre>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_ALLOWS_HEADERS</b> <kbd class="macro-args">&lt;none&gt; | ALL</kbd>
+</div>
 
 <p>
-If you want headers on every page <em>including the first</em>, do
-
-<pre>
-    .BIBLIOGRAPHY_ALLOWS_HEADERS ALL
-</pre>
+By default, if HEADERS are on, mom prints page headers on all
+bibliography pages except the first.  If you don&#8217;t want her to
+print headers on bibliography pages, do
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_ALLOWS_HEADERS OFF
+</span>
+If you want headers on every page including the first, do
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_ALLOWS_HEADERS ALL
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> If <strong>FOOTERS</strong> are on,
-<strong>mom</strong> prints footers on every bibliography page.  This is
-a style convention.  In <strong>mom</strong>, there is no such beast
-as <strong>BIBLIOGRAPHY_ALLOWS_FOOTERS OFF</strong>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If FOOTERS are on, mom prints footers on every bibliography page.
+This is a style convention.  In mom, there is no such beast as
+BIBLIOGRAPHY_ALLOWS_FOOTERS OFF.
 </p>
+</div>
 
-<a name="BIBLIO_MAIN_TITLE"><h4><u>3. Bibliography page first page head (title) control</u></h4></a>
+<h4 id="biblio-main-title" class="docs">4. Bibliography first-page title control</h4>
 
 <!-- -BIBLIO_STRING- -->
 
-<a name="BIBLIO_STRING"><h5>*<u>Bibliography pages first page head (title) string</u></h5></a>
+<h5 id="biblio-string" class="docs" style="margin-top: 1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string</h5>
+
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_STRING</b> <kbd class="macro-args">&quot;&lt;title to print at the top of bibliography pages&gt;&quot;</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_STRING</strong> <kbd>&quot;&lt;head to print at the top of bibliography pages&gt;&quot;</kbd></nobr>
+By default, mom prints the word &#8220;BIBLIOGRAPHY&#8221; as a title
+at the top of the first page of a bibliography.  If you want her to
+print something else, invoke <kbd>.BIBLIOGRAPHY_STRING</kbd> with
+the title you want, surrounded by double-quotes.
 </p>
 
 <p>
-By default, <strong>mom</strong> prints the word
-&quot;BIBLIOGRAPHY&quot; as a head at the top of the first page
-of a bibliography.  If you want her to print something else,
-invoke <kbd>.BIBLIOGRAPHY_STRING</kbd> with the bibliography
-page head you want, surrounded by double-quotes.  If you don't
-want a head at the top of the first bibliography page, invoke
-<kbd>.BIBLIOGRAPHY_STRING</kbd> with a blank argument (either two
-double-quotes side by side &mdash; <kbd>&quot;&quot;</kbd> &mdash;
-or no argument at all).
+If you don&#8217;t want a title at the top of the first bibliography
+page, invoke <kbd>.BIBLIOGRAPHY_STRING</kbd> with a blank argument
+(either two double-quotes side by
+side&mdash;<kbd>&quot;&quot;</kbd>&mdash;or no argument at all).
 </p>
 
 <!-- -BIBLIO_STRING_CONTROL- -->
 
-<a name="BIBLIO_STRING_CONTROL"><h5>*<u>Bibliography page first page head (title) control</u></h5></a>
+<h5 id="biblio-string-control" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string control macros and defaults</h5>
 
-<p>
+<div class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
 See
-<a href="#CONTROL_MACRO_ARGS">Arguments to the control macros</a>.
+<a href="#control-macro-args">Arguments to the control macros</a>.
 </p>
-
-<pre>
-.BIBLIOGRAPHY_STRING_FAMILY    default = prevailing document family; default is Times Roman
-.BIBLIOGRAPHY_STRING_FONT      default = bold
-.BIBLIOGRAPHY_STRING_SIZE*     default = +1
-.BIBLIOGRAPHY_STRING_QUAD      default = centred
+<span class="pre defaults">
+.BIBLIOGRAPHY_STRING_FAMILY  default = prevailing document family; default is Times Roman
+.BIBLIOGRAPHY_STRING_FONT    default = bold
+.BIBLIOGRAPHY_STRING_SIZE*   default = +1
+.BIBLIOGRAPHY_STRING_QUAD    default = centred
 
 *Relative to the size of the bibliography text (set with BIBLIOGRAPHY_PT_SIZE)
-</pre>
+</span>
+</div>
 
-<!-- -BIBLIO_STRING_UNDERLINE- -->
+<!-- -BIBLIOGRAPHY_STRING_ADVANCE- -->
+
+<h5 id="biblio-string-placement" class="docs" style="margin-top: -1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string placement</h5>
 
-<a name="BIBLIO_STRING_UNDERLINE"><h5>*<u>Bibliography-page head (title) underlining</u></h5></a>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_STRING_ADVANCE</b> <kbd class="macro-args">&lt;distance from top of page&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Argument requires a <a href="definitions.html#unitofmeasure">unit of measusure</a>
+</p>
 
 <p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_STRING_UNDERLINE</strong> <kbd>[DOUBLE] [&lt;underline weight&gt; [&lt;underline gap&gt; [&lt;distance between double rules]]] | &lt;none&gt; | &lt;anything&gt;</kbd></nobr>
-<br/>
+By default, mom places the title (the docheader, as it were) of
+bibliographies (typically "BIBLIOGRAPHY") on the same
+<a href="definitions.html#baseline">baseline</a>
+that is used for the start of
+<a href="definitions.html#running">running text</a>.
+If you&#8217;d prefer another location, higher or lower on the page
+(thereby also raising or lowering the starting position of the
+bibliography itself), invoke <kbd>.BIBLIOGRAPHY_STRING_ADVANCE</kbd>
+with an argument stating the distance from the top edge of the page
+at which you&#8217;d like the title placed.
+</p>
 
-Alias: <strong>BIBLIOGRAPHY_STRING_UNDERSCORE</strong>
+<p>
+The argument requires a unit of measure, so if you&#8217;d like the title
+to appear 1-1/2 inches from the top edge of the page, you&#8217;d tell
+mom about it like this:
 <br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_STRING_ADVANCE 1.5i
+</span>
+</p>
+
+<!-- -BIBLIO_STRING_UNDERLINE- -->
 
-<em>*The argument</em> <kbd>&lt;underline weight&gt;</kbd> <em>must</em> NOT <em>have the</em> <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>, <kbd>p</kbd>, <em>appended to it</em>
+<h5 id="biblio-string-underline" class="docs" style="margin-top: -1em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string underscoring</h5>
+
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_STRING_UNDERSCORE</b> <kbd class="macro-args">[DOUBLE] [&lt;underline weight&gt; [&lt;underline gap&gt; [&lt;distance between double rules]]] | &lt;none&gt; | &lt;anything&gt;</kbd>
+</div>
+
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>BIBLIOGRAPHY_STRING_UNDERLINE</b>
+</p>
+
+<p class="requires">
+&bull;&nbsp;The argument
+<span style="font-style: normal"><kbd>&lt;underscore weight&gt;</kbd></span>
+must not have the
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+<span style="font-style: normal;"><kbd>p</kbd></span>, appended to it
 </p>
 
 <p>
-Invoked without an argument, <kbd>.BIBLIOGRAPHY_STRING_UNDERLINE</kbd>
-will place a single rule underneath the bibliography-page head.  Invoked
-with the argument <kbd>DOUBLE</kbd>,
-<strong>BIBLIOGRAPHY_STRING_UNDERLINE</strong> will double-underline
-the head.  Invoked with any other non-numeric argument, (e.g.
-<strong>OFF</strong>, <strong>NO</strong>, <strong>X</strong>, etc.)
-the macro disables underlining of the head.
+Invoked without an argument,
+<kbd>.BIBLIOGRAPHY_STRING_UNDERSCORE</kbd> will place a single rule
+underneath the bibliography&#8217;s first-page title.  Invoked with the
+argument, <kbd>DOUBLE</kbd>, BIBLIOGRAPHY_STRING_UNDERSCORE will
+double-underscore the thtile.  Invoked with any other non-numeric
+argument, (e.g. <kbd>OFF, NO, X</kbd>, etc.) the macro disables
+underlining of the title.
 </p>
 
 <p>
-In addition, you can use <strong>BIBLIOGRAPHY_STRING_UNDERLINE</strong>
-to control the weight of the underline rule(s), the gap between the
-head and the underline, and, in the case of double-underlines, the
-distance between the two rules.
+In addition, you can use BIBLIOGRAPHY_STRING_UNDERSCORE to control
+the weight of the underscore rule(s), the gap between the title and
+the underscore, and, in the case of double-underscores, the distance
+between the two rules.
 </p>
 
 <p>
 Some examples:
-
-<pre>
-    .BIBLIOGRAPHY_STRING_UNDERLINE 1
-        - turn underlining on; set the rule weight to 1 point
-
-    .BIBLIOGRAPHY_STRING_UNDERLINE 1 3p
-        - turn underlining on; set the rule weight to 1 point; set
-          the gap between the string and the underline to 3 points
-    
-    .BIBLIOGRAPHY_STRING_UNDERLINE DOUBLE .75 3p
-        - turn double-underlining on; set the rule weight to 3/4 of
-          a point; set the gap between the string and the upper
-          underline to 3 points; leave the gap between the upper
-          and the lower underline at the default
-    
-    .BIBLIOGRAPHY_STRING_UNDERLINE DOUBLE 1.5 1.5p 1.5p
-        - turn double-underlining on; set the rule weight to 1-1/2
-          points; set the gap between the string and the upper
-          underline to 1-1/2 points; set the gap between the upper
-          and the lower underline to 1-1/2 points
-</pre>
-
-Note, from the above, that in all instances, underlining (single or
-double) is enabled whenever <strong>BIBLIOGRAPHY_STRING_UNDERLINE</strong>
-is used in this way.
+<br/>
+<span class="pre-in-pp">
+  .BIBLIOGRAPHY_STRING_UNDERLINE 1
+      - turn underlining on; set the rule weight to 1 point
+
+  .BIBLIOGRAPHY_STRING_UNDERLINE 1 3p
+      - turn underlining on; set the rule weight to 1 point; set
+        the gap between the string and the underline to 3 points
+  
+  .BIBLIOGRAPHY_STRING_UNDERLINE DOUBLE .75 3p
+      - turn double-underlining on; set the rule weight to 3/4 of
+        a point; set the gap between the string and the upper
+        underline to 3 points; leave the gap between the upper
+        and the lower underline at the default
+  
+  .BIBLIOGRAPHY_STRING_UNDERLINE DOUBLE 1.5 1.5p 1.5p
+      - turn double-underlining on; set the rule weight to 1-1/2
+        points; set the gap between the string and the upper
+        underline to 1-1/2 points; set the gap between the upper
+        and the lower underline to 1-1/2 points
+</span>
+Note, from the above, that in all instances, underscoring (single or
+double) is enabled whenever BIBLIOGRAPHY_STRING_UNDERSCORE is used
+in this way.
 </p>
 
 <p>
-<strong>Mom</strong>'s default is to double-underline the head
-with 1/2-point rules placed 2 points apart and 2 points below the
-baseline of the head.
+Mom&#8217;s default is to double-underscore the title with 1/2-point
+rules placed 2 points apart and 2 points below the baseline of the
+title.
 </p>
 
 <!-- -BIBLIO_STRING_CAPS- -->
 
-<a name="BIBLIO_STRING_CAPS"><h5>*<u>Bibliography-page head (title) automatic capitalization</u></h5></a>
+<h5 id="biblio-string-caps" class="docs" style="margin-top: -.5em; margin-bottom: .5em; margin-left: .5em;">&bull;&nbsp;Title string capitalization</h5>
 
-<p>
-<nobr>Macro: <strong>BIBLIOGRAPHY_STRING_CAPS</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>BIBLIOGRAPHY_STRING_CAPS</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 Invoked by itself, <kbd>.BIBLIOGRAPHY_STRING_CAPS</kbd> will
-automatically capitalize the bibliography page head.  Invoked with
-any other argument, the macro disables automatic capitalization of
-the head.
+automatically capitalize the bibliography first-page title.  Invoked
+with any other argument, the macro disables automatic capitalization
+of the title.
 </p>
 
 <p>
-If you're generating a table of contents, you may want the
-bibliography page head string in caps, but the toc entry in caps/lower
-case.  If the argument to
-<a href="#BIBLIOGRAPHY_STRING">BIBLIOGRAPHY_STRING</a>
-is in caps/lower case and <strong>BIBLIOGRAPHY_STRING_CAPS</strong> is
+If you&#8217;re generating a table of contents, you may want the
+bibliography first-page title to be in caps, but the toc entry in
+caps/lower case.  If the argument to
+<kbd><a href="#bibliography-string">BIBLIOGRAPHY_STRING</a></kbd>
+is in caps/lower case and BIBLIOGRAPHY_STRING_CAPS is
 on, this is exactly what will happen.
 </p>
 
 <p>
-<strong>Mom</strong>'s default is to capitalize the bibliography-page
-head string.
+Mom&#8217;s default is to capitalize the bibliography first-page
+title.
 </p>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="letters.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="cover.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="letters.html">Next: Writing letters</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/reserved.html groff-1.21/contrib/mom/momdoc/reserved.html
--- groff-1.20.1/contrib/mom/momdoc/reserved.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/reserved.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,2683 +1,2664 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-This file is part of groff, the GNU roff type-setting system.
+  This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
-Written by Peter Schaffter.
+  Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+  Written by Peter Schaffter.
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being this comment section, with no Front-Cover
-Texts, and with no Back-Cover Texts.
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.3 or
+  any later version published by the Free Software Foundation; with the
+  Invariant Sections being this comment section, with no Front-Cover
+  Texts, and with no Back-Cover Texts.
 
-A copy of the Free Documentation License is included as a file called
-FDL in the main directory of the groff source package.
+  A copy of the Free Documentation License is included as a file called
+  FDL in the main directory of the groff source package.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- List of reserved words</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Reserved words (macros, strings, registers)</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
 
-<!--====================================================================-->
+<body style="background-color: #f5faff;">
 
-<a name="TOP"></a>
+<!-- ==================================================================== -->
 
-<p>
-<a href="appendices.html#TOP">Prev</a>&nbsp;&nbsp; <a href="toc.html">Back to Table of Contents</a>
-</p>
+<div id="top" class="page" style="width: 800px;">
 
-<a name="RESERVED"><h1 align="center"><u>LIST OF RESERVED WORDS</u></h1></a>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+</tr>
+</table>
+
+<h1 id="reserved-words" class="docs">List of reserved words (macros, strings, registers)</h1>
 
 <p>
-The following is a list of &quot;reserved&quot; words used by
-<strong>mom</strong>.  Before changing the name of any macro or
-document element tag with
+The following is a list of reserved words used by mom.  Before
+changing the name of any macro or document element tag with
 <a href="goodies.html#ALIAS">ALIAS</a>,
 I strongly recommend doing a search of this page for your proposed
-new name.  If you find it in the left hand column, DON'T USE IT.
-Choose something else instead.
+new name.  If you find it in the left hand column, choose something
+else instead.
 </p>
 
 <p>
-Anyone interested in playing around inside <strong>mom</strong>'s macro
-file (om.tmac) will find this list useful as well since it lists all
-(I hope) the macros, strings, diversions and number registers
-<strong>mom</strong> uses, along with brief descriptions of their
-functions.
+Anyone interested in playing around inside mom&#8217;s macro file
+(om.tmac) will find this list useful as well since it lists all (I
+hope) the macros, strings, diversions, aliases and number registers
+mom uses, along with brief descriptions of their functions.
 </p>
 
-<pre>
-TYPESETTING
-===========
-
-+++MACROS+++
-
-Page layout
------------
-PAGELENGTH  Page width
-PAGE        Page width/length; left, right, top, bottom margins
-PAGEWIDTH   Page width
-PAPER       Letter, legal, or A4
-
-B_MARGIN  Space to leave at page bottom
-L_MARGIN  Page offset
-R_MARGIN  Line length as a function of
-          pagewidth minus pageoffset minus rightmargin
-T_MARGIN  Advance lead from page top
-
-Page control
-------------
-DO_B_MARGIN  Margin at bottom of page; trap-invoked
-DO_T_MARGIN  Margin at top of page; trap-invoked
-
-Style
------
-COLOR          Change color of text to predefined value
-CONDENSE       Set percentage of pseudo-condense (alias of
-               CONDENSE_OR_EXTEND)
-EXTEND         Set percentage of pseudo-extend (alias of
-               CONDENSE_OR_EXTEND)
-FAMILY         Family
-FT             Font
-FALLBACK_FONT  Font to use whenever FAMILY or FT errors occur
-LL             Line length
-LS             Leading (.vs)
-NEWCOLOR       Define a text color
-PT_SIZE        Point size
-SETBOLDER      Set degree of emboldening (pseudo-bold) in units
-SETSLANT       Set degree of pseudo-italic
-XCOLOR         Initialize a color from rgb.txt
-
-Autolead
---------
-AUTOLEAD  Always lead n points more than .PT_SIZE
-
-Flush
------
-JUSTIFY  Justified text
-QUAD     Filled text, left, right, or centre
-
-Quad
-----
-CENTER  Non-filled text, centre
-LEFT    Non-filled text, left
-RIGHT   Non-filled text, right
-
-Hyphenation
------------
-HY      Turn hyphenation on/off, or set LINES, MARGIN, SPACE
-HY_SET  Set LINES, MARGIN, SPACE in a single command
-
-Advanced style
---------------
-KERN       Turn automatic kerning on or off
-LIGATURES  Turn ligatures on or off
-SS         Sentence space control
-WS         Word space control
-
-Line breaks
------------
-BR      Alias of br
-EL      Breaks line but doesn't advance
-SPACE   Alias of sp
-SPREAD  Alias of brp
-
-Ald/rld
--------
-ALD  Advance lead
-RLD  Reverse lead
-
-Indents
--------
-HI   Indent hang
-IB   Indent both
-IBX  Indent both off
-IL   Indent left
-ILX  Indent left off
-IQ   Indents off
-IR   Indent right
-IRX  Indent right off
-IX   Indents off -- deprecated
-TI   Indent temporary
-
-Tabs
-----
-ST       String tab
-TAB_SET  Tab Set
-TN       Tab Next
-TQ       Tab Quit
-
-MCO      Turn on multi-column mode
-MCR      Return to top of column
-MCX      Turn off multi-column mode
-
-Underscore
-----------
-UNDERSCORE   Underscores words or phrases
-UNDERSCORE2  Double underscores words or phrases
-
-Underline
----------
-UNDERLINE  Underlines whole passages (Courier only)
-
-Smart Quotes
-------------
-SMARTQUOTES  Turns smart quotes on or off
-
-Graphical objects
------------------
-RULE_WEIGHT      Weight of rules drawn with \*[RULE]
-DBX              Draw box
-DCL              Draw circle (ellipse)
-DRH              Draw horizontal rule
-DRV              Draw vertical rule
-
-Misc + Support
---------------
-BR_AT_LINE_KERN  Deposit a break before RW and WE
-CAPS             Convert u/lc to UC
-COMMENT          Don't print lines till COMMENT OFF (alias of SILENT)
-DROPCAP_ADJUST   Points (poss. fractional) to add/subtract
-                 from drop caps
-DROPCAP          Create drop cap
-DROPCAP_FAMILY   Drop cap family
-DROPCAP_FONT     Drop cap font
-DROPCAP_GUTTER   Drop cap gutter
-DROPCAP_OFF      Support only; restores .in if there was one
-ESC_CHAR         Alias for .ec
-EW               Extra white -- loosen overall line kern
-                 (character spacing)
-LEADER_CHARACTER Sets leader character
-PAD              Insert padding spaces at marked places
-PADMARKER        Sets character to use instead of # in PAD
-PRINT            Simply prints args passed to it; keeps my code
-                 indented nicely
-RW               Reduce white -- tighten overall line kern
-                 (character spacing)
-SILENT           Don't print lines till SILENT OFF
-SIZESPECS        Get cap-height, x-height and descender depth for
-                 current point size
-TRAP             Turn traps off or on
-
-+++DIVERSIONS+++
-
-NO_FLASH    Diverts output of SILENT or COMMENT so they don't print
-NULL        Diverts SIZESPECS in PRINT_HDRFTR so it doesn't screw up
-            FOOTER and FOOTNOTE processing when FOOTERS are on
-PAD_STRING  Diverts $PAD_STRING for processing
-TYPESIZE    Diverts SIZESPECS routine so it doesn't print
-
-+++NUMBER REGISTERS+++
-
-#ABORT_FT_ERRORS        Abort on FT errors? (boolean)
-#ALD                    ALD value
-#ARGS_TO_LIST           Tells LIST whether LIST was invoked with a valid
-                        arg; controls LIST OFF processing
-#ARGS_TO_SQ             Tells SMARTQUOTES whether it was invoked with a
-                        valid arg; controls SMARTQUOTES OFF
-                        processing
-#AUTOLEAD_FACTOR        Using FACTOR arg to AUTOLEAD? (boolean)
-#AUTO_LEAD              Using autolead? (boolean)
-#AUTOLEAD_VALUE         Auto leading value
-#BL_INDENT              Value of left indent when IB
-#B_MARGIN               Bottom margin
-#B_MARGIN_SET           Has a bottom margin been set with B_MARGIN? (boolean)
-#BOLDER_UNITS           Number of units to embolden type
-#BR_AT_LINE_KERN        Break when EW/RW are invoked? (boolean)
-#BR_INDENT              Value of right indent when IB
-#BX_SOLID               Draw box filled? (boolean)
-c                       column mark
-#CAPS_ON                Is CAPS enabled? (boolean)
-#CL_SOLID               Draw cirlce filled? (boolean)
-#CODE_FAM               Use different family from Courier for CODE? (boolean)
-#CONDENSE               Are we in pseudo-condense mode? (boolean)
-#CONDENSE_WAS_ON        For restoring \*[COND] in DROPCAP
-#COND_WIDTH             Width of pseudo-condensed type
-                        (pointsize x $COND_PERCENT)
-#CURRENT_HY             \\n[.hy] when ref*normal-print called
-#CURRENT_L_LENGTH       Current line length at first invocation of LIST;
-                        like #ORIG_L_LENGTH
-#CURRENT_TAB            Current tab number
-#DC_COLOR               Colorize dropcap? (boolean)
-#DC_GUT                 Width of dropcap gutter
-#DC_HEIGHT              Dropcap height
-#DC_LINES               Number of lines for dropcap
-#DEGREES                # of degrees slant for pseudo-italic
-#ENUMERATOR&lt;n&gt;          Number register enumerator for depth &lt;n&gt; in lists 
-#EXT_WIDTH              Width of pseudo-extended type
-                        (pointsize x $EXT_PERCENT)
-#EXTEND                 Are we in pseudo-extend mode? (boolean)
-#EXTEND_WAS_ON          For restoring \*[EXT] in DROPCAP
-#FILL_MODE              Which fill mode are we in? (\n(.j)
-#FILLED                 Are we in a fill mode? (boolean)
-#H_INDENT               Value of left indent when IH
-#HL_INDENT&lt;n&gt;           Hanging indent for LIST depth &lt;n&gt;
-#HL_INDENT              Value of the hang when IH
-#HY_SET                 Did we manually set hyphenation parameters?
-                        (boolean)
-#HYPHEN_ADJ             Amount by which to raise hyphens surrounding page numbers
-#HYPHENATE              Hyphenation on? (boolean)
-#IN_TAB                 Are we in a tab? (boolean)
-                        Set in macro TAB; used in ST to determine
-                        whether to add #ST_OFFSET to #ST&lt;n&gt;_OFFSET
-#INDENT_ACTIVE          Indicates whether an indent is active (boolean)
-#INDENT_BOTH_ACTIVE     Toggle
-#INDENT_LEFT_ACTIVE     Toggle
-#INDENT_RIGHT_ACTIVE    Toggle
-#INDENT_STYLE_BOTH      Indicates IB when #INDENT_ACTIVE=1 (boolean)
-#INDENT_STYLE_HANG      Indicates IH when #INDENT_ACTIVE=1 (boolean)
-#INDENT_STYLE_LEFT      Indicates IL when #INDENT_ACTIVE=1 (boolean)
-#INDENT_STYLE_RIGHT     Indicates IR when #INDENT_ACTIVE=1 (boolean)
-#INDENT_STYLE_TEMP      Indicates IT when #INDENT_ACTIVE=1 (boolean)
-#IGNORE_COLUMNS         Don't set document in columns (boolean)
-#IN_DIVER               Are we in a diversion? (boolean)
-#IX_WARN                Toggles to 1 the first time IX is user-invoked
-#JUSTIFY                In EW/RW, when BR_AT_LINE_KERN, whether to
-                        break or break-spread preceding line (boolean)
-#KERN                   Kern on? (boolean)
-#KERN_UNIT              Size of kern units (1/36 of current point size)
-#KERN_WAS_ON            Indicates kerning was on; used in list ITEMs (boolean)
-#LAST_TAB               Last tab number set in multi-columns
-#LAST_FN_COUNT_FOR_COLS #FN_COUNT_FOR_COLS at top of HEADER
-#LEAD                   Leading (alias)
-#LIGATURES              Ligatures on? (boolean)
-#LIST_INDENT&lt;n&gt;         Left indent of list &lt;n&gt;
-#L_INDENT               Value of left indent
-#L_LENGTH               Line length
-#L_MARGIN               Page offset if set with LMARGIN;
-                        if .po used, \n(.o returns page offset
-#LOOP                   In EPIGRAPH, #LOOP=1 if a while loop executes; otherwise 0.
-                        Elsewhere, an arbitrary incrementing register used to
-                        read in strings
-#MCX_ALD                Amount to advance past end of longest column
-#NEWPAGE                Was NEWPAGE just invoked? (boolean)
-#NEXT_DEPTH_BACK        Next list level back in lists
-#NEXT_TAB               Current tab number + 1 (used in TN)
-#NEXT_TAB               Next tab in an n+1 sequence
-#NOFILL                 Are we in a nofill mode? (boolean)
-#NOFILL_MODE            Nofill mode
-#OLD_LEAD               Lead in effect prior to changing it with .vs
-                        in .LS
-#OPEN_CLOSE             Manipulates character " to print `` or ''
-#ORIGINAL_L_LENGTH      Used in LIST for IB processing; holds \n(.l
-p                       Output line horiz position at end of
-                        $PAD_STRING
-#PAD_COUNT              Number of times # was included in arg to PAD
-#PAD_LIST_DIGITS        Pad list digits to the left? (boolean)
-#PAD_SPACE              Size of padding space
-#PAGE_LENGTH            Page length (alias)
-#PAGE_WIDTH             Page width
-#PP_ACTIVE              Are we in the context of a para? (boolean)
-#PRINT_FOOTER_ON_PAGE_1 (boolean)
-#PSEUDO_FILL            Signals that LEFT, RIGHT or CENTER is
-                        in effect (booleand off, i.e. to 0, when
-                        QUAD &lt;arg&gt; or JUSTIFY is called)
-#PT_SIZE                Point size (fractional) in units (alias)
-#PT_SIZE_SET            Was point size set with PT_SIZE? (boolean)
-#Q_AT_TOP               Does a quote start at the top of a new page?
-                        (boolean)
-#QUAD                   In autoquad mode? (boolean)
-#QUIT                   Tells LIST whether to exit lists completely
-                        (boolean)
-#REMOVE                 Used in LIST OFF cleanup
-#RESTORE_LEAD           Lead value in effect prior to AUTOLEAD
-#RESTORE_LINE_LENGTH    Restores actual line length in RULE
-#RESTORE_LN_NUMBER      Start linenumbering again with stored
-                        #NEXT_LN? (boolean)
-#RESTORE_PT_SIZE        Stores current point size (in units) prior
-                        to underscore
-#R_INDENT               Value of right indent
-#R_MARGIN               Right margin
-#RESTORE_PREV_INDENT    Tells LIST OFF what kind of indent was active
-                        prior to first invocation of LIST
-#RESTORE_TRAP           Did we have to disable traps? Used in
-                        graphical object macros (boolean)
-#RESTORE_SQ             Instructs SMARTQUOTES to restore smartquotes if
-                        SMARTQUOTES invoked without an arg
-#RLD                    RLD value
-#RULE_WEIGHT            Weight given to RULE_WEIGHT
-#RULE_WEIGHT_ADJ        RULE_WEIGHT/2
-#SHIFT_LIST&lt;n&gt;          Value to add to #LIST_INDENT&lt;n&gt; for shifted lists
-#SILENT                 Is silent on? (boolean)
-#SIZE_FOR_PAD           Used to ensure that the size in effect prior
-                        to PAD is restored at the start of every
-                        iteration of $PAD_STRING
-#SLANT_ON               Is SLANT on? (boolean)
-#SPACE_TO_END           Whitespace at end of string passed to PAD
-#SQ_WAS_ON              Instructs CODE OFF to restore smartquotes if they
-                        were on prior to CODE
-#ST&lt;n&gt;_LENGTH           Length of ST&lt;n&gt;; calculated during ST &lt;n&gt;
-#ST&lt;n&gt;_MARK             Page offset of autotab &lt;n&gt; at ST&lt;n&gt;X
-#ST_NUM                 Incrementing counter for autotab identification
-#ST&lt;n&gt;_OFFSET              Offset (from current tab) to add to #ST&lt;n&gt;_OFFSET
-                        when calculating string indents set from within
-                        tabs
-#ST&lt;n&gt;_OFFSET           Indent of autotab &lt;n&gt; (page offset)
-#STORED_L_INDENT        Current left indent at first invocation of LIST
-#STORED_R_INDENT        Current right indent at first invocation of LIST
-#STORED_BL_INDENT       Current "both, left" indent at first invocation
-                        of LIST
-#STORED_BR_INDENT       Current "both, right" indent at first invocation
-                        of LIST
-#STORED_HL_INDENT       Current hanging indent at first invocation
-                        of LIST
-#STORED_T_INDENT        Current temporary indent at first invocation
-                        of LIST
-#STR_LENGTH             Holds string length derived from .length request
-#T_INDENT               Value of temporary indent
-#T_MARGIN               Top margin
-#TAB_ACTIVE             Are we in a tab? (boolean)
-#TAB_NUMBER             Tab number given to TAB_SET
-#TAB_LENGTH             Tab length given to TAB_SET
-#TAB_OFFSET             Tab indent given to TAB_SET
-#TEXT_WIDTH             Width of string to underscore
-#TN                     Was TN (or \*[T+] called? (boolean)
-#TOP                    Set to 1 in T_MARGIN, DO_T_MARGIN and ALD; tells
-                        the first LS or AUTOLEAD on a page to maintain
-                        the baseline position prior to the LS call
-#TOP_BASELINE_ADJ       Amount by which to adjust the baseline position
-                        of the first line on the page if an LS or AUTOLEAD
-                        request differs from the lead current at the end of
-                        the previous page
-#TOTAL_LISTS            Total number of lists in a nest
-#UNDERSCORE_WEIGHT      Weight of underscores
-#UNDERSCORE_WEIGHT_ADJ  UNDERSCORE_WEIGHT/2
-#USER_SET_L_LENGTH      Did user invoke LL? (boolean)
-#USER_SET_TITLE_ITEM    Did user invoke TOC_TITLE_ENTRY?
-#WEIGHT                 Weight given to #RULE_WEIGHT
-#WEIGHT_ADJ             RULE_WEIGHT/2
-u                       Horiz position of start of underscore
-
-+++STRINGS+++
-
-$ARG                 String holding substrings derived from .substring request
-$COND_PERCENT        Percentage by which to pseudo-condense type
-$COLOR_SCHEME        Color scheme used in NEWCOLOR
-$&lt;colorname&gt;_FILL    XCOLOR &quot;alias&quot; with _FILL attached; used to determine if
-                     the alias exists when the alias is passed to DBX SOLID
-                     or DCL SOLID
-$CURRENT_QUAD        Restores current quad value in RULE
-$CURRENT_TAB         Current tab number
-$DC_ADJUST           +|- # of points to subtract from dropcap
-$DC_FAM              Drop cap family
-$DC_FT               Drop cap font
-$DROPCAP             The dropcap letter
-$ENUMERATOR&lt;n&gt;       String enumerator for depth &lt;n&gt; in lists 
-$ENUMERATOR_TYPE&lt;n&gt;  Type of enumerator used in LIST&lt;n&gt;
-$EXT_PERCENT         Percentage by which to pseudo-extend type
-$FAMILY              Family
-$FAMILY_FOR_PAD      Used to ensure that the family in effect prior
-                     to PAD is restored at the start of every
-                     iteration of $PAD_STRING
-$FONT                Font
-$FONT_FOR_PAD        Used to ensure that the font in effect prior
-                     to PAD is restored at the start of every
-                     iteration of $PAD_STRING
-$PAD_MARKER          Character to mark off padding in PAD
-$PAD_STRING          Arg passed to PAD
-$PRE_CODE_FAM        Family in effect prior to CODE being invoked
-$PRE_CODE_FT         Font in effect prior to CODE being invoked
-$PREFIX&lt;n&gt;     Prefix for enumerator of LIST&lt;n&gt;
-$QUAD_VALUE          Quad value (left, right, centre, justify)
-$QUOTE0              Open quotation marks
-$QUOTE1              Close quotation marks
-$RESTORE_COND        Restores the pseudo-condense value in effect
-                     prior to DROPCAP
-$RESTORE_EXT         Restores the pseudo-extend value in effect
-                     prior to DROPCAP
-$RESTORE_FAM         Used to restore the family in effect
-                     prior to DROPCAP
-$RESTORE_FT          Used to restore the font/fontstyle in effect
-                     prior to DROPCAP
-$RESTORE_PT_SIZE     Used to restore the point size of normal
-                     running text after a dropcap
-$RESTORE_QUAD_VALUE  Quad value for use in restoring L, R, C, J
-                     (after tabs)
-$RESTORE_SQ          The smartquoting string last passed to SMARTQUOTES
-$RULE_GAP            Distance between underscore rules
-$SAVED_STYLE         Current style, if there is one (used in FAMILY)
-$SAVED_UNDERSCORE_GAP Temporarily holds string in $UNDERSCORE_GAP
-$SEPARATOR&lt;n&gt;        Separator for depth &lt;n&gt; in lists
-$SS_VAR              Holds + or - sentence space value
-$ST&lt;n&gt;_FILL          Always QUAD if QUAD passed to ST &lt;n&gt;
-ST\n[#LOOP]          Used to initialize string tab markers (1-19)
-ST\n[#LOOP]X         Used to initialize string tab markers (1-19)
-$ST&lt;n&gt;_QUAD_DIR      Quad direction supplied to ST for &lt;n&gt;
-$TAB_NUMBER          Argument passed to TAB macro to call TAB# macro
-                     created in TAB_SET
-$UNDERSCORE_GAP      Distance between text and underscore rule
-$WS_CONSTANT         12; used to hold groff default wordspace
-$WS                  Holds WS value; concatenation of WS_CONSTANT and
-                     WS_VAR
-$WS_VAR              + or - value to add to $WS_CONSTANT
-BLACK                Pre-defined black color
-black                Pre-defined black color
-WHITE                Pre-defined white color
-white                Pre-defined white color
-
-+++ALIASES+++
-
-ALIAS         als
-ALIASN        aln
-BR            br
-CENTRE        CENTER
-COLOUR        COLOR
-COMMENT       SILENT
-CONDENSE      CONDENSE_OR_EXTEND
-EXTEND        CONDENSE_OR_EXTEND
-FAM           FAMILY
-FT            FONT
-HYPHENATE     HY
-HYPHENATION   HY
-INCLUDE       so
-LIG           LIGATURES
-LL            LINE_LENGTH
-MAC           de
-NEW_PAGE      bp
-NEWCOLOUR     NEWCOLOR
-NEWPAGE       NEW_PAGE
-PAGELENGTH    PAGE_LENGTH
-PAGE_LENGTH   pl
-PAGEWIDTH     PAGE_WIDTH
-SPREAD        brp
-SP            sp
-STRING        ds
-TABSET        TAB_SET
-TB            TAB
-TI            IT
-UNDERSCORE_2  UNDERSCORE2
-XCOLOUR       XCOLOR
-
-+++ALIASES FOR NUMBER REGISTERS+++
-
-#DIVER_DEPTH    dn   -- diversion depth
-#DIVER_WIDTH    dl   -- diversion width
-#INDENT         .i   -- value of current indent
-#LEAD           .v   -- line space (.vs, not .ls)
-#L_LENGTH       .l   -- line length
-#NUM_ARGS       .$   -- number of arguments passed to a macro
-#PAGE_LENGTH    .p   -- page length
-#PT_SIZE        .ps  -- current point size (fractional) in units
-#TRAP_DISTANCE  .t   -- distance to next trap
-
-+++INLINE ESCAPES+++
-
-ALD&lt;n&gt;       Move down inline by &lt;n&gt; (between .25 and 12.75)
-B            Inline equivalent to .EL
-BCK          Inline backward horizontal movement
-BD           Bold font
-BDI          Bold italic font
-BLACK        Color
-black        color
-BOLDER       Pseudo-bold on
-BOLDERX      Pseudo-bold off
-BP           Back points (horizontal movement)
-BP&lt;n&gt;        Back points by  &lt;n&gt; (between .25 and 12.75)
-BU           Back units (inline pairwise kerning)
-BU&lt;n&gt;        Back units by &lt;n&gt; (between 1 and 36)
-COND         Pseudo-condense type
-COND_FOR_SUP Pseudo-condense string for use with superscripts
-             (called with CONDSUP)
-COND_FOR_SUP Pseudo-extend string for use with superscripts (called
-             with EXTSUP)
-CONDSUP      Pseudo-condensed superscript (using value set with
-             CONDENSE)
-CONDSUPX     Pseudo-condensed superscript off
-CONDX        Pseudo-condense off
-DOWN         Inline downward vertical movement
-EN-MARK      Inline escape to indicate the beginning of a
-             range of lines used to identify an endnote
-EXT          Pseudo-extend type
-EXTX         Pseudo-extend off
-EXTSUP       Pseudo-extended superscript
-EXTSUPX      Pseudo-extended superscript off
-FN-MARK      Inline escape to indicate the beginning of a
-             range of lines used to identify a footnote
-FP&lt;n&gt;        Forward points by  &lt;n&gt; (between .25 and 12.75)
-FP           Forward points (horizontal movement)
-FU           Forward units (inline pairwise kerning)
-FU&lt;n&gt;        Forward units by &lt;n&gt; (between 1 and 36)
-FWD          Inline forward horizontal movement
-PREV         Return to previous font in effect
-RLD&lt;n&gt;       Move up, inline, by &lt;n&gt; (between .25 and 12.75)
-ROM          Roman (medium) font
-S            Same \s
-SLANT        Slant (pseudo-italic on
-SLANTX       Slant off
-ST&lt;n&gt;        String tab end marker
-ST&lt;n&gt;        String tab start marker
-SUP          Superscript
-SUPX         Superscript off
-TB+          Move to next tab number (n+1) without advancing on the page
-UP           Inline upward vertical movement
-WHITE        Color
-white        Color
-
-+++SPECIAL CHARACTERS+++
-
-FOOT         The foot character \(fm
-INCH         The inch character \(fm\(fm
-LEADER       Deposit leader to end of current LL or TAB
-RULE         Draw a rule to the full measure of the current line or
-             tab length
-
-------------------------------------------------------------------------
-
-DOCUMENT PROCESSING
-===================
-
-+++MACROS+++
-
-Document info
--------------
-AUTHOR          Author
-CHAPTER         Chapter number
-CHAPTER_TITLE   Chapter title
-COPYRIGHT       Copyright info (covers only)
-DOCTITLE        Overall doc title (for collated docs)
-DRAFT           Draft number
-MISC            Misc info (covers only)
-REVISION        Revision number
-SUBTITLE        Doc subtitle
-TITLE           Doc title
-
-Covers
-------
-COVER               What goes on cover
-COVERS              Whether covers get printed (boolean)
-COVER_ADVANCE       Set vertical start position of cover material
-COVER_LEAD          Overall leading of covers
-COVERTITLE          User-defined cover title string
-DOC_COVER           What goes on doc cover
-DOC_COVERS          Whether doc covers get printed
-DOC_COVER_ADVANCE   Set vertical start position of doc cover material
-DOC_COVER_LEAD      Overall leading of doc covers
-DOC_COVERTITLE      User-defined doc cover title string
-
-Document style
---------------
-COPYSTYLE     Output style (DRAFT or FINAL)
-DEFAULTS      In START, sets defaults
-DOCTYPE       Kind of doc (DEFAULT, CHAPTER, NAMED, LETTER)
-PAGENUMBER    Page number that appears on 1st page of doc
-PAPER         Paper size (LETTER, LEGAL, A4)
-PRINTSTYLE    Print style (TYPEWRITE or TYPESET)
-NUMBER_LINES  Number output lines in the left margin
-
-Document tags and macros
-------------------------
-ADD_SPACE               Special macro to add space to the top of a pages after
-                        page 1; must be preceded by NEWPAGE
-BIBLIOGRAPHY            Begin a bibliography page
-BIBLIOGRAPHY_TYPE       LIST or PLAIN
-BLOCKQUOTE              Block-indented, quoted text
-COL_BREAK               Breaks and spreads line before invocation; moves to
-                        next column on page or 1st col of next page.  An alias
-                        of COL_NEXT.
-COL_NEXT                Moves to next column on page or 1st col of next page
-ENDNOTE                 Endnote
-ENDNOTE_REFS            Send REFs to endnotes
-ENDNOTES                Output endnotes
-EPIGRAPH                Epigraph before 1st para 
-FINIS                   Prints --END--
-FOOTNOTE                Collects footnotes in text for printing at bottom of page
-FOOTNOTE_REFS           Send REFs to footnotes
-HEAD                    Section title (main heads)
-HYPHENATE_REFS          Turn on/off hyphenation of REF references
-ITEM                    Begin a list item
-LINEBREAK               Break between narrative sections
-LIST                    Initialize a list
-MN                      Margin note
-MN_INIT                 Initialize parameters for margin notes
-NUMBER_LINES            Number text lines
-NUMBER_BLOCKQUOTE_LINES Number blockquote lines
-NUMBER_QUOTE_LINES      Number quote lines
-PAD_LIST_DIGITS         Leave space for two-numeral digit enumerators
-                        in a list
-PARAHEAD                Paragraph head
-PP                      Paragraph
-QUOTE                   Poetic or line for line quotes
-REF                     Wrapper around FOOTNOTE or ENDNOTE, depending
-                        on FOOTNOTE_REFS or ENDNOTE_REFS
-REF(                    Begin embedded reference, parens
-REF)                    End embedded reference, parens
-REF[                    Begin embedded reference, square brackets
-REF]                    End embedded reference, square brackets
-REF{                    Begin embedded reference, braces
-REF}                    End embedded reference, braces
-REF_INDENT              Amount of 2nd line indent of references for
-                        footnote, endnote or bibliography refs
-RESET_LIST              Reset digit or alpha list enumerator
-SHIFT_LIST              Move a list over to the right
-START                   Sets doc defaults and prints info collected
-                        with doc info macros
-SUBHEAD                 Subheads
-
-Headers/footers
----------------
-BREAK_QUOTE          Manually break a footnoted quote that crosses
-                     a page/column
-DO_FOOTER            Prints footer (after footnote processing, if any)
-FOOTER_ON_FIRST_PAGE Print footer on first page? (boolean)
-FOOTER               Trap-invoked footer macro
-HEADER               Trap-invoked header macro
-PAGINATE             Turns page numbering on or off (doc default=on)
-PAGINATE_TOC         Turns pagination of toc on or off (default=on)
-RECTO_VERSO          Enables switch HEADER_LEFT and HEADER_RIGHT on
-                     alternate pages
-
-Alter doc "look" and/or change defaults
----------------------------------------
-***General***
-
-ALWAYS_FULLSPACE_QUOTES  Fullspace quotes instead of default
-                         1/2 spacing them.
-ATTRIBUTE_STRING         What to print before author (default is "by")
-CHAPTER_STRING           What to print whenever the word "chapter"
-                         is required
-COLUMNS                  Print in columns
-DOC_FAMILY               Overall doc family
-DOCHEADER                Print doc header?
-DOCHEADER_ADVANCE        Start position of docheader (relative to top
-                         of page)
-DOCHEADER_LEAD           +|- value applied to #DOC_LEAD to in/decrease
-                         leading of doc header
-DOC_LEAD_ADJUST          Adjust #DOC_LEAD to fill page to #B_MARGIN
-DOC_LEAD                 Overall doc leading
-DOC_LEFT_MARGIN          Doc left margin
-DOC_LINE_LENGTH          Doc line length
-DOC_PT_SIZE              Overall doc point size
-DOC_RIGHT_MARGIN         Doc right margin
-DOC_TITLE                Overall doc title that gets printed in
-                         headers/footers (mostly for use with collated
-                         docs where each doc is an article with a
-                         different title
-DRAFT_STRING             What to print whenever the word "draft" is
-                         required
-DRAFT_WITH_PAGENUMBER    Attach draft/revision info to page number
-                         (instead of putting it HEADER centre)
-REVISION_STRING          What to print whenever the word "revision"
-                         is required
-
-***Covers***
-
-COVER_ADVANCE            Vertical place on page to start outputting
-                         cover material
-COVER_LEAD               Lead in/decrease for cover pages
-COVERS_COUNT_PAGES       Whether to include cover pages in pagination scheme
-DOC_COVER_ADVANCE        Vertical place on page to start outputting
-                         doc cover material
-DOC_COVER_LEAD           Lead in/decrease for doc cover pages
-DOC_COVERS_COUNT_PAGES   Whether to include doc cover pages in pagination scheme
-
-***Epigraphs and finis***
-
-EPIGRAPH_AUTOLEAD        Autolead value for epigraphs
-EPIGRAPH_INDENT          Value by which to multiply PP_INDENT for
-                         block epigraphs
-FINIS_STRING             What to print when FINIS is invoked
-FINIS_STRING_CAPS        Whether to capitalize the finis string
-
-***Footnotes***
-
-FOOTNOTE_AUTOLEAD             Autolead to use in footnotes
-FOOTNOTE_LINENUMBER_BRACKETS  Brackets for footnote linenumbers
-FOOTNOTE_LINENUMBER_SEPARATOR Separator for footnote linenumbers
-FOOTNOTE_MARKERS              Turns footnote markers on or off
-FOOTNOTE_MARKER_STYLE         STAR or NUMBER; default=STAR
-FOOTNOTE_RULE_ADJ             # of points to raise footnote rule from its
-                              baseline
-FOOTNOTE_RULE_LENGTH          Length of footnote separator rule
-FOOTNOTE_RULE                 Turns printing of fn separator rule on or off;
-                              default is on
-FOOTNOTE_SPACING              Post footnote item spacing
-FOOTNOTES_RUN_ON              Run footnotes on (line numbering mode only)
-RESET_FOOTNOTE_NUMBER         Reset fn# to 1, or, if arg PAGE, reset
-                              automatically to 1 on every page
-RUNON_WARNING                 Utility macro; warns if FOOTNOTES_RUN_ON
-                              was called when fn marker style is STAR or NUMBER
-
-***Endnotes***
-
-ENDNOTE_LEAD                 Leading for endnotes page
-ENDNOTE_LINENUMBER_BRACKETS  Brackets around line numbers identifying
-                             endnotes and text
-ENDNOTE_LINENUMBER_GAP       Amount of space to leave between line
-ENDNOTE_LINENUMBER_SEPARATOR Separator between line numbers identifying
-                             endnotes and the endnote item text
-                             endnotes and text
-ENDNOTE_MARKER_STYLE         NUMBER or LINE
-ENDNOTE_NUMBERS_ALIGN_RIGHT  Hang endnote numbers and align right
-ENDNOTE_NUMBERS_ALIGN_LEFT   Don't hang endnote numbers and align left
-ENDNOTE_PARA_INDENT          First line indent of paras in multi-para
-                             endnotes
-ENDNOTE_PARA_SPACE           Whether to space paras in multi-para endnotes
-ENDNOTE_PT_SIZE              Base point size for endnotes page
-ENDNOTE_STRING               Endnotes page head
-ENDNOTE_STRING_CAPS          Capitalize the endnotes string
-ENDNOTE_STRING_UNDERLINE     Underscoring of endnotes page head
-ENDNOTE_TITLE                Endnotes identifying title
-ENDNOTE_TITLE_SPACE          Distance from top of page to endnotest title
-ENDNOTE_TITLE_UNDERLINE      Underscoring of endnotes identifying title
-ENDNOTES_ALLOWS_HEADERS      Page headers on endnotes pages? (boolean)
-ENDNOTES_FIRST_PAGENUMBER    Page number to appear on page 1 of endnotes
-                             pages
-ENDNOTES_HDRFTR_CENTER       Print header/footer centre string on endnotes
-                             pages?
-ENDNOTES_HEADER_CENTER       Print header centre string on endnotes pages?
-ENDNOTES_FOOTER_CENTER       Print footer centre string on endnotes pages?
-ENDNOTES_NO_COLUMNS          Turn columnar mode off for endnotes pages
-ENDNOTES_NO_FIRST_PAGENUM    Don't print a pagenumber on page 1 of
-                             endnotes.
-ENDNOTES_PAGENUM_STYLE       Set numbering style for endnotes pages page
-                             numbers
-SINGLESPACE_ENDNOTES         Single space TYPEWRITE endnotes
+<div class="rule-medium"><hr/></div>
 
-***Bibliographies***
+<span class="pre" style="scroll: none;">
+<span style="display: block; text-decoration: underline;">TYPESETTING</span>
+<span style="display: block; margin-top: -1em;">+++MACROS+++</span>
+<span style="display: block; margin-top: -1em; margin-bottom: -1em;">*Page layout</span>
+  PAGELENGTH  Page width
+  PAGE        Page width/length; left, right, top, bottom margins
+  PAGEWIDTH   Page width
+  PAPER       Letter, legal, or A4
+  B_MARGIN    Space to leave at page bottom
+  L_MARGIN    Page offset
+  R_MARGIN    Line length as a function of
+                pagewidth minus pageoffset minus rightmargin
+  T_MARGIN    Advance lead from page top
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Page control</span>
+  DO_B_MARGIN  Margin at bottom of page; trap-invoked
+  DO_T_MARGIN  Margin at top of page; trap-invoked
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Style</span>
+  COLOR          Change color of text to predefined value
+  CONDENSE       Set percentage of pseudo-condense (alias of
+                   CONDENSE_OR_EXTEND)
+  EXTEND         Set percentage of pseudo-extend (alias of
+                   CONDENSE_OR_EXTEND)
+  FAMILY         Family
+  FT             Font
+  FALLBACK_FONT  Font to use whenever FAMILY or FT errors occur
+  LL             Line length
+  LS             Leading (.vs)
+  NEWCOLOR       Define a text color
+  PT_SIZE        Point size
+  SETBOLDER      Set degree of emboldening (pseudo-bold) in units
+  SETSLANT       Set degree of pseudo-italic
+  XCOLOR         Initialize a color from rgb.txt
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Autolead</span>
+  AUTOLEAD  Always lead n points more than .PT_SIZE
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Quad, fill, justification</span>
+  JUSTIFY  Justified text
+  QUAD     Filled text, left, right, or centre
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Quad, no-fill</span>
+  CENTER  Line-for-line, non-filled text, centre
+  LEFT    Line-for-line, non-filled text, left
+  RIGHT   Line-for-line, non-filled text, right
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Hyphenation</span>
+  HY      Turn hyphenation on/off, or set LINES, MARGIN, SPACE
+  HY_SET  Set LINES, MARGIN, SPACE in a single command
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Advanced style</span>
+  KERN       Turn automatic kerning on or off
+  LIGATURES  Turn ligatures on or off
+  SS         Sentence space control
+  WS         Word space control
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Line breaks</span>
+  BR      Alias of br
+  EL      Breaks line but doesn't advance
+  SPACE   Alias of sp
+  SPREAD  Alias of brp
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Vertical motions</span>
+  ALD  Advance lead
+  RLD  Reverse lead
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Indents</span>
+  HI   Indent hang
+  IB   Indent both
+  IBX  Indent both off
+  IL   Indent left
+  ILX  Indent left off
+  IQ   Indents off
+  IR   Indent right
+  IRX  Indent right off
+  IX   Indents off -- deprecated
+  TI   Indent temporary
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Tabs</span>
+  ST       String tab
+  TAB_SET  Tab Set
+  TN       Tab Next
+  TQ       Tab Quit
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Columnar tabs</span>
+  MCO      Turn on multi-column mode
+  MCR      Return to top of column
+  MCX      Turn off multi-column mode
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Underscore</span>
+  UNDERSCORE   Underscores words or phrases
+  UNDERSCORE2  Double underscores words or phrases
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Underline</span>
+  UNDERLINE  Underlines whole passages (Courier only)
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Smart Quotes</span>
+  SMARTQUOTES  Turns smart quotes on or off
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Graphical objects</span>
+  RULE_WEIGHT      Weight of rules drawn with \*[RULE]
+  DBX              Draw box
+  DCL              Draw circle (ellipse)
+  DRH              Draw horizontal rule
+  DRV              Draw vertical rule
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Misc + Support</span>
+  BR_AT_LINE_KERN  Deposit a break before RW and WE
+  CAPS             Convert u/lc to UC
+  COMMENT          Don't print lines till COMMENT OFF (alias of SILENT)
+  DROPCAP_ADJUST   Points (poss. fractional) to add/subtract
+                     from drop caps
+  DROPCAP          Create drop cap
+  DROPCAP_FAMILY   Drop cap family
+  DROPCAP_FONT     Drop cap font
+  DROPCAP_GUTTER   Drop cap gutter
+  DROPCAP_OFF      Support only; restores .in if there was one
+  ESC_CHAR         Alias for .ec
+  EW               Extra white -- loosen overall line kern
+                     (character spacing)
+  LEADER_CHARACTER Sets leader character
+  PAD              Insert padding spaces at marked places
+  PADMARKER        Sets character to use instead of # in PAD
+  PRINT            Simply prints args passed to it; keeps my code
+                     indented nicely
+  RW               Reduce white -- tighten overall line kern
+                     (character spacing)
+  SILENT           Don't print lines till SILENT OFF
+  SIZESPECS        Get cap-height, x-height and descender depth for
+                     current point size
+  SUPERSCRIPT_RAISE_AMOUNT  Change default vertical displacement of superscripts
+  TRAP             Turn traps off or on
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++DIVERSIONS+++</span>
+
+  NO_FLASH    Diverts output of SILENT or COMMENT so they don't print
+  NULL        Diverts SIZESPECS in PRINT_HDRFTR so it doesn't screw up
+                FOOTER and FOOTNOTE processing when FOOTERS are on
+  PAD_STRING  Diverts $PAD_STRING for processing
+  TYPESIZE    Diverts SIZESPECS routine so it doesn't print
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++NUMBER REGISTERS+++</span>
+
+  #ABORT_FT_ERRORS        Abort on FT errors? (boolean)
+  #ALD                    ALD value
+  #ARGS_TO_LIST           Tells LIST whether LIST was invoked with a valid
+                            arg; controls LIST OFF processing
+  #ARGS_TO_SQ             Tells SMARTQUOTES whether it was invoked with a
+                            valid arg; controls SMARTQUOTES OFF
+                            processing
+  #AUTOLEAD_FACTOR        Using FACTOR arg to AUTOLEAD? (boolean)
+  #AUTO_LEAD              Using autolead? (boolean)
+  #AUTOLEAD_VALUE         Auto leading value
+  #BL_INDENT              Value of left indent when IB
+  #B_MARGIN               Bottom margin
+  #B_MARGIN_SET           Has a bottom margin been set with B_MARGIN? (boolean)
+  #BOLDER_UNITS           Number of units to embolden type
+  #BR_AT_LINE_KERN        Break when EW/RW are invoked? (boolean)
+  #BR_INDENT              Value of right indent when IB
+  #BX_SOLID               Draw box filled? (boolean)
+  c                       column mark
+  #CAPS_ON                Is CAPS enabled? (boolean)
+  #CL_SOLID               Draw cirlce filled? (boolean)
+  #CODE_FAM               Use different family from Courier for CODE? (boolean)
+  #CODE_FT                Use different font from roman for CODE? (boolean)
+  #CONDENSE               Are we in pseudo-condense mode? (boolean)
+  #CONDENSE_WAS_ON        For restoring \*[COND] in DROPCAP
+  #COND_WIDTH             Width of pseudo-condensed type
+                            (pointsize x $COND_PERCENT)
+  #CURRENT_HY             \\n[.hy] when ref*normal-print called
+  #CURRENT_L_LENGTH       Current line length at first invocation of LIST;
+                            like #ORIG_L_LENGTH
+  #CURRENT_TAB            Current tab number
+  #DC_COLOR               Colorize dropcap? (boolean)
+  #DC_GUT                 Width of dropcap gutter
+  #DC_HEIGHT              Dropcap height
+  #DC_LINES               Number of lines for dropcap
+  #DEGREES                # of degrees slant for pseudo-italic
+  #ENUMERATOR&lt;n&gt;          Number register enumerator for depth &lt;n&gt; in lists 
+  #EW                     Is EW in effect? (boolean)
+  #EXT_WIDTH              Width of pseudo-extended type
+                            (pointsize x $EXT_PERCENT)
+  #EXTEND                 Are we in pseudo-extend mode? (boolean)
+  #EXTEND_WAS_ON          For restoring \*[EXT] in DROPCAP
+  #FILL_MODE              Which fill mode are we in? ( \n[.j] )
+  #FILLED                 Are we in a fill mode? (boolean)
+  #H_INDENT               Value of left indent when IH
+  #HL_INDENT&lt;n&gt;           Hanging indent for LIST depth &lt;n&gt;
+  #HL_INDENT              Value of the hang when IH
+  #HY_SET                 Did we manually set hyphenation parameters?
+                            (boolean)
+  #HYPHEN_ADJ             Amount by which to raise hyphens surrounding page
+                            numbers
+  #HYPHENATE              Hyphenation on? (boolean)
+  #IN_ITEM                Are we in a list item? (boolean)
+  #IN_ITEM_L_INDENT       Value passed to IL if #IN_ITEM=1
+  #IN_TAB                 Are we in a tab? (boolean)
+                            Set in macro TAB; used in ST to determine
+                            whether to add #ST_OFFSET to #ST&lt;n&gt;_OFFSET
+  #INDENT_ACTIVE          Indicates whether an indent is active (boolean)
+  #INDENT_BOTH_ACTIVE     Toggle
+  #INDENT_LEFT_ACTIVE     Toggle
+  #INDENT_RIGHT_ACTIVE    Toggle
+  #INDENT_STYLE_BOTH      Indicates IB when #INDENT_ACTIVE=1 (boolean)
+  #INDENT_STYLE_HANG      Indicates IH when #INDENT_ACTIVE=1 (boolean)
+  #INDENT_STYLE_LEFT      Indicates IL when #INDENT_ACTIVE=1 (boolean)
+  #INDENT_STYLE_RIGHT     Indicates IR when #INDENT_ACTIVE=1 (boolean)
+  #INDENT_STYLE_TEMP      Indicates IT when #INDENT_ACTIVE=1 (boolean)
+  #IGNORE_COLUMNS         Don't set document in columns (boolean)
+  #IN_DIVER               Are we in a diversion? (boolean)
+  #IX_WARN                Toggles to 1 the first time IX is user-invoked
+  #JUSTIFY                In EW/RW, when BR_AT_LINE_KERN, whether to
+                            break or break-spread preceding line (boolean)
+  #KERN                   Kern on? (boolean)
+  #KERN_UNIT              Size of kern units (1/36 of current point size)
+  #KERN_WAS_ON            Indicates kerning was on; used in list ITEMs (boolean)
+  #LAST_TAB               Last tab number set in multi-columns
+  #LAST_FN_COUNT_FOR_COLS #FN_COUNT_FOR_COLS at top of HEADER
+  #LEAD                   Leading (alias)
+  #LIGATURES              Ligatures on? (boolean)
+  #LIST_INDENT&lt;n&gt;         Left indent of list &lt;n&gt;
+  #L_INDENT               Value of left indent
+  #L_LENGTH               Line length
+  #L_MARGIN               Page offset if set with LMARGIN;
+                            if .po used, \n[.o] returns page offset
+  #LOOP                   In EPIGRAPH, #LOOP=1 if a while loop executes;
+                            otherwise 0.  Elsewhere, an arbitrary incrementing
+                            register used to read in strings
+  #MCX_ALD                Amount to advance past end of longest column
+  #NEWPAGE                Was NEWPAGE just invoked? (boolean)
+  #NEXT_DEPTH_BACK        Next list level back in lists
+  #NEXT_TAB               Current tab number + 1 (used in TN)
+  #NEXT_TAB               Next tab in an n+1 sequence
+  #NOFILL                 Are we in a nofill mode? (boolean)
+  #NOFILL_MODE            Nofill mode
+  #OLD_LEAD               Lead in effect prior to changing it with .vs
+                            in .LS
+  #OPEN_CLOSE             Manipulates character " to print `` or ''
+  #ORIGINAL_L_LENGTH      Used in LIST for IB processing; holds \n[.l]
+  p                       Output line horiz position at end of
+                            $PAD_STRING
+  #PAD_COUNT              Number of times # was included in arg to PAD
+  #PAD_LIST_DIGITS        Pad list digits to the left? (boolean)
+  #PAD_SPACE              Size of padding space
+  #PAGE_LENGTH            Page length (alias)
+  #PAGE_WIDTH             Page width
+  #PP_ACTIVE              Are we in the context of a para? (boolean)
+  #PRINT_FOOTER_ON_PAGE_1 (boolean)
+  #PSEUDO_FILL            Signals that LEFT, RIGHT or CENTER is
+                            in effect (booleand off, i.e. to 0, when
+                            QUAD &lt;arg&gt; or JUSTIFY is called)
+  #PT_SIZE                Point size (fractional) in units (alias)
+  #PT_SIZE_SET            Was point size set with PT_SIZE? (boolean)
+  #Q_AT_TOP               Does a quote start at the top of a new page?
+                            (boolean)
+  #QUAD                   In autoquad mode? (boolean)
+  #QUIT                   Tells LIST whether to exit lists completely
+                            (boolean)
+  #REMOVE                 Used in LIST OFF cleanup
+  #RESTORE_LEAD           Lead value in effect prior to AUTOLEAD
+  #RESTORE_LINE_LENGTH    Restores actual line length in RULE
+  #RESTORE_LN_NUMBER      Start linenumbering again with stored
+                            #NEXT_LN? (boolean)
+  #RESTORE_PT_SIZE        Stores current point size (in units) prior
+                            to underscore
+  #R_INDENT               Value of right indent
+  #R_MARGIN               Right margin
+  #RESTORE_PREV_INDENT    Tells LIST OFF what kind of indent was active
+                            prior to first invocation of LIST
+  #RESTORE_TRAP           Did we have to disable traps? Used in
+                            graphical object macros (boolean)
+  #RESTORE_SQ             Instructs SMARTQUOTES to restore smartquotes if
+                            SMARTQUOTES invoked without an arg
+  #RLD                    RLD value
+  #RULE_WEIGHT            Weight given to RULE_WEIGHT
+  #RULE_WEIGHT_ADJ        RULE_WEIGHT/2
+  #RW                     Is RW in effect? (boolean)
+  #SHIFT_LIST&lt;n&gt;          Value to add to #LIST_INDENT&lt;n&gt; for shifted lists
+  #SILENT                 Is silent on? (boolean)
+  #SIZE_FOR_PAD           Used to ensure that the size in effect prior
+                            to PAD is restored at the start of every
+                            iteration of $PAD_STRING
+  #SLANT_ON               Is SLANT on? (boolean)
+  #SPACE_TO_END           Whitespace at end of string passed to PAD
+  #SQ_WAS_ON              Instructs CODE OFF to restore smartquotes if they
+                            were on prior to CODE
+  #ST&lt;n&gt;_LENGTH           Length of ST&lt;n&gt;; calculated during ST &lt;n&gt;
+  #ST&lt;n&gt;_MARK             Page offset of autotab &lt;n&gt; at ST&lt;n&gt;X
+  #ST_NUM                 Incrementing counter for autotab identification
+  #ST&lt;n&gt;_OFFSET           Offset (from current tab) to add to #ST&lt;n&gt;_OFFSET
+                            when calculating string indents set from within
+                            tabs
+  #ST&lt;n&gt;_OFFSET           Indent of autotab &lt;n&gt; (page offset)
+  #STORED_L_INDENT        Current left indent at first invocation of LIST
+  #STORED_R_INDENT        Current right indent at first invocation of LIST
+  #STORED_BL_INDENT       Current "both, left" indent at first invocation
+                            of LIST
+  #STORED_BR_INDENT       Current "both, right" indent at first invocation
+                            of LIST
+  #STORED_HL_INDENT       Current hanging indent at first invocation
+                            of LIST
+  #STORED_T_INDENT        Current temporary indent at first invocation
+                            of LIST
+  #STR_LENGTH             Holds string length derived from .length request
+  #T_INDENT               Value of temporary indent
+  #T_MARGIN               Top margin
+  #TAB_ACTIVE             Are we in a tab? (boolean)
+  #TAB_NUMBER             Tab number given to TAB_SET
+  #TAB_LENGTH             Tab length given to TAB_SET
+  #TAB_OFFSET             Tab indent given to TAB_SET
+  #TEXT_WIDTH             Width of string to underscore
+  #TN                     Was TN (or \*[T+] called? (boolean)
+  #TOP                    Set to 1 in T_MARGIN, DO_T_MARGIN and ALD; tells
+                            the first LS or AUTOLEAD on a page to maintain
+                            the baseline position prior to the LS call
+  #TOP_BASELINE_ADJ       Amount by which to adjust the baseline position
+                            of the first line on the page if an LS or AUTOLEAD
+                            request differs from the lead current at the end of
+                            the previous page
+  #TOTAL_LISTS            Total number of lists in a nest
+  #UNDERSCORE_WEIGHT      Weight of underscores
+  #UNDERSCORE_WEIGHT_ADJ  UNDERSCORE_WEIGHT/2
+  #USER_SET_L_LENGTH      Did user invoke LL? (boolean)
+  #USER_SET_TITLE_ITEM    Did user invoke TOC_TITLE_ENTRY?
+  #WEIGHT                 Weight given to #RULE_WEIGHT
+  #WEIGHT_ADJ             RULE_WEIGHT/2
+  u                       Horiz position of start of underscore
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++STRINGS+++</span>
+
+  $ARG                  String holding substrings derived from .substring
+                          request
+  $COND_PERCENT         Percentage by which to pseudo-condense type
+  $COLOR_SCHEME         Color scheme used in NEWCOLOR
+  $&lt;colorname&gt;_FILL     XCOLOR "alias" with _FILL attached; used to determine if
+                          the alias exists when the alias is passed to DBX SOLID
+                          or DCL SOLID
+  $CURRENT_QUAD         Restores current quad value in RULE
+  $CURRENT_TAB          Current tab number
+  $DC_ADJUST            +|- # of points to subtract from dropcap
+  $DC_FAM               Drop cap family
+  $DC_FT                Drop cap font
+  $DROPCAP              The dropcap letter
+  $ENUMERATOR&lt;n&gt;        String enumerator for depth &lt;n&gt; in lists 
+  $ENUMERATOR_TYPE&lt;n&gt;   Type of enumerator used in LIST&lt;n&gt;
+  $EW                   Value passed to EW
+  $EXT_PERCENT          Percentage by which to pseudo-extend type
+  $FAMILY               Family
+  $FAMILY_FOR_PAD       Used to ensure that the family in effect prior
+                          to PAD is restored at the start of every
+                          iteration of $PAD_STRING
+  $FONT                 Font
+  $FONT_FOR_PAD         Used to ensure that the font in effect prior
+                          to PAD is restored at the start of every
+                          iteration of $PAD_STRING
+  $PAD_MARKER           Character to mark off padding in PAD
+  $PAD_STRING           Arg passed to PAD
+  $PREFIX&lt;n&gt;            Prefix for enumerator of LIST&lt;n&gt;
+  $QUAD_VALUE           Quad value (left, right, centre, justify)
+  $QUOTE0               Open quotation marks
+  $QUOTE1               Close quotation marks
+  $RESTORE_COND         Restores the pseudo-condense value in effect
+                          prior to DROPCAP
+  $RESTORE_EXT          Restores the pseudo-extend value in effect
+                          prior to DROPCAP
+  $RESTORE_FAM          Used to restore the family in effect
+                          prior to DROPCAP
+  $RESTORE_FT           Used to restore the font/fontstyle in effect
+                          prior to DROPCAP
+  $RESTORE_PT_SIZE      Used to restore the point size of normal
+                          running text after a dropcap
+  $RESTORE_QUAD_VALUE   Quad value for use in restoring L, R, C, J
+                          (after tabs)
+  $RESTORE_SQ           The smartquoting string last passed to SMARTQUOTES
+  $RULE_GAP             Distance between underscore rules
+  $RW                   Value passed to RW
+  $SAVED_STYLE          Current style, if there is one (used in FAMILY)
+  $SAVED_UNDERSCORE_GAP Temporarily holds string in $UNDERSCORE_GAP
+  $SEPARATOR&lt;n&gt;         Separator for depth &lt;n&gt; in lists
+  $SS_VAR               Holds + or - sentence space value
+  $ST&lt;n&gt;_FILL           Always QUAD if QUAD passed to ST &lt;n&gt;
+  ST\n[#LOOP]           Used to initialize string tab markers (1-19)
+  ST\n[#LOOP]X          Used to initialize string tab markers (1-19)
+  $ST&lt;n&gt;_QUAD_DIR       Quad direction supplied to ST for &lt;n&gt;
+  $SUP_LOWER            Vertical displacement amount of superscripts
+  $SUP_RAISE            Vertical displacement amount of superscripts
+  $SUP_RAISE_AMOUNT     Argument passed to SUPERSCRIPT_RAISE_AMOUNT
+  $TAB_NUMBER           Argument passed to TAB macro to call TAB# macro
+                          created in TAB_SET
+  $UNDERSCORE_GAP       Distance between text and underscore rule
+  $WS_CONSTANT          12; used to hold groff default wordspace
+  $WS                   Holds WS value; concatenation of WS_CONSTANT and
+                          WS_VAR
+  $WS_VAR               + or - value to add to $WS_CONSTANT
+  BLACK                 Pre-defined black color
+  black                 Pre-defined black color
+  WHITE                 Pre-defined white color
+  white                 Pre-defined white color
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++ALIASES+++</span>
+
+  ALIAS         als
+  ALIASN        aln
+  BR            br
+  CENTRE        CENTER
+  COLOUR        COLOR
+  COMMENT       SILENT
+  CONDENSE      CONDENSE_OR_EXTEND
+  EXTEND        CONDENSE_OR_EXTEND
+  FAM           FAMILY
+  FT            FONT
+  HYPHENATE     HY
+  HYPHENATION   HY
+  INCLUDE       so
+  LIG           LIGATURES
+  LL            LINE_LENGTH
+  MAC           de
+  NEW_PAGE      bp
+  NEWCOLOUR     NEWCOLOR
+  NEWPAGE       NEW_PAGE
+  PAGELENGTH    PAGE_LENGTH
+  PAGE_LENGTH   pl
+  PAGEWIDTH     PAGE_WIDTH
+  SPREAD        brp
+  SP            sp
+  STRING        ds
+  TABSET        TAB_SET
+  TB            TAB
+  TI            IT
+  UNDERSCORE_2  UNDERSCORE2
+  XCOLOUR       XCOLOR
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++ALIASES FOR NUMBER REGISTERS+++</span>
+
+  #DIVER_DEPTH    dn   -- diversion depth
+  #DIVER_WIDTH    dl   -- diversion width
+  #INDENT         .i   -- value of current indent
+  #LEAD           .v   -- line space (.vs, not .ls)
+  #L_LENGTH       .l   -- line length
+  #NUM_ARGS       .$   -- number of arguments passed to a macro
+  #PAGE_LENGTH    .p   -- page length
+  #PT_SIZE        .ps  -- current point size (fractional) in units
+  #TRAP_DISTANCE  .t   -- distance to next trap
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++INLINE ESCAPES+++</span>
+
+  ALD&lt;n&gt;       Move down inline by &lt;n&gt; (between .25 and 12.75)
+  B            Inline equivalent to .EL
+  BCK          Inline backward horizontal movement
+  BD           Bold font
+  BDI          Bold italic font
+  BLACK        Color
+  black        color
+  BOLDER       Pseudo-bold on
+  BOLDERX      Pseudo-bold off
+  BP           Back points (horizontal movement)
+  BP&lt;n&gt;        Back points by  &lt;n&gt; (between .25 and 12.75)
+  BU           Back units (inline pairwise kerning)
+  BU&lt;n&gt;        Back units by &lt;n&gt; (between 1 and 36)
+  COND         Pseudo-condense type
+  COND_FOR_SUP Pseudo-condense string for use with superscripts
+                 (called with CONDSUP)
+  COND_FOR_SUP Pseudo-extend string for use with superscripts (called
+                 with EXTSUP)
+  CONDSUP      Pseudo-condensed superscript (using value set with
+                 CONDENSE)
+  CONDSUPX     Pseudo-condensed superscript off
+  CONDX        Pseudo-condense off
+  DOWN         Inline downward vertical movement
+  EN-MARK      Inline escape to indicate the beginning of a
+                 range of lines used to identify an endnote
+  EXT          Pseudo-extend type
+  EXTX         Pseudo-extend off
+  EXTSUP       Pseudo-extended superscript
+  EXTSUPX      Pseudo-extended superscript off
+  FN-MARK      Inline escape to indicate the beginning of a
+                 range of lines used to identify a footnote
+  FP&lt;n&gt;        Forward points by  &lt;n&gt; (between .25 and 12.75)
+  FP           Forward points (horizontal movement)
+  FU           Forward units (inline pairwise kerning)
+  FU&lt;n&gt;        Forward units by &lt;n&gt; (between 1 and 36)
+  FWD          Inline forward horizontal movement
+  PREV         Return to previous font in effect
+  RLD&lt;n&gt;       Move up, inline, by &lt;n&gt; (between .25 and 12.75)
+  ROM          Roman (medium) font
+  S            Same \s
+  SLANT        Slant (pseudo-italic on
+  SLANTX       Slant off
+  ST&lt;n&gt;        String tab end marker
+  ST&lt;n&gt;        String tab start marker
+  SUP          Superscript
+  SUPX         Superscript off
+  TB+          Move to next tab number (n+1) without advancing on the page
+  UP           Inline upward vertical movement
+  WHITE        Color
+  white        Color
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++SPECIAL CHARACTERS+++</span>
+
+  FOOT         The foot character \(fm
+  INCH         The inch character \(fm\(fm
+  LEADER       Deposit leader to end of current LL or TAB
+  RULE         Draw a rule to the full measure of the current line or
+                 tab length
+<span style="display: block; margin-top: 1em; text-decoration: underline;">DOCUMENT PROCESSING</span>
+<span style="display: block; margin-top: -1em;">+++MACROS+++</span>
+<span style="display: block; margin-top: -1em; margin-bottom: -1em;">*Document info (reference macros)</span>
+  AUTHOR          Author
+  CHAPTER         Chapter number
+  CHAPTER_TITLE   Chapter title
+  COPYRIGHT       Copyright info (covers only)
+  DOCTITLE        Overall doc title (for collated docs)
+  DRAFT           Draft number
+  MISC            Misc info (covers only)
+  REVISION        Revision number
+  SUBTITLE        Doc subtitle
+  TITLE           Doc title
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Covers</span>
+  COVER               What goes on cover
+  COVERS              Whether covers get printed (boolean)
+  COVER_ADVANCE       Set vertical start position of cover material
+  COVER_LEAD          Overall leading of covers
+  COVERTITLE          User-defined cover title string
+  DOC_COVER           What goes on doc cover
+  DOC_COVERS          Whether doc covers get printed
+  DOC_COVER_ADVANCE   Set vertical start position of doc cover material
+  DOC_COVER_LEAD      Overall leading of doc covers
+  DOC_COVERTITLE      User-defined doc cover title string
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Document style</span>
+  COPYSTYLE     Output style (DRAFT or FINAL)
+  DEFAULTS      In START, sets defaults
+  DOCTYPE       Kind of doc (DEFAULT, CHAPTER, NAMED, LETTER)
+  PAGENUMBER    Page number that appears on 1st page of doc
+  PAPER         Paper size (LETTER, LEGAL, A4)
+  PRINTSTYLE    Print style (TYPEWRITE or TYPESET)
+  NUMBER_LINES  Number output lines in the left margin
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Document tags and macros</span>
+  ADD_SPACE               Special macro to add space to the top of a pages after
+                            page 1; must be preceded by NEWPAGE
+  BIBLIOGRAPHY            Begin a bibliography page
+  BIBLIOGRAPHY_TYPE       LIST or PLAIN
+  BLOCKQUOTE              Block-indented, quoted text
+  COL_BREAK               Breaks and spreads line before invocation; moves to
+                            next column on page or 1st col of next page.  An
+                            alias of COL_NEXT.
+  COL_NEXT                Moves to next column on page or 1st col of next page
+  ENDNOTE                 Endnote
+  ENDNOTE_REFS            Send REFs to endnotes
+  ENDNOTES                Output endnotes
+  EPIGRAPH                Epigraph before 1st para 
+  FINIS                   Prints --END--
+  FOOTNOTE                Collects footnotes in text for printing at bottom
+                            of page
+  FOOTNOTE_REFS           Send REFs to footnotes
+  HEAD                    Section title (main heads)
+  HYPHENATE_REFS          Turn on/off hyphenation of REF references
+  ITEM                    Begin a list item
+  LINEBREAK               Break between narrative sections
+  LIST                    Initialize a list
+  MN                      Margin note
+  MN_INIT                 Initialize parameters for margin notes
+  NUMBER_LINES            Number text lines
+  NUMBER_BLOCKQUOTE_LINES Number blockquote lines
+  NUMBER_QUOTE_LINES      Number quote lines
+  PAD_LIST_DIGITS         Leave space for two-numeral digit enumerators
+                            in a list
+  PARAHEAD                Paragraph head
+  PP                      Paragraph
+  QUOTE                   Poetic or line for line quotes
+  REF                     Wrapper around FOOTNOTE or ENDNOTE, depending
+                            on FOOTNOTE_REFS or ENDNOTE_REFS
+  REF(                    Begin embedded reference, parens
+  REF)                    End embedded reference, parens
+  REF[                    Begin embedded reference, square brackets
+  REF]                    End embedded reference, square brackets
+  REF{                    Begin embedded reference, braces
+  REF}                    End embedded reference, braces
+  REF_INDENT              Amount of 2nd line indent of references for
+                            footnote, endnote or bibliography refs
+  RESET_LIST              Reset digit or alpha list enumerator
+  SHIFT_LIST              Move a list over to the right
+  START                   Sets doc defaults and prints info collected
+                            with doc info macros
+  SUBHEAD                 Subheads
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Headers/footers</span>
+  BREAK_QUOTE          Manually break a footnoted quote that crosses
+                         a page/column
+  DO_FOOTER            Prints footer (after footnote processing, if any)
+  FOOTER_ON_FIRST_PAGE Print footer on first page? (boolean)
+  FOOTER               Trap-invoked footer macro
+  HEADER               Trap-invoked header macro
+  PAGINATE             Turns page numbering on or off (doc default=on)
+  PAGINATE_TOC         Turns pagination of toc on or off (default=on)
+  RECTO_VERSO          Enables switch HEADER_LEFT and HEADER_RIGHT on
+                         alternate pages
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Control macros</span>
+-General-
+  ALWAYS_FULLSPACE_QUOTES  Fullspace quotes instead of default
+                             1/2 spacing them.
+  ATTRIBUTE_STRING         What to print before author (default is "by")
+  CHAPTER_STRING           What to print whenever the word "chapter"
+                             is required
+  COLUMNS                  Print in columns
+  DOC_FAMILY               Overall doc family
+  DOCHEADER                Print doc header?
+  DOCHEADER_ADVANCE        Start position of docheader (relative to top
+                             of page)
+  DOCHEADER_LEAD           +|- value applied to #DOC_LEAD to in/decrease
+                             leading of doc header
+  DOC_LEAD_ADJUST          Adjust #DOC_LEAD to fill page to #B_MARGIN
+  DOC_LEAD                 Overall doc leading
+  DOC_LEFT_MARGIN          Doc left margin
+  DOC_LINE_LENGTH          Doc line length
+  DOC_PT_SIZE              Overall doc point size
+  DOC_RIGHT_MARGIN         Doc right margin
+  DOC_TITLE                Overall doc title that gets printed in
+                             headers/footers (mostly for use with collated
+                             docs where each doc is an article with a
+                             different title
+  DRAFT_STRING             What to print whenever the word "draft" is
+                             required
+  DRAFT_WITH_PAGENUMBER    Attach draft/revision info to page number
+                             (instead of putting it HEADER centre)
+  REVISION_STRING          What to print whenever the word "revision"
+                             is required
+
+-Covers-
+   COVER_ADVANCE            Vertical place on page to start outputting
+                              cover material
+   COVER_LEAD               Lead in/decrease for cover pages
+   COVERS_COUNT_PAGES       Whether to include cover pages in pagination scheme
+   DOC_COVER_ADVANCE        Vertical place on page to start outputting
+                              doc cover material
+   DOC_COVER_LEAD           Lead in/decrease for doc cover pages
+   DOC_COVERS_COUNT_PAGES   Whether to include doc cover pages in pagination
+                              scheme
+
+-Epigraphs and finis-
+  EPIGRAPH_AUTOLEAD        Autolead value for epigraphs
+  EPIGRAPH_INDENT          Value by which to multiply PP_INDENT for
+                             block epigraphs
+  FINIS_STRING             What to print when FINIS is invoked
+  FINIS_STRING_CAPS        Whether to capitalize the finis string
+
+-Footnotes-
+  FOOTNOTE_AUTOLEAD             Autolead to use in footnotes
+  FOOTNOTE_LINENUMBER_BRACKETS  Brackets for footnote linenumbers
+  FOOTNOTE_LINENUMBER_SEPARATOR Separator for footnote linenumbers
+  FOOTNOTE_MARKERS              Turns footnote markers on or off
+  FOOTNOTE_MARKER_STYLE         STAR or NUMBER; default=STAR
+  FOOTNOTE_RULE_ADJ             # of points to raise footnote rule from its
+                                  baseline
+  FOOTNOTE_RULE_LENGTH          Length of footnote separator rule
+  FOOTNOTE_RULE                 Turns printing of fn separator rule on or off;
+                                  default is on
+  FOOTNOTE_SPACING              Post footnote item spacing
+  FOOTNOTES_RUN_ON              Run footnotes on (line numbering mode only)
+  RESET_FOOTNOTE_NUMBER         Reset fn# to 1, or, if arg PAGE, reset
+                                  automatically to 1 on every page
+  RUNON_WARNING                 Utility macro; warns if FOOTNOTES_RUN_ON
+                                  was called when fn marker style is STAR or
+                                  NUMBER
+
+-Endnotes-
+  ENDNOTE_LEAD                 Leading for endnotes page
+  ENDNOTE_LINENUMBER_BRACKETS  Brackets around line numbers identifying
+                                 endnotes and text
+  ENDNOTE_LINENUMBER_GAP       Amount of space to leave between line
+  ENDNOTE_LINENUMBER_SEPARATOR Separator between line numbers identifying
+                                 endnotes and the endnote item text
+                                 endnotes and text
+  ENDNOTE_MARKER_STYLE         NUMBER or LINE
+  ENDNOTE_NUMBERS_ALIGN_RIGHT  Hang endnote numbers and align right
+  ENDNOTE_NUMBERS_ALIGN_LEFT   Don't hang endnote numbers and align left
+  ENDNOTE_PARA_INDENT          First line indent of paras in multi-para
+                                 endnotes
+  ENDNOTE_PARA_SPACE           Whether to space paras in multi-para endnotes
+  ENDNOTE_PT_SIZE              Base point size for endnotes page
+  FOOTNOTE_SPACING             Post endnotenote item spacing
+  ENDNOTE_STRING               Endnotes page head
+  ENDNOTE_STRING_ADVANCE       Distance of title string "ENDNOTES" from top
+                                 edge of page
+  ENDNOTE_STRING_CAPS          Capitalize the endnotes string
+  ENDNOTE_STRING_UNDERLINE     Underscoring of endnotes page head
+  ENDNOTE_TITLE                Endnotes identifying title
+  ENDNOTE_TITLE_SPACE          Distance from top of page to endnotest title
+  ENDNOTE_TITLE_UNDERLINE      Underscoring of endnotes identifying title
+  ENDNOTES_ALLOWS_HEADERS      Page headers on endnotes pages? (boolean)
+  ENDNOTES_FIRST_PAGENUMBER    Page number to appear on page 1 of endnotes
+                                 pages
+  ENDNOTES_HDRFTR_CENTER       Print header/footer centre string on endnotes
+                               pages?
+  ENDNOTES_HEADER_CENTER       Print header centre string on endnotes pages?
+  ENDNOTES_FOOTER_CENTER       Print footer centre string on endnotes pages?
+  ENDNOTES_NO_COLUMNS          Turn columnar mode off for endnotes pages
+  ENDNOTES_NO_FIRST_PAGENUM    Don't print a pagenumber on page 1 of
+                                 endnotes.
+  ENDNOTES_PAGENUM_STYLE       Set numbering style for endnotes pages page
+                                 numbers
+  SINGLESPACE_ENDNOTES         Single space TYPEWRITE endnotes
 
-BIBLIOGRAPHY_ALLOWS_HEADERS    Allow headers on bib pages
-BIBLIOGRAPHY_FIRST_PAGENUMBER  Starting page number for bibliographies
-BIBLIOGRAPHY_HDRFTR_CENTER     Header/footer center string for bib pages
-BIBLIOGRAPHY_LEAD              Base lead of bib pages
-BIBLIOGRAPHY_NO_COLUMNS        De-columnize bibliographies
-BIBLIOGRAPHY_NO_FIRST_PAGENUM  Don't print a page number on the first
-                               page of bibliographies
-BIBLIOGRAPHY_PAGENUM_STYLE     Format for bib pages page numbering
-BIBLIOGRAPHY_PT_SIZE           Base point size for bib pages
-BIBLIOGRAPHY_SPACING           Post bib entry space
-BIBLIOGRAPHY_STRING            String for bib title
-BIBLIOGRAPHY_STRING_CAPS       Capitalize bib title string
-BIBLIOGRAPHY_STRING_UNDERLINE  Underscore bib title string
-SINGLESPACE_BIBLIOGRAPHY       Singlespace bibs if PRINTSTYLE TYPEWRITE
-
-***Headers and footers***
-
-FOOTER_COLOR             Footer color
-FOOTER_GAP               Distance between running text and footer
-FOOTER_MARGIN            Distance from footer to bottom of page
-FOOTERS                  Turns footers on or off
-HDRFTR_CENTER            String to go in centre part of header/footer;
-                         default doctype 
-HDRFTR_CENTER_CAPS       Centre part of header/footer in caps? (boolean)
-HDRFTR_CENTER_PAD        Pad hdrftr CENTER left or right by specified
-                         amount
-HDRFTR_GAP               Distance from header/footer to running text
-HDRFTR_LEFT_CAPS         Left part of header/footer in caps? (boolean)
-HDRFTR_LEFT              String to go in left part of header/footer;
-                         default is AUTHOR_1
-HDRFTR_LEFT              The header/footer left string
-HDRFTR_MARGIN            Distance from top of page to header
-HDRFTR_PLAIN             Header/footer fam/ft/ps all same as running
-                         text
-HDRFTR_RECTO             User-defined, single string recto
-                         header/footer
-HDRFTR_RIGHT_CAPS        Right part of header/footer in caps? (boolean)
-HDRFTR_RIGHT             The header/footer right string
-HDRFTR_RULE_GAP          Space between header/footer and header/footer
-                         rule
-HDRFTR_RULE_INTERNAL     Prints the header/footer rule
-HDRFTR_RULE              Turns header/footer rule on or off
-                         When invoked internally, prints the rule.
-HDRFTR_VERSO             User-defined, single string verso
+-Bibliographies-
+  BIBLIOGRAPHY_ALLOWS_HEADERS    Allow headers on bib pages
+  BIBLIOGRAPHY_FIRST_PAGENUMBER  Starting page number for bibliographies
+  BIBLIOGRAPHY_HDRFTR_CENTER     Header/footer center string for bib pages
+  BIBLIOGRAPHY_LEAD              Base lead of bib pages
+  BIBLIOGRAPHY_NO_COLUMNS        De-columnize bibliographies
+  BIBLIOGRAPHY_NO_FIRST_PAGENUM  Don't print a page number on the first
+                                   page of bibliographies
+  BIBLIOGRAPHY_PAGENUM_STYLE     Format for bib pages page numbering
+  BIBLIOGRAPHY_PT_SIZE           Base point size for bib pages
+  BIBLIOGRAPHY_SPACING           Post bib entry space
+  BIBLIOGRAPHY_STRING            String for bib title
+  BIBLIOGRAPHY_STRING_ADVANCE    Distance of title string "BIBLIOGRAPHY" from
+                                   top edge of page
+  BIBLIOGRAPHY_STRING_CAPS       Capitalize bib title string
+  BIBLIOGRAPHY_STRING_UNDERLINE  Underscore bib title string
+  SINGLESPACE_BIBLIOGRAPHY       Singlespace bibs if PRINTSTYLE TYPEWRITE
+
+-Headers and footers-
+  FOOTER_COLOR             Footer color
+  FOOTER_GAP               Distance between running text and footer
+  FOOTER_MARGIN            Distance from footer to bottom of page
+  FOOTERS                  Turns footers on or off
+  HDRFTR_CENTER            String to go in centre part of header/footer;
+                             default doctype 
+  HDRFTR_CENTER_CAPS       Centre part of header/footer in caps? (boolean)
+  HDRFTR_CENTER_PAD        Pad hdrftr CENTER left or right by specified
+                             amount
+  HDRFTR_GAP               Distance from header/footer to running text
+  HDRFTR_LEFT_CAPS         Left part of header/footer in caps? (boolean)
+  HDRFTR_LEFT              String to go in left part of header/footer;
+                           default is AUTHOR_1
+  HDRFTR_LEFT              The header/footer left string
+  HDRFTR_MARGIN            Distance from top of page to header
+  HDRFTR_PLAIN             Header/footer fam/ft/ps all same as running
+                             text
+  HDRFTR_RECTO             User-defined, single string recto
+                             header/footer
+  HDRFTR_RIGHT_CAPS        Right part of header/footer in caps? (boolean)
+  HDRFTR_RIGHT             The header/footer right string
+  HDRFTR_RULE_GAP          Space between header/footer and header/footer
+                             rule
+  HDRFTR_RULE_INTERNAL     Prints the header/footer rule
+  HDRFTR_RULE              Turns header/footer rule on or off
+                             When invoked internally, prints the rule.
+  HDRFTR_VERSO             User-defined, single string verso
+                             header/footer
+  HEADERS                  Turns headers on or off
+  HEADERS_AND_FOOTERS      Enables and permits the creation of
+                             headers and footers that appear on the
+                             same page
+  SWITCH_HDRFTR            Switch HDRFTR_LEFT and HDRFTR_RIGHT
+
+-Page numbering-
+  PAGENUM_HYPHENS          Turns on/off hyphens surrounding page numbers
+  PAGENUM_ON_FIRST_PAGE    Print page number on first page when footers
+                             are on (boolean)
+  PAGENUM_POS              Controls placement of page numbers;
+                             default=bottom/centred
+  PAGENUM_SIZE             How much to in/decrease point size of page
+                             numbers
+  PAGENUM_STYLE            Page # in roman, Arabic, or alphabetic
+  RESTORE_PAGINATION       Restore pagination after outputting non-
+                             paginated endnotes.
+  SUSPEND_PAGINATION       Suspend pagination prior to outputting
+                             endnotes
+
+-Heads-
+  HEADER_GAP               Space between header and running text
+  HEADER_MARGIN            Space from top of page to header
+  HEAD_CAPS                Print section titles in caps? (boolean)
+  HEAD_SPACE               Give HEADs 2 line-spaces before. If OFF,
+                             only 1.  Default is on.
+  HEAD_UNDERLINE           Underline section titles? (boolean)
+  NUMBER_HEADS             Print head numbers
+  RESET_HEAD_NUMBER        Reset head number
+
+-Subheads-
+  NUMBER_SUBHEADS          Print subhead numbers
+  RESET_SUBHEAD_NUMBER     Reset subhead number
+
+-Para heads-
+  NUMBER_PARAHEADS         Print parahead numbers
+  PARAHEAD_INDENT          How much to indent paraheads
+  RESET_PARAHEAD_NUMBER    Reset parahead number
+
+  PREFIX_CH_NUM_WARNING    Macro to abort PREFIX_CHAPTER_NUMBER
+                             with a warning if the arg to CHAPTER isn't
+                             a digit, and user hasn't supplied a digit
+                             to PREFIX_CHAPTER_NUMBER
+  PREFIX_CHAPTER_NUMBER    Prefix the chapter number to numbered
+                             heads, subheads and paraheads
+-Paragraphs-
+  INDENT_FIRST_PARAS       Indent 1st paras? (doc default=not indented) 
+  PARA_INDENT              Size of para indent
+  PARA_SPACE               Put a line space before paras
+  PP_FONT                  Overall doc font
+
+-Quotes-
+  Q_FITS                  Utility macro for DO_QUOTE
+  Q_NOFIT                 Utility macro for DO_QUOTE
+  QUOTE_AUTOLEAD          Leading of (block)quotes
+
+-Line/section breaks-
+  LINEBREAK_CHAR           Linebreak character, iterations and positioning
+
+-Printstyle TYPEWRITE-
+  ITALIC_MEANS_ITALIC      For TYPEWRITE; render .FT I in italic.
+  SLANT_MEANS_SLANT        In TYPEWRITE, render \*[SLANT] as slant
+  UNDERLINE_ITALIC         In TYPEWRITE, render .FT I as underlined
+  UNDERLINE_QUOTES         In TYPEWRITE, underline quotes? (boolean)
+  UNDERLINE_SLANT          In TYPEWRITE, render \*[SLANT] as underlined
+
+-Table of contents-
+  TOC_APPENDS_AUTHORS      Appends author(s) to toc doc title entries
+  TOC_LEAD                 Leading of toc pages
+  TOC_PADDING              Number of placeholders for toc entries page
+                             numbers
+  TOC_HEAD_INDENT          Indent of toc head entries
+  TOC_HEADER_STRING        TOC header string (default=Contents)
+  TOC_PAGENUM_STYLE        Page numbering style (hdrftr nums) of
+                             toc pages
+  TOC_RV_SWITCH            Switch L/R margins of toc pages
+  TOC_PARAHEAD_INDENT      Indent of toc parahead entries
+  TOC_SUBHEAD_INDENT       Indent of toc subhead entries
+  TOC_TITLE_ENTRY          User supplied toc doc title entry
+  TOC_TITLE_INDENT         Indent of toc doc title entries
+
+<span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Aliases for header/footer control macros</span>
+  HEADER_SIZE           HDRFTR_SIZE
+  HEADER_RIGHT_PS       HDRFTR_RIGHT_SIZE
+  HEADER_RIGHT_SIZE     HDRFTR_RIGHT_SIZE
+  HEADER_RIGHT_FAM      HDRFTR_RIGHT_FAMILY
+  HEADER_RIGHT_FAMILY   HDRFTR_RIGHT_FAMILY
+  HEADER_RIGHT_FONT     HDRFTR_RIGHT_FONT
+  HEADER_RIGHT_FT       HDRFTR_RIGHT_FONT
+  HEADER_LEFT_PS        HDRFTR_LEFT_SIZE
+  HEADER_LEFT_SIZE      HDRFTR_LEFT_SIZE
+  HEADER_LEFT_FAM       HDRFTR_LEFT_FAMILY
+  HEADER_LEFT_FAMILY    HDRFTR_LEFT_FAMILY
+  HEADER_LEFT_FONT      HDRFTR_LEFT_FONT
+  HEADER_LEFT_FT        HDRFTR_LEFT_FONT
+  HEADER_CENTRE_PS      HDRFTR_CENTER_SIZE
+  HEADER_CENTRE_SIZE    HDRFTR_CENTER_SIZE
+  HEADER_FAM            HDRFTR_FAMILY
+  HEADER_FAMILY         HDRFTR_FAMILY
+  HEADER_CENTRE_FAM     HDRFTR_CENTER_FAMILY
+  HEADER_CENTRE_FAMILY  HDRFTR_CENTER_FAMILY
+  HEADER_CENTRE_FONT    HDRFTR_CENTER_FONT
+  HEADER_CENTRE_FT      HDRFTR_CENTER_FONT
+  HEADER_CENTER_PS      HDRFTR_CENTER_SIZE
+  HEADER_CENTER_SIZE    HDRFTR_CENTER_SIZE
+  HEADER_CENTER_FAM     HDRFTR_CENTER_FAMILY
+  HEADER_CENTER_FAMILY  HDRFTR_CENTER_FAMILY
+  HEADER_CENTER_FONT    HDRFTR_CENTER_FONT
+  HEADER_CENTER_FT      HDRFTR_CENTER_FONT
+  FOOTER_SIZE           HDRFTR_SIZE
+  FOOTER_RIGHT_PS       HDRFTR_RIGHT_SIZE
+  FOOTER_RIGHT_SIZE     HDRFTR_RIGHT_SIZE
+  FOOTER_RIGHT_FAM      HDRFTR_RIGHT_FAMILY
+  FOOTER_RIGHT_FAMILY   HDRFTR_RIGHT_FAMILY
+  FOOTER_RIGHT_FONT     HDRFTR_RIGHT_FONT
+  FOOTER_RIGHT_FT       HDRFTR_RIGHT_FONT
+  FOOTER_LEFT_PS        HDRFTR_LEFT_SIZE
+  FOOTER_LEFT_SIZE      HDRFTR_LEFT_SIZE
+  FOOTER_LEFT_FAM       HDRFTR_LEFT_FAMILY
+  FOOTER_LEFT_FAMILY    HDRFTR_LEFT_FAMILY
+  FOOTER_LEFT_FONT      HDRFTR_LEFT_FONT
+  FOOTER_LEFT_FT        HDRFTR_LEFT_FONT
+  FOOTER_CENTRE_PS      HDRFTR_CENTER_SIZE
+  FOOTER_CENTRE_SIZE    HDRFTR_CENTER_SIZE
+  FOOTER_FAM            HDRFTR_FAMILY
+  FOOTER_FAMILY         HDRFTR_FAMILY
+  FOOTER_CENTRE_FAM     HDRFTR_CENTER_FAMILY
+  FOOTER_CENTRE_FAMILY  HDRFTR_CENTER_FAMILY
+  FOOTER_CENTRE_FT      HDRFTR_CENTER_FONT
+  FOOTER_CENTER_PS      HDRFTR_CENTER_SIZE
+  FOOTER_CENTER_SIZE    HDRFTR_CENTER_SIZE
+  FOOTER_CENTER_FAM     HDRFTR_CENTER_FAMILY
+  FOOTER_CENTER_FAMILY  HDRFTR_CENTER_FAMILY
+  FOOTER_CENTER_FONT    HDRFTR_CENTER_FONT
+  FOOTER_CENTER_FT      HDRFTR_CENTER_FONT
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++LETTER MACROS+++</span>
+
+  CLOSING         Closing (i.e. Yours truly,)
+  CLOSING_INDENT  Left indent of CLOSING
+  DATE            Date for letters
+  FROM            Addresser's name and address
+  GREETING        Full salutation (e.g. Dear John Smith,)
+  NO_SUITE        Remove suite page numbers from bottom of letter pages
+  SIGNATURE_SPACE Amount of room to leave for signature
+  TO              Addressee's name and address
+  ALL_DONE        .em (the "end macro") for letters
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++SUPPORT+++</span>
+
+  CHECK_INDENT         Applies indents to doc elements inside ev's
+                         (head, subhead, etc)
+  CLEANUP_DEFAULTS     Removes selected rregisters and strings
+                         from DEFAULTS after START
+  DO_COVER             Formats and outputs covers
+  DO_DOC_COVER         Formats and outputs doc covers
+  D0_QUOTE             Outputs quotes with space adjustments before
+                         and after
+  DIVER_FN_1_PRE  -+     
+  DIVER_FN_2_PRE   |   Manage footnotes called inside diversions
+                   |   QUOTE, BLOCKQUOTE and EPIGRAPH
+  DIVER_FN_2_POST -+
+  DIVERT_FN_LEFTOVER   Diverts excess fn stored in FN_OVERFLOW into
+                         FOOTNOTE
+  DIVERT_FN_OVERFLOW   Diverts excess fn stored in FN_OVERFLOW when
+                         FN_DEFER into FOOTNOTE
+  DO_EPIGRAPH          Outputs epigraphs with space adjustments before
+                         and after
+  FN_OVERFLOW_TRAP     Fixed at B_MARGIN; if footnotes run longer than
+                         B_MARGIN, diverts excess into FN_OVERFLOW
+  GET_ROMAN_INDENT     Figures out amount of space to reserve
+                         for roman numerals in lists
+  HDRFTR_RULE          Prints rule under header or over footer
+  MN_OVERFLOW_TRAP     Trap-invoked macro to collect margin note
+                         overflows
+  NO_SHIM              Disable SHIM
+  PRINT_FOOTNOTE_RULE  An alias of PRINT_FOOTNOTE; prints footnote
+                         separator rule
+  PRINT_HDRFTR         Prints header/footer (trap invoked)
+  PRINT_PAGE_NUMBER    Invoked in HEADER or FOOTER
+  PRINT_USERDEF_HDRFTR Prints user defined, single string recto/verso
                          header/footer
-HEADERS                  Turns headers on or off
-HEADERS_AND_FOOTERS      Enables and permits the creation of
-                         headers and footers that appear on the
-                         same page
-SWITCH_HDRFTR            Switch HDRFTR_LEFT and HDRFTR_RIGHT
-
-***Page numbering***
-
-PAGENUM_HYPHENS          Turns on/off hyphens surrounding page numbers
-PAGENUM_ON_FIRST_PAGE    Print page number on first page when footers
-                         are on (boolean)
-PAGENUM_POS              Controls placement of page numbers;
-                         default=bottom/centred
-PAGENUM_SIZE             How much to in/decrease point size of page
-                         numbers*
-PAGENUM_STYLE            Page # in roman, Arabic, or alphabetic
-RESTORE_PAGINATION       Restore pagination after outputting non-
-                         paginated endnotes.
-SUSPEND_PAGINATION       Suspend pagination prior to outputting
-                         endnotes
-
-***Heads***
-
-HEADER_GAP               Space between header and running text
-HEADER_MARGIN            Space from top of page to header
-HEAD_CAPS                Print section titles in caps? (boolean)
-HEAD_SPACE               Give HEADs 2 line-spaces before. If OFF,
-                         only 1.  Default is on.
-HEAD_UNDERLINE           Underline section titles? (boolean)
-NUMBER_HEADS             Print head numbers
-RESET_HEAD_NUMBER        Reset head number
-
-***Subheads***
-
-NUMBER_SUBHEADS          Print subhead numbers
-RESET_SUBHEAD_NUMBER     Reset subhead number
-
-***Para heads***
-
-NUMBER_PARAHEADS         Print parahead numbers
-PARAHEAD_INDENT          How much to indent paraheads
-RESET_PARAHEAD_NUMBER    Reset parahead number
-
-PREFIX_CH_NUM_WARNING    Macro to abort PREFIX_CHAPTER_NUMBER
-                         with a warning if the arg to CHAPTER isn't
-                         a digit, and user hasn't supplied a digit
-                         to PREFIX_CHAPTER_NUMBER
-PREFIX_CHAPTER_NUMBER    Prefix the chapter number to numbered
-                         heads, subheads and paraheads
-***Paragraphs***
-
-INDENT_FIRST_PARAS       Indent 1st paras? (doc default=not indented) 
-PARA_INDENT              Size of para indent
-PARA_SPACE               Put a line space before paras
-PP_FONT                  Overall doc font
-
-***Quotes***
-
-Q_FITS                  Utility macro for DO_QUOTE
-Q_NOFIT                 Utility macro for DO_QUOTE
-QUOTE_AUTOLEAD          Leading of (block)quotes
-
-***Line/section breaks***
-
-LINEBREAK_CHAR           Linebreak character, iterations and positioning
-
-***Printstyle TYPEWRITE***
-
-ITALIC_MEANS_ITALIC      For TYPEWRITE; render .FT I in italic.
-SLANT_MEANS_SLANT        In TYPEWRITE, render \*[SLANT] as slant
-UNDERLINE_ITALIC         In TYPEWRITE, render .FT I as underlined
-UNDERLINE_QUOTES         In TYPEWRITE, underline quotes? (boolean)
-UNDERLINE_SLANT          In TYPEWRITE, render \*[SLANT] as underlined
-
-***Table of contents***
-
-TOC_APPENDS_AUTHORS      Appends author(s) to toc doc title entries
-TOC_LEAD                 Leading of toc pages
-TOC_PADDING              Number of placeholders for toc entries page
-                         numbers
-TOC_HEAD_INDENT          Indent of toc head entries
-TOC_HEADER_STRING        TOC header string (default=Contents)
-TOC_PAGENUM_STYLE        Page numbering style (hdrftr nums) of
-                         toc pages
-TOC_RV_SWITCH            Switch L/R margins of toc pages
-TOC_PARAHEAD_INDENT      Indent of toc parahead entries
-TOC_SUBHEAD_INDENT       Indent of toc subhead entries
-TOC_TITLE_ENTRY          User supplied toc doc title entry
-TOC_TITLE_INDENT         Indent of toc doc title entries
-
-***Aliases for headers and footers***
-HEADER_SIZE           HDRFTR_SIZE
-HEADER_RIGHT_PS       HDRFTR_RIGHT_SIZE
-HEADER_RIGHT_SIZE     HDRFTR_RIGHT_SIZE
-HEADER_RIGHT_FAM      HDRFTR_RIGHT_FAMILY
-HEADER_RIGHT_FAMILY   HDRFTR_RIGHT_FAMILY
-HEADER_RIGHT_FONT     HDRFTR_RIGHT_FONT
-HEADER_RIGHT_FT       HDRFTR_RIGHT_FONT
-HEADER_LEFT_PS        HDRFTR_LEFT_SIZE
-HEADER_LEFT_SIZE      HDRFTR_LEFT_SIZE
-HEADER_LEFT_FAM       HDRFTR_LEFT_FAMILY
-HEADER_LEFT_FAMILY    HDRFTR_LEFT_FAMILY
-HEADER_LEFT_FONT      HDRFTR_LEFT_FONT
-HEADER_LEFT_FT        HDRFTR_LEFT_FONT
-HEADER_CENTRE_PS      HDRFTR_CENTER_SIZE
-HEADER_CENTRE_SIZE    HDRFTR_CENTER_SIZE
-HEADER_FAM            HDRFTR_FAMILY
-HEADER_FAMILY         HDRFTR_FAMILY
-HEADER_CENTRE_FAM     HDRFTR_CENTER_FAMILY
-HEADER_CENTRE_FAMILY  HDRFTR_CENTER_FAMILY
-HEADER_CENTRE_FONT    HDRFTR_CENTER_FONT
-HEADER_CENTRE_FT      HDRFTR_CENTER_FONT
-HEADER_CENTER_PS      HDRFTR_CENTER_SIZE
-HEADER_CENTER_SIZE    HDRFTR_CENTER_SIZE
-HEADER_CENTER_FAM     HDRFTR_CENTER_FAMILY
-HEADER_CENTER_FAMILY  HDRFTR_CENTER_FAMILY
-HEADER_CENTER_FONT    HDRFTR_CENTER_FONT
-HEADER_CENTER_FT      HDRFTR_CENTER_FONT
-FOOTER_SIZE           HDRFTR_SIZE
-FOOTER_RIGHT_PS       HDRFTR_RIGHT_SIZE
-FOOTER_RIGHT_SIZE     HDRFTR_RIGHT_SIZE
-FOOTER_RIGHT_FAM      HDRFTR_RIGHT_FAMILY
-FOOTER_RIGHT_FAMILY   HDRFTR_RIGHT_FAMILY
-FOOTER_RIGHT_FONT     HDRFTR_RIGHT_FONT
-FOOTER_RIGHT_FT       HDRFTR_RIGHT_FONT
-FOOTER_LEFT_PS        HDRFTR_LEFT_SIZE
-FOOTER_LEFT_SIZE      HDRFTR_LEFT_SIZE
-FOOTER_LEFT_FAM       HDRFTR_LEFT_FAMILY
-FOOTER_LEFT_FAMILY    HDRFTR_LEFT_FAMILY
-FOOTER_LEFT_FONT      HDRFTR_LEFT_FONT
-FOOTER_LEFT_FT        HDRFTR_LEFT_FONT
-FOOTER_CENTRE_PS      HDRFTR_CENTER_SIZE
-FOOTER_CENTRE_SIZE    HDRFTR_CENTER_SIZE
-FOOTER_FAM            HDRFTR_FAMILY
-FOOTER_FAMILY         HDRFTR_FAMILY
-FOOTER_CENTRE_FAM     HDRFTR_CENTER_FAMILY
-FOOTER_CENTRE_FAMILY  HDRFTR_CENTER_FAMILY
-FOOTER_CENTRE_FT      HDRFTR_CENTER_FONT
-FOOTER_CENTER_PS      HDRFTR_CENTER_SIZE
-FOOTER_CENTER_SIZE    HDRFTR_CENTER_SIZE
-FOOTER_CENTER_FAM     HDRFTR_CENTER_FAMILY
-FOOTER_CENTER_FAMILY  HDRFTR_CENTER_FAMILY
-FOOTER_CENTER_FONT    HDRFTR_CENTER_FONT
-FOOTER_CENTER_FT      HDRFTR_CENTER_FONT
-
-   *relative to #DOC_PT_SIZE
-  **relative to overall ps of headers as set by HEADER_SIZE
- ***relative to overall ps of endnotes pages
-****relative to overall ps of toc pages
-
-+++LETTER MACROS+++
-
-CLOSING      Closing (i.e. Yours truly,)
-DATE         Date for letters
-FROM         Addresser's name and address
-GREETING     Full salutation (e.g. Dear John Smith,)
-NO_SUITE     Remove suite page numbers from bottom of letter pages
-TO           Addressee's name and address
-ALL_DONE     .em (the "end macro") for letters
-
-+++SUPPORT+++
-
-CHECK_INDENT         Applies indents to doc elements inside ev's
-                     (head, subhead, etc)
-CLEANUP_DEFAULTS     Removes selected rregisters and strings
-                     from DEFAULTS after START
-DO_COVER             Formats and outputs covers
-DO_DOC_COVER         Formats and outputs doc covers
-D0_QUOTE             Outputs quotes with space adjustments before
-                     and after
-DIVER_FN_1_PRE  -+     
-DIVER_FN_2_PRE   |   Manage footnotes called inside diversions
-                 |   QUOTE, BLOCKQUOTE and EPIGRAPH
-DIVER_FN_2_POST -+
-DIVERT_FN_LEFTOVER   Diverts excess fn stored in FN_OVERFLOW into
-                     FOOTNOTE
-DIVERT_FN_OVERFLOW   Diverts excess fn stored in FN_OVERFLOW when
-                     FN_DEFER into FOOTNOTE
-DO_EPIGRAPH          Outputs epigraphs with space adjustments before
-                     and after
-FN_OVERFLOW_TRAP     Fixed at B_MARGIN; if footnotes run longer than
-                     B_MARGIN, diverts excess into FN_OVERFLOW
-GET_ROMAN_INDENT     Figures out amount of space to reserve
-                     for roman numerals in lists
-HDRFTR_RULE          Prints rule under header or over footer
-MN_OVERFLOW_TRAP     Trap-invoked macro to collect margin note
-                     overflows
-NO_SHIM              Disable SHIM
-PRINT_FOOTNOTE_RULE  An alias of PRINT_FOOTNOTE; prints footnote
-                     separator rule
-PRINT_HDRFTR         Prints header/footer (trap invoked)
-PRINT_PAGE_NUMBER    Invoked in HEADER or FOOTER
-PRINT_USERDEF_HDRFTR Prints user defined, single string recto/verso
-                     header/footer
-PROCESS_SHIM         Calculates #SHIM when \n(.d is lower on the
-                     page than #T_MARGIN
-PROCESS_FN_IN_DIVER  Processes footnotes gathered in a diversion (called
-                     at page/column breaks)
-REMOVE_INDENT        Removes indents set with CHECK_INDENT
-Q_FITS               Handles spacing of quotes when quote fits on the page
-Q_NOFIT              Handles spacing of quotes when quote does not fit on
-                     the page
-QUIT_LISTS           Exit lists cleanly and completely
-SET_LIST_INDENT      Restore indent of a prev. level of list
-SHIM                 Advance to next "valid" baseline
-TERMINATE            .em that ensures deferred footnotes get output
-                     on final pages
-TRAPS                Sets hdrftr traps; optionally adjusts #DOC_LEAD
-                     to fill page to #B_MARGIN
-TYPEWRITER           Sets family (C), font (R) and point size (12)
-                     for PRINTSTYLE TYPEWRITE
-VFP_CHECK            Trap-sprung macro 1 valid baseline higher than
-                     where FOOTER will be sprung; checks whether
-                     there is, in fact, just enough room for
-                     another line of running text to be added to
-                     the page without jamming footnotes too close
-                     to running text.
-
-+++DIVERSIONS+++
-
-B_QUOTE           Block (indented) quote text
-CLOSING           Closing (i.e. Yours truly,)
-EPI_TEXT          Epigraph text
-END_NOTES         Endnotes text
-FN_IN_DIVER       Footnotes gathered from inside a diversion
-FN_OVERFLOW       Excess footnotes when B_MARGIN is reached
-FOOTNOTES         Text of footnotes
-GREETING          Full salutation (e.g. Dear John Smith,)
-LETTERHEAD&lt;n&gt;     Date, addresser, addressee or greeting;
-                  &lt;n&gt; is from 1 to 4, supplied by #FIELD
-P_QUOTE           Line for line (poetic) quote text
-RUNON_FOOTNOTES   Special diversion for run-on footnotes
-RUNON_FN_IN_DIVER Special diversion for run-on footnotes inside
-                  (block)quotes
-TOC_ENTRIES       TOC entries
-
-+++NUMBER REGISTERS+++
-
-#ADJ_BIB_LEAD              Adjust BIB_LEAD? (boolean)
-#ADJ_DOC_LEAD              Adjust DOC_LEAD? (boolean)
-#ADJ_EN_LEAD               Adjust EN_LEAD? (boolean)
-#ADJ_TOC_LEAD              Adjust TOC_LEAD? (boolean)
-#ADVANCE_FROM_TOP          Distance from page top to start of
-                           running text if no docheader
-#ARG_NUM                   Keeps track of number of args passed to a
-                           macro
-#ARGS_TO_LIST              Was LIST passed some args? (boolean)
-#ATTRIBUTE_COLOR           Colorize attribute string? (boolean)
-#AUTHOR_&lt;n&gt;                Strings passed to AUTHOR
-#AUTHOR_COLOR              Colorize author(s)? (boolean)
-#AUTHOR_COVER_NUM          Incrementing register used in definining
-                           $AUTHOR_COVER_&lt;n&gt; strings
-#AUTHOR_DOCCOVER_NUM       Incrementing register used in definining
-                           $AUTHOR_COVER_&lt;n&gt; strings
-#AUTHOR_NUM                Keeps track of user-defined string
-                           AUTHOR_&lt;n&gt; in AUTHOR
-#AUTHORS                   Equals final value of AUTHOR_NUM;
-                           used for authors in doc header
-#BASELINE_MARK             In PP, the vertical position on the page
-                           (when paragraph spacing is on) after a
-                           quote or blockquote has been output and
-                           the post-quote space has been added.
-#BMARG                     Position of unvarying bottom margin
-                           during doc processing; required for
-                           collecting footnotes inside diversions
-#BIB_ALLOWS_HEADERS        Put headers on bib pages? (boolean)
-#BIB_ALLOWS_HEADERS_ALL    Put headers on all bib pages? (boolean)
-#BIB_FIRST_PAGE            Tells PRINT_PAGE_NUMBER about bibliography
-                           first page number
-#BIB_FIRST_PN              Starting pagenumber for bibliographies
-#BIB_HDRFTR_CENTER         Put a center string in bib page headers?
-                           (boolean)
-#BIB_LEAD                  Bibliography lead, expressed in points
-#BIB_LIST                  Output bibs in list style? (boolean)
-#BIB_NO_COLS               De-columnize bibliographies? (boolean)
-#BIB_NO_FIRST_PN           Put a page number on the first page of
-                           bibliographies? (boolean)
-#BIB_SINGLESPACE           Single-space TYPEWRITE bibliographies? (boolean)
-#BIB_SPACE                 Post item space for bibliography pages
-#BIB_STRING_CAPS           Capitalize bib title? (boolean)
-#BIB_STRING_UNDERLINE      Underscore bib title? 0=no; 1=yes; 2=double
-#BIB_STRING_UNDERLINE_WEIGHT       Underline weight in units
-#BIB_STRING_UNDERLINE_WEIGHT_ADJ   Underline weight/2
-#BIB_PS                    Base point size for bibliography pages expressed
-                           in points
-#BIBLIOGRAPHY              Are we doing a bib page? (boolean)
-#BQ_AUTOLEAD               Register created by BLOCKQUOTE_AUTOLEAD
-#BQ_LEAD                   Leading of blockquotes
-#BQUOTE_COLOR              Colorize blockquotes? (boolean)
-#BQUOTE_LN                 Number blockquotes? (boolean)
-#BROKEN_QUOTE              Did we invoke BREAK_QUOTE? (boolean)
-#CAP_HEIGHT_ADJUST         Tallest cap height of strings LEFT, CENTER,
-                           and RIGHT in footers; used to place rule
-                           over footer
-#CAPS_WAS_ON               In HDRFTR, to re-enable running text CAPS
-                           (boolean)
-#CENTER_CAP_HEIGHT         Cap height of CENTER string in
-                           headers/footers
-#CH_NUM                    The chapter number obtained by PREFIX_CHAPTER_NUMBER
-#CHAPTER_CALLED            Has CHAPTER been invoked? (boolean); used
-                           by PREFIX_CHAPTER_NUMBER to see whether
-                           to try to get the chapter number from
-                           the arg passed to CHAPTER
-#CHAPTER_TITLE_NUM         Incrementing register used to define strings
-                           $CHAPTER_TITLE_&lt;n&gt;
-#CHAPTER_TITLE_COLOR       Colorize chapter title? (boolean)
-#CLOSING                   Is there a closing (for letters)? (boolean)
-#COL_L_LENGTH              Line length of columns
-#COL_&lt;n&gt;_L_MARGIN          Left margin of column &lt;n&gt;
-#COL_NEXT                  Was COL_NEXT invoked? (boolean; used in
-                           FOOTER)
-#COL_NUM                   Incrementing counter of num of columns;
-                           for use with #COL_&lt;n&gt;_L_MARGIN
-#COL_TOTAL                 #COL_L_LENGTH + #GUTTER; used to calculate
-                           #COL_&lt;n&gt;_L_MARGIN
-#COLLATE                   Are we performing a COLLATE? (boolean)
-#COLLATED_DOC              If 1, instructs TOC that this is a collated
-                           doc
-#COLUMNS                   Are columns turned on? (boolean)
-#COLUMNS_WERE_ON           Stores columnar state prior to outputting
-                           endnotes in no-columns mode
-#COPY_STYLE                1=draft, 2=final
-#COUNTERS_RESET            Tells FOOTNOTE if fn counters have
-                           been reset because of footnotes gathered
-                           inside a diversion
-#COVER                     Print a COVER? (boolean)
-#COVER_ATTRIBUTE_COLOR     Colorize cover attribution string? (boolean)
-#COVER_AUTHOR              Put AUTHOR(s) on COVER? (boolean)
-#COVER_AUTHOR_COLOR        Colorize cover author(s)? (boolean)
-#COVER_BLANKPAGE           Output blankpage after COVER? (boolean)
-#COVER_COLOR               Colorize COVER? (boolean)
-#COVER_COPYRIGHT           Put copyright on COVER? (boolean)
-#COVER_COPYRIGHT_COLOR     Colorize cover copyright line? (boolean)
-#COVER_DOCTYPE             Put doctype on COVER? (boolean)
-#COVER_DOCTYPE_COLOR       Colorize cover doctype? (boolean)
-#COVER_END                 Are we ending a COVER? (boolean)
-#COVER_LEAD                Cover leading
-#COVER_MISC                Put misc on COVER? (boolean)
-#COVER_MISC_COLOR          Colorize cover misc line? (boolean)
-#COVER_RULE_WEIGHT         Doctype underline weight on COVER
-#COVER_RULE_WEIGHT_ADJ     COVER_RULE_WEIGHT/2
-#COVER_START_POS           Vertical starting pos of cover material
-#COVER_SUBTITLE            Put subtitle on COVER? (boolean)
-#COVER_TITLE               Put title on COVER? (boolean)
-#COVER_TITLE_NUM           Number of cover title items
-#COVER_TITLE_COLOR         Colorize cover title? (boolean)
-#COVER_SUBTITLE_COLOR      Colorize cover subtitle? (boolean)
-#COVER_UNDERLINE           Underline doctype on COVER? (boolean)
-#COVER_UNDERLINE_WEIGHT       Doctype underline weight on COVER
-#COVER_UNDERLINE_WEIGHT_ADJ   COVER_UNDERLINE_WEIGHT/2
-#CURRENT_V_POS             \n(.d ; used in SHIM
-#COVERS                    Print covers? (boolean)
-#COVERS_COUNT              Include COVER in pagination scheme? (boolean)
-#COVERS_OFF                Don't print COVERs (boolean)
-#DATE_FIRST                Was .DATE invoked as first letter
-                           header after .START? (boolean)
-dc                         "mark" register for document columns
-#DIVER_FN                  Register that tells FOOTNOTE whether to
-                           "move" or "defer" a footnote collected
-                           inside a diversion
-#DEFER_BIB_SPACING         Tells DEFAULTS to do BIBLIOGRAPHY_SPACING
-                           if it was called before START
-#DEFER_PAGINATION          Tells COLLATE to restore pagination (from
-                           RESTORE_PAGINATION
-#DEFER_SPACE_ADDED         Was space added between two "first" footnotes that
-                           appear on the same page? (boolean)
-#DELAY_SHIM                Instructs DO_QUOTE to delay SHIM when quote
-                           falls at the top of a page
-#DEPTH                     LIST depth
-#DEPTH_1                   Doc header depth with lead adjustment
-                           (#DOCHEADER_LINES * #DOCHEADER_LEAD)
-#DEPTH_2                   Doc header depth without lead adjustment
-                           (#DOCHEADER_LINES * #DOC_LEAD)
-#DEPTH_TO_B_MARGIN         Page length minus #B_MARGIN
-#DIVERSIONS_HY_MARGIN      A reasonable value for .hym applied to
-                           QUOTE, BLOCKQUOTE and EPIGRAPH to
-                           avoid excessive hyphenation if these are
-                           set quad left
-#DIVERTED                  Set to 1 in DIVERT_FN_OVERFLOW; reset
-                           subsequently in FOOTNOTES when called by
-                           PROCESS_FN_LEFTOVER to 2 or 3 for use by
-                           FOOTER to decide whether to in/decrease
-                           #FN_DEPTH when outputting footnotes
-#DOC_COVER                 Are we doing a DOC_COVER? (boolean)
-#DOC_COVER_AUTHOR          Put AUTHOR(s) on DOC_COVER? (boolean)
-#DOCCOVER_BLANKPAGE        Output blank page after DOC_COVER? (boolean)
-#DOC_COVER_CHAPTER_TITLE_COLOR  Colorize CHAPTER_TITLE on DOC_COVER? (boolean)
-#DOC_COVER_COPYRIGHT       Put copyright on DOC_COVER? (boolean)
-#DOC_COVER_DOCTYPE         Put doctype on DOC_COVER? (boolean)
-#DOCCOVER_END              Are we finishing a DOC_COVER? (boolean)
-#DOC_COVER_LEAD            Doc cover leading
-#DOC_COVER_MISC            Put misc on DOC_COVER? (boolean)
-#DOC_COVER_START_POS       Vertical starting pos of doc cover material
-#DOC_COVER_COLOR           Colorize cover? (boolean)
-#DOC_COVER_START_POS       Vertical starting pos of cover material
-#DOC_COVER_TITLE_COLOR     Colorize doc cover title? (boolean)
-#DOC_COVER_SUBTITLE_COLOR  Colorize doc cover subtitle? (boolean)
-#DOC_COVER_ATTRIBUTE_COLOR Colorize doc cover attribution string? (boolean)
-#DOC_COVER_AUTHOR_COLOR    Colorize doc cover author(s)? (boolean)
-#DOC_COVER_DOCTYPE_COLOR   Colorize doc cover doctype? (boolean)
-#DOC_COVER_COPYRIGHT_COLOR Colorize doc cover copyright line? (boolean)
-#DOC_COVER_MISC_COLOR      Colorize doc cover misc line? (boolean)
-#DOC_COVER_SUBTITLE        Put subtitle on DOC_COVER? (boolean)
-#DOC_COVER_TITLE           Put title on DOC_COVER? (boolean)
-#DOC_COVER_TITLE_NUM       Number of doc cover title items
-#DOC_COVERS                Print doc covers? (boolean)
-#DOC_COVERS_OFF            Don't print DOC_COVERs (boolean)
-#DOCCOVER_RULE_WEIGHT      Doctype underline weight on DOC_COVER
-#DOCCOVER_RULE_WEIGHT_ADJ  DOCCOVER_RULE_WEIGHT/2
-#DOCCOVER_UNDERLINE        Underline doctype on DOC_COVER? (boolean)
-#DOCCOVER_UNDERLINE_WEIGHT      Doctype underline weight on DOC_COVER
-#DOCCOVER_UNDERLINE_WEIGHT_ADJ  DOCCOVER_UNDERLINE_WEIGHT/2
-#DOCCOVERS_COUNT           Include DOC_COVER in pagination scheme? (boolean)
-#DOC_HEADER                Whether to print a doc header (boolean)
-#DOC_LEAD_ADJ              Incrementing value (in units) added to
-                           #DOC_LEAD to fill page to #B_MARGIN
-#DOC_LEAD                  Leading used in body
-#DOC_L_LENGTH              Global L_LENGTH
-#DOC_L_MARGIN              Global L_MARGIN
-#DOC_LR_MARGIN_TMP         In HEADER, if RECTO_VERSO=1, temporarily
-                           holds DOC_L_MARGIN during page margin switch
-#DOC_PT_SIZE               Point size used for body text
-#DOC_R_MARGIN              Global R_MARGIN
-#DOC_TYPE                  1=default, 2=chapter, 3=named, 4=letter
-#DOCHEADER_ADVANCE         Distance from top-of-page to baseline of
-                           docheader
-#DOCHEADER_COLOR           Colorize docheader? (boolean)
-#DOCHEADER_DEPTH           Depth of docheader
-#DOCHEADER_LEAD            Lead of doc header
-                           (#DOC_LEAD + #DOCHEADER_LEAD_ADJ)
-#DOC_LEAD_ADJUST_OFF       Don't adjust DOC_LEAD (boolean)
-#DOCS                      Always 1 after START
-#DOCTITLE_NUM              Number of doctitle items
-#DOCTYPE_COLOR             Colorize doctype? (boolean)
-#DOCTYPE_RULE_WEIGHT       Doctype underline weight
-#DOCTYPE_RULE_WEIGHT_ADJ   DOCTYPE_RULE_WEIGHT/2
-#DOCTYPE_UNDERLINE         Underline doctype? (boolean)
-#DOCTYPE_UNDERLINE_WEIGHT       Weight of doctype underline
-#DOCTYPE_UNDERLINE_WEIGHT_ADJ   DOCTYPE_UNDERLINE_WEIGHT/2
-#DOING_COVER               Tells PRINT_AUTHORS that it's printing
-                           the authors for a cover or doc cover
-#DONE_ONCE                 Keeps track of how many times footnotes
-                           have been collected inside the same diversion
-#DONT_RULE_ME              Rule this (apparent) first footnote? (boolean)
-#DIVER_LN_OFF              Turn linenumbering off in (block)quotes?
-                           (boolean)
-#DRAFT_WITH_PAGENUM        Are we attaching draft/revision info to page
-                           number? (boolean)
-#EM_ADJUST                 Amount to raise \(em at END
-#EN_ALLOWS_HEADERS         Put page headers on endnotes pages? (boolean)
-#EN_ALLOWS_HEADERS_ALL     Put page headers on all endnotes pages?
-                           (boolean)
-#EN_BQ_AUTOLEAD            Register created by EN_BLOCKQUOTE_AUTOLEAD
-#EN_BQ_LEAD                Leading of blockquotes on endnotes pages
-#EN_FIGURE_SPACE           Width of \0, for use with formatting endnotes
-#EN_FIRST_PAGE             Tells PRINT_PAGE_NUMBER about endnotes
-                           first page number
-#EN_FIRST_PN               Page number that appears on page 1 of
-                           endnotes pages.
-#EN_HDRFTR_CENTER          Should we print centre string of
-                           headers/footers on endnotes pages? (boolean)
-#EN_LEAD                   Lead of endnotes
-#EN_LN_BRACKETS            Are we using brackets for line-numbered
-                           endnotes (boolean)
-#EN_LN_SEP                 Are we using a separator for line-numbered
-                           endnotes (boolean)
-#EN_MARK                   \n(ln when \*[EN-MARK] is called
-#EN_MARK_2                 \n(ln when ENDNOTE is called
-#EN_MARKER_STYLE           1=NUMBER; 2=LINE
-#EN_NO_COLS                Do not set endnotes in columns? (boolean)
-#EN_NO_FIRST_PN            Put pagenumber on 1st page of endnotes?
-                           (boolean)
-#EN_NUMBER                 Number of current endnote
-#EN_NUMBER_PLACEHOLDERS    Number of placeholders to reserver for endnotes numbers
-#EN_NUMBERS_ALIGN_RIGHT    Hang and align endnote numbers right?
-                           (boolean)
-#EN_NUMBERS_ALIGN_LEFT     Align endnote numbers with left margin?
-                           (boolean)
-#EN_NUMBERS_PLACEHOLDERS   Number of placeholders when endnote numbers
-                           hang and align right
-#EN_NUMBER_L_LENGTH        Line length for endnote numbers when they're
-                           right aligned
-#EN_PP_INDENT              First line indent of paras in multi-para
-                           endnotes
-#EN_PP_SPACE               Space multi-paras in endnotes? (boolean)
-#EN_PS                     ps of endnotes
-#EN_Q_AUTOLEAD             Register created by EN_QUOTE_AUTOLEAD
-#EN_Q_LEAD                 Leading of quotes on endnotes pages
-#EN_REF                    Put REFs in endnotes? (boolean)
-#EN_SINGLESPACE            Single space endnotes pages? (boolean)
-#EN_STRING_ADVANCE         Vertical position of "ENDNOTES" string (relative to
-                           the top edge of the page)
-#EN_STRING_CAPS            Should ENDNOTES capitalize the endnotes
-                           string? (boolean)
-#EN_STRING_UNDERLINE       Underscore endnotes page head? (boolean)
-#EN_STRING_UNDERLINE_WEIGHT       Weight of endnotes page title underscore
-#EN_STRING_UNDERLINE_WEIGHT_ADJ   EN_STRING_UNDERLINE_WEIGHT_ADJ/2
-#EN_TEXT_INDENT            Page offset for text of endnotes when
-                           numbers right align
-#EN_TITLE_UNDERLINE        Underscore endnotes document identifier?
-                           (boolean)
-#EN_TITLE_UNDERLINE_WEIGHT       Weight of endnotes document identification underscore
-#EN_TITLE_UNDERLINE_WEIGHT_ADJ   EN_STRING_UNDERLINE_WEIGHT_ADJ/2
-#END_QUOTE                 For PP=0 indenting; did we just end a quote?
-                           (boolean)
-#ENDNOTE                   Are we in an endnote? (boolean)
-#ENDNOTE_REFS              Are REFs going to endnotes? (boolean)
-#ENDNOTES                  Are we in an endnote (for FOOTERs; boolean)
-#EPI_ACTIVE                Are we in an epigraph? (boolean)
-#EPI_AUTOLEAD              Autolead value for epigraphs
-#EPI_COLOR                 Colorize epigraphs? (boolean)
-#EPI_DEPTH                 Depth of epigraph from first baseline to
-                           last
-#EPI_FITS                  Does epigraph fit on page/column? (boolean)
-#EPIGRAPH                  Did we have an epigraph? (boolean) 
-#EPI_LEAD_DIFF             Difference between #DOC_LEAD and #EPI_LEAD
-#EPI_LEAD                  Leading of epigraph; set by AUTOLEAD
-#EPI_LINES_EVEN            Even # of lines at end of epi crossing page in
-                           TYPEWRITE (d-spaced)?
-#EPI_LINES                 Number of lines in the epigraph
-#EPI_LINES_TO_END          Number of epigraph lines remaining after
-                           footer trap is sprung
-#EPI_LINES_TO_TRAP         Number of epigraph lines till footer trap is
-                           sprung
-#EPI_L_LENGTH              Epigraph line length
-#EPI_OFFSET                Left margin of epigraphs
-#EPI_OFFSET_VALUE          Epigraph indent as a function of page offset
-#EPI_ON                    Are we in an epigraph? (boolean)
-#EPI_WHITESPACE            Space after epigraph to compensate for
-                           epigraph leading
-#FIELD                     Incrementing register tacked onto LETTERHEAD
-#FINIS                     Was FINIS invoked? (boolean)
-#FINIS_STRING_CAPS         Capitalize finis string? (boolean)
-#FINIS_COLOR               Colorize FINIS? (boolean)
-#FIRST_DOC_TITLE_PN        Page number of 1st (collated) doc (for TOC)
-#FIRST_DOC_TOC_PN_PADDING  Padding for 1st page number of 1st (collated) doc (for TOC)
-#FN_AUTOLEAD               Autolead value of footnotes
-#FN_BL_INDENT              Left indent of INDENT BOTH in footnotes
-#FN_BR_INDENT              Right indent of INDENT BOTH in footnotes
-#FN_COUNT                  Which fn marker to print; also to
-                           tell mom to reserve space for and print
-                           the rule above footnotes
-#FN_COUNT_AT_FOOTER        The FN_COUNT after FOOTNOTES has been
-                           output in FOOTER
-#FN_COUNT_FOR_COLS         Holds a separate footnote count for columns
-                           (so they don't reset to 0 1 until page break)
-#FN_DEFER                  Defer footnote to next page/column? (boolean)
-                           If 0, don't defer.
-#FN_DEFER_SPACE            Whether to deposit space before
-                           footnote 1 because there's a deferred
-                           footnote on the page
-#FN_DEPTH                  Depth of footnote diversion(s)
-#FN_FOR_EPI                Signals to epigraph that a footnote is being
-                           processed
-#FN_GAP                    When there are footnotes on a page, the
-                           difference between where FOOTER will be
-                           sprung and the next valid baseline.
-                           Used in VFP_CHECK.
-#FN_LEAD                   Lead in footnotes after FN_AUTOLEAD is
-                           applied
-#FN_L_INDENT               Left indent of INDENT LEFT in footnotes
-#FN_LINES                  Number of lines in fn; used to calculate
-                           fn depth
-#FN_LN_BRACKETS            Are footnote linenumber brackets being used?
-                           (boolean)
-#FN_LN_SEP                 Is a footnote linenumber separator being used?
-                           (boolean)
-#FN_MARK                   \n(ln when \*[FN-MARK] is called
-#FN_MARK_2                 \n(nl when FOOTNOTE is called
-#FN_MARKER_STYLE           1=STAR; 2=NUMBER
-#FN_MARKERS                Print footnote markers? (boolean)
-#FN_NUMBER                 The footnote number attached to running text
-                           (and fns) when numbers instead of
-                           star/dagger is being used for footnootes
-                           numbers
-#FN_OVERFLOW_DEPTH         Depth of leftover from footnote processing
-#FN_OVERFLOW_TRAP_POS      The register that sets the position of
-                           trap FN_OVERFLOW_TRAP.
-#FN_R_INDENT               Right indent of INDENT RIGHT in footnotes
-#FN_REF                    Put REFs in footnotes? (boolean)
-#FN_RULE                   Print fn rule? (boolean)
-#FN_RULE_ADJ               # of points to raise footnote separator from
-                           its baseline
-#FN_RULE_LENGTH            Length of footnote separator rule
-#FN_RULE_WEIGHT            Weight of the footnote separator rule
-#FN_RULE_WEIGHT_ADJ        FN_RULE_WEIGHT/2
-#FN_SPACE                  Post footnote space
-#FN_WAS_DEFERED            Tells HEADER about a deferred footnote
-#FOOTER_DIFF               In TRAPS, the difference between the
-                           original #B_MARGIN and #VISUAL_B_MARGIN
-#FOOTER_GAP                Amount of space between end of text and
-                           page #
-#FOOTER_MARGIN             Amount of space between page # and bottom
-                           of page
-#FOOTER_POS                Position of footer trap (required for
-                           collecting footnotes inside a diversion)
-#FOOTER_RULE               Print footer rule? (boolean)
-#FOOTER_RULE_GAP           Gap between footer and separator rule above
-#FOOTER_RULE_WEIGHT        Weight of footer rule
-#FOOTER_RULE_WEIGHT_ADJ    #FOOTER_RULE_WEIGHT/2
-#FOOTERS_ON                Are we using footers? (boolean)
-#FOOTERS_WERE_ON           Were footers on? - used in FINIS and BLANKPAGE
-                           (boolean)
-#FOOTNOTE_COLOR            Colorize footnotes? (boolean)
-#FROM_BIB_STRING           Tells UNDERSCORE it's underscoring $BIB_STRING
-#FROM_COVER                Tells UNDERSCORE it's underscoring on a cover
-#FROM_DOC_COVER            Tells UNDERSCORE it's underscoring on a doccover
-#FROM_DOCTYPE              Tells UNDERSCORE it's underscoring the doctype
-#FROM_EN_STRING            Tells UNDERSCORE it's underscoring $EN_STRING
-#FROM_EN_TITLE             Tells UNDERSCORE it's underscoring $EN_TITLE
-#FROM_HEAD                 Tells UNDERSCORE it's underscoring a head
-#FROM_DIVERT_FN            Signals to FOOTNOTE, when run from
-                           within DIVERT_FN_LEFTOVER, to set #SPACE_REMAINING
-                           to the total area allowable for running text
-#FROM_FOOTER               In col to col footnote processing, tells
-                           FOOTNOTE that FOOTNOTES was output from
-                           FOOTER.
-#FROM_HEADER               In col to col footnote processing, tells
-                           FOOTNOTE that FOOTNOTES was output from
-                           HEADER.
-#FULLSPACE_QUOTES          Should we fullspace quotes? (boolean)
-#GET_DC_HEIGHT             Used in routine to get the correct point size for dropcaps
-#GET_DEPTH                 Signals to FOOTNOTE that it should
-                           measure the depth of current footnotes
-                           plus the most recently added one, except
-                           where the footnote is to be deferred to
-                           the next page or column
-#GUTTER                    Width of gutter between columns
-#HDRFTR_BOTH               Are we setting both headers and footers?  (boolean)
-#HDRFTR_CENTER_CAPS        CENTER part of header/footer in caps?
-                           (boolean; default=off)
-#HDRFTR_CENTER_COLOR       Colorize header/footer center? (boolean)
-#HDRFTR_COLOR              Colorize headers/footers? (boolean)
-#HDRFTR_CTR_PAD_LEFT       Amount of hdrftr CENTER padding on the left
-#HDRFTR_CTR_PAD_RIGHT      Amount of hdrftr CENTER padding on the right
-#HDRFTR_CTR_PAD_TMP        Temp storage of left hdrftr CENTER padding
-                           (for recto/verso switch)
-#HDRFTR_HEIGHT             Cap height of $HDRFTR_RECTO/$HDRFTR_VERSO
-                           strings
-#HDRFTR_LEFT_CAPS          Left part of header/footer in caps?
-                           (boolean; default=off)
-#HDRFTR_LEFT_COLOR         Colorize header/footer left? (boolean)
-#HDRFTR_PT_SIZE            Initial point size of headers/footers
-#HDRFTR_RECTO_CAPS         Header/footer recto caps? (boolean)
-#HDRFTR_RIGHT_CAPS         Right part of header/footer in caps?
-                           (boolean; default=on)
-#HDRFTR_RIGHT_COLOR        Colorize header/footer right? (boolean)
-#HDRFTR_RULE               Print head/footer rule? (boolean)
-#HDRFTR_RULE_COLOR         Colorize header/footer rule? (boolean)
-#HDRFTR_RULE_GAP           Space between header/footer and
-                           header/footer rule
-#HDRFTR_RULE_WEIGHT        Weight of header/footer rule
-#HDRFTR_RULE_WEIGHT_ADJ    HDRFTR_RULE_WEIGHT/2
-#HDRFTR_TMP_CAPS_SWITCH    Temporarily holds HDRFTR_LEFT_CAPS value if
-                           #SWITCH_HDRFTR=1
-#HDRFTR_VERSO_CAPS         Header/footer verso caps? (boolean)
-#HEAD                      1=main/section head 2=subhead
-#HEAD_CAPS                 Print section titles in caps? (boolean)
-#HEAD_COLOR                Colorize heads? (boolean)
-#HEADER_GAP                Distance from header to running text
-#HEAD_NUM                  Head number
-#HEAD_SPACE                2 line spaces before heads? (boolean)
-#HEAD_UNDERLINE            Underline heads? (boolean)
-#HEAD_UNDERLINE_WEIGHT     Head underline weight
-#HEAD_UNDERLINE_WEIGHT_ADJ HEAD_UNDERLINE_WEIGHT/2
-#HEADER_MARGIN             Distance from top of page to header
-#HEADER_RULE               Print header rule? (boolean)
-#HEADER_RULE_GAP           Gap between header and header rule
-#HEADER_RULE_WEIGHT        Header rule weight
-#HEADER_RULE_WEIGHT_ADJ    HEADER_RULE_WEIGHT/2
-#HEADERS_ON                Headers on? (boolean)
-#HEADER_STATE              Saves header state in COLLATE for use in
-                           START after COLLATE
-#HEADERS_WERE_ON           Were headers on? - used in BLANKPAGE (boolean)
-#HF_OFF                    Has HEADERS_AND_FOOTERS been turned off? (boolean)
-#HORIZ_MARK                Horizontal 
-#HOW_MANY                  Number of blank pages to output
-#IGNORE                    Should we ignore this macro? Set to 1 in
-                           TYPEWRITE.
-#IN_BIB_LIST               Tells ITEM we're doing a bibliography in
-                           list style
-#INDENT_FIRST_PARAS        Indent first paras? (boolean)
-#INDENT_FIRSTS             Tells footnotes to leave INDENT_FIRST_PARAS
-                           alone if it's on for running text.
-#ITALIC_MEANS_ITALIC       For TYPEWRITE. (boolean)
-#ITEM                      Counter for removing _1, _2, _3... strings
-                           in TITLE, CHAPTER_TITLE, etc.
-#L_LENGTH_FOR_EPI          Stores line length at top of doc for use
-                           with EPIGRAPH when columns are on
-#L_MARGIN_DIFF             Difference between DOC_L_MARGIN and
-                           L_MARGIN
-#LEFT_CAP_HEIGHT           Cap height of left string in headers/footers
-#VALID_BASELINE            Calculates vert. position of next valid
-                           baseline in SHIM
-#LETTER_STYLE              1=BUSINESS 2=PERSONAL
-#LINEBREAK                 Did we have a linebreak? (boolean)
-#LINEBREAK_COLOR           Colorize linebreak? (boolean)
-#LINENUMBER_COLOR          Colorize linenumbers? (boolean)
-#LINENUMBERS               Holds various states of line-numbering when
-                           line numbering is enabled
-#LINES_PER_PAGE            # of lines (at DOC_LEAD) that fit on
-                           page after #B_MARGIN is set
-#LN                        Are line numbers on? (boolean)
-MN-active                  Are we doing a margin note? (boolean)
-MN-curr                    Current margin note
-MN-div-&lt;n&gt;-depth           Depth of margin note &lt;n&gt;
-MN-hy                      Hyphenation flag of margin notes
-#MNinit                    Have margin notes been initialized? (boolean)
-#MNinit_DEFERRED           Did we have to defer a margin note? (boolean)
-MN-last-pos                Baseline of previous margin note
-MN-lead-adj                Difference between the current DOC_LEAD and the
-                           leading used in margin notes
-MN-left                    Number of current left margin note
-MN-left-start              Horizontal start position of left margin note
-MN-left-width              Width of left margin note
-MN-right                   Number of current right margin note
-MN-right-start             Horizontal start position of right margin note
-MN-right-width             Width of right margin note
-MN-sep                     Gutter between margin notes and running text
-MN-shifted                 Did we have to shift a margin note down? (boolean)
-MN-size                    Point size of margin notes
-MN-spacing                 Leading of margin notes
-#MISC_&lt;n&gt;            Used to print "next" misc lines in DO_COVER
-#MISC_COVER_NUM            Number of cover misc items
-#MISC_DOCCOVER_NUM         Number od doc cover misc items
-#MISC_NUM                  Number of MISC items
-#MISCS                     =#MISC_NUM in DO_COVER
-#MN_OVERFLOW_LEFT          If 1, left margin note text overflows
-#MN_OVERFLOW_RIGHT         If 1, right margin note text overflows
-#n%_AT_PAGENUM_SET         Page # from n% when PAGENUMBER invoked
-#NEEDS_SPACE               Instruct FOOTNOTE, when called by
-                           PROCESS_FN_IN_DIVER, that if the footnote
-                           had to be deferred, the VFP must be
-                           raised by 1v (set in DIVER_FN_2_PRE)
-#NEITHER                   Should we print no covers? (boolean)
-#NEXT_AUTHOR               Supplies correct digit to AUTHOR_&lt;n&gt;
-                           when printing authors in doc header
-#NEXT_LN                   Next linenumber when \n(ln has to be stored
-                           because linenumbering suspended
-#NEXT_MISC                 Incrementing counter for misc lines in
-                           DO_COVER
-#NEXT_SUBTITLE             Incrementing register used to print subtitles
-#no-repeat-MN-left         Don't repeat left margin note (boolean)
-#no-repeat-MN-right        Don't repeat right margin note (boolean)
-#NO_BACK_UP                Instructs FN_OVERFLOW_TRAP not to
-                           subtract 1 line of footnote lead from
-                           FN_OVERFLOW in a PREV_FN_DEFERRED
-                           situation.
-#NO_BREAK                  Set to 1 in COLLATE if last line of
-                           text before COLLATE falls at the bottom
-                           of the page; instructs NEWPAGE to use
-                           'br instead of .br
-#NO_COLUMNS                Don't print document in columns (boolean)
-#NO_FN_MARKER              Don't print footnote markers (boolean)
-#NO_SHIM                   Should SHIM shim? (boolean)
-#NO_SPACE                  When para spacing is active, instructs
-                           PP not to add space after a quote or blockquote.
-#NO_TRAP_RESET             Should we reset page traps? (boolean)
-#NOT_YET_ADJUSTED          Line on which a footnote was called has not yet
-                           been adjusted by groff (boolean)
-#NUM_AUTHORS               # of authors mod 2 to test if odd or even
-                           # of authors
-#NUM_MISCS                 Number of args passed to MISC
-#NUM_MISCS_COVER           Number of args passed to MISC COVER
-#NUM_MISCS_DOCCOVER        Number of args passed to MISC DOC_COVER
-#NUMBER_HEAD               Are heads numbered? (boolean)
-#NUMBER_PH                 Are paraheads numbered? (boolean)
-#NUMBER_SH                 Are subheads numbered? (boolean)
-#NUM_COLS                  Number of columns per page
-#NUMBERED                  If set to 1, lets PARAHEAD know that
-                           main- and subhead numbers have already been prefixed
-                           to the parahead string
-#NUM_FIELDS                Incrementing register used to match
-                           #TOTAL_FIELDS
-#OK_PROCESS_LEAD           Initial processing of TOC and endnote
-                           leading is deferred until OK_PROCESS_LEAD=1
-#ORIGINAL_B_MARGIN         The value for #B_MARGIN as set by the
-                           macro B_MARGIN
-#ORIG_DOC_LEAD             DOC_LEAD before endnotes, bibliographies, tocs
-#ORIG_L_LENGTH             \\n(.l before starting LISTs
-#ORIGINAL_DOC_LEAD         The lead for PRINT_STYLE 1 as set in
-                           PRINTSTYLE; required so that PRINT_STYLE 1
-                           footnotes have an unadjusted lead of
-                           12 points
-#OVERFLOW                  Signals to FOOTNOTE that some of the
-                           footnote text won't fit on the page
-#OVERFLOW_LEFT             Does left margin note overflow? (boolean)
-#OVERFLOW_RIGHT            Does right margin note overflow? (boolean)  
-#P                         Page number for margin notes
-#PAD_LIST_DIGITS&lt;n&gt;        Pad LIST digits for LIST &lt;n&gt;? (boolean)
-#PAGE_NUM_ADJ              What to add to n% to get #PAGENUMBER
-#PAGE_NUM_H_POS            1=left 2=CENTER 3=right; default=2
-#PAGE_NUM_COLOR            Colorize pagenumbers? (boolean)
-#PAGE_NUM_HYPHENS          Print hyphens surrounding page numbers?
-                           (boolean)
-#PAGE_NUM_HYPHENS_SET      Did user set (or unset) hyphens around page
-                           numbers? (boolean)
-#PAGE_NUM_POS_SET          Did user set page number position? (boolean)
-#PAGE_NUM_SET              Test if PAGE_1_NUM was used to set 1st page
-                           number
-#PAGE_NUM_V_POS            1=top 2=bottom; default=2
-#PAGE_NUMS                 Print page numbers? (boolean)
-#PAGE_POS                  Exact position on page during a diversion
-                           (required for collecting footnotes inside
-                           a diversion)
-#PAGE_TOP                  \n(nl after HEADER completes itself
-#PAGENUM_STYLE_SET         Did we set pagenumber style? (boolean)
-#PAGENUMBER                The page number
-#PAGES                     Number of blank pages to output
-#PAGINATE                  Are we paginating? (boolean)
-#PAGINATE_TOC              Is toc pagination on? (boolean)
-#PAGINATE_WAS_ON           Keeps track of pagination state while
-                           outputting blank pages
-#PAGINATION_STATE          Saves pagination state in COLLATE for use in
-                           START after a COLLATE
-#PAGINATION_WAS_ON         Was pagination on? - used in FINIS (boolean)
-#PH_COLOR                  Colorize paraheads? (boolean)
-#PH_INDENT                 Size of parahead indent
-#PH_NUM                    Parahead number
-#PP                        0 at first para; auto-increments
-#PP_AT_PAGE_BREAK          # of last (incl. partial) para on page
-#PP_INDENT                 How much to indent paras
-#PP_SPACE                  Put space before paras? (boolean)
-#PP_SPACE_SUSPEND          Suspend para spacing for blockquotes and
-                           epigraphs
-#PP_STYLE_PREV             In footnotes, stores PP style in effect
-                           prior to invoking FOOTNOTE
-#PP_STYLE                  Regular para=1; quote or epi para=2
-#PRE_COLLATE               Set to 1 in COLLATE; prevents FAMILY
-                           from clobbering a user-set DOC_FAMILY
-#PREFIX_CH_NUM             Prefix the chapter number to numbered
-                           heads, subheads and/or paraheads? (boolean)
-#PREV_FN_DEFERRED          Was previous footnote deferred? (boolean)
-#PRINT_PAGENUM_ON_PAGE_1   Should we print the page number on first
-                           page of doc when footers are on? (boolean)
-#PRINT_STYLE               Typewrite=1, typeset=2
-#PT_SIZE_IN_UNITS          Stored value of \n[.ps] from last time
-                           PT_SIZE was called
-#Q_AUTOLEAD                Register created by QUOTE_AUTOLEAD
-#Q_DEPTH                   Depth of quote
-#Q_FITS                    Does this quote fit on one page/column?
-                           (boolean)
-#Q_LEAD                    Leading of quotes
-#Q_LEAD_DIFF               Difference between leading of running text
-                           and the leading used in quotes/blockquotes
-#Q_LEAD_REAL               Leading of quotes and blockquotes saved at the
-                           ends of their respective diversions
-#Q_L_LENGTH                Line length of quotes
-#Q_OFFSET                  Page offset for quotes
-#Q_OFFSET_VALUE            Factor by which to multiply PP_INDENT to
-                           offset quotes
-#Q_PARTIAL_DEPTH           The amount of a quote/blockquote that fits at
-                           the bottom of a page when a quote/blockquote
-                           spans pages
-#Q_PP                      In PP, stores para # in QUOTE.  Removed in
-                           ENDQUOTE.
-#Q_SPACE_ADJ               The flexible amount of whitespace to add before
-                           and after a quote/blockquote
-#Q_TOP                     Vertical place on page that a quote starts
-#QUOTE                     1=PQUOTE, 2=BQUOTE
-#QUOTE_COLOR               Colorize quotes (poetic)? (boolean)
-#QUOTE_LN                  Linenumber quotes? (boolean)
-#RECTO_VERSO               Switch HEADER_LEFT and HEADER_RIGHT on
-                           alternate pages? (boolean)
-ref*suppress-period        Suppress period at end of ref field? (boolean)
-ref*type                   Kind of reference we're building
-#REF                       Was REF called? (boolean)
-#REF_HY                    Hyphenate REFs? (boolean)
-#REF_WARNING               Have we issued a ref warning? (boolean)
-#REPEAT                    Number of times to repeat linebreak
-                           character
-#RERUN_TRAPS               Should we invoke TRAPS? (boolean)
-#RESERVED_SPACE            Just enough room to put 1 more line of
-                           footnotes on the page
-#RESET_EN_PP               Holds value of register #EN_PP_INDENT
-#RESET_EN_PP_INDENT        Holds value of register #EN_PP_INDENT
-#RESET_FN_COUNTERS         1 = "moved" footnote collected in a diversion
-                           2 = "deferred" fn collected in a diversion
-#RESET_FN_NUMBER           Should fn# start at 1 on every page?
-                           (boolean)
-#RESET_L_LENGTH            Stores current line length when necessary
-#RESET_PARA_SPACE          Holds current value of boolean register
-                           #PP_SPACE
-#RESET_PP_INDENT           Stores value of PP_INDENT when needed
-#RESET_QUOTE_SPACING       Stores value of boolean register
-                           #FULLSPACE_QUOTES (used in endnotes)
-#RESTORE_ADJ_DOC_LEAD      Stores value of #ADJ_DOC_LEAD whenever needed
-#RESTORE_B_MARGIN          Stores #B_MARGIN whenever needed
-#RESTORE_DOC_LEAD          Stores value of current doc lead (used in
-                           endnotes)
-#RESTORE_HY                Restore hyphenation after .][? (boolean)
-#RESTORE_INDENT            Store \n(.i whenever needed
-#RESTORE_L_LENGTH          Stores \n(.l whenever needed
-#RESTORE_LN_NUM            Should we restore line numbering? (boolean)
-#RESTORE_OFFSET            Page offset at moment footer trap is sprung;
-                           not currently used
-#RESTORE_TOC_PN_PADDING    Saves #TOC_PN_PADDING in TOC prior to
-                           processing $FIRST_DOC_TITLE
-#RESTORE_UNDERLINE         Instructs CODE OFF to restore underlining of italics
-                           (TYPEWRITE) if underlining was formerly on 
-#RIGHT_CAP_HEIGHT          Cap height of right string in
-                           headers/footers
-#RULED                     Tells FOOTNOTE if a rule (or space has been
-                           put above the first footnote on the page
-#RUNON_FN_IN_DIVER         If #LN=1, if we're in a (block)quote, instructs
-                           FOOTNOTE to unformat diversion RUNON_FN_IN_DIVER
-#RUNON_FOOTNOTES           If #LN=1, instructs FOOTNOTE to unformat
-                           diversion RUNON_FOOTNOTES
-#RUN_ON                    Are we using run-on footnotes? (boolean)
-#SAVED_DIVER_FN_COUNT      In the case of a footnote inside a
-                           diversion that should be treated as a
-                           "normal" footnote, FOOTNOTE needs to
-                           distinguish between a "normal" deferred
-                           footnote (always the 1st footnote on the
-                           page) and one that only looks as if
-                           it should be deferred, when, in fact,
-                           it's an overflow; this register lets
-                           FOOTNOTE know whether the diversion
-                           footnote is, in fact, the first on the
-                           page.
-#SAVED_DOC_LEAD            Stored value of #DOC_LEAD (used in DEFAULTS after a COLLATE)
-#SAVED_FN_COUNT            #FN_COUNT+1 prior to +#FN_COUNT; used
-                           in FOOTNOTES while gathering fns inside
-                           diversions
-#SAVED_FN_COUNT_FOR_COLS   #FN_COUNT_FOR_COLS+1 prior to
-                           +#FN_COUNT_FOR_COLS; used in FOOTNOTES
-                           while gathering fns inside diversions
-#SAVED_FN_DEPTH_1          Footnote depth prior to adding footnote
-                           diversion depth to FN_DEPTH; used when
-                           footnote text will overflow
-#SAVED_FN_DEPTH_2          Footnote depth after to adding footnote
-                           diversion depth to FN_DEPTH; used when
-                           footnote text will overflow
-#SAVED_FN_NUMBER           Stores current FN_NUMBER whenever needed
-#SAVED_FOOTER_POS          Position of FOOTER in DO_QUOTE (hack)
-#SAVED_LEAD                In FOOTER and DO_FOOTER, stores the
-                           lead in effect prior to outputting
-                           FOOTNOTES or performing either
-                           PROCESS_FN_LEFTOVER or
-                           PROCESS_FN_IN_DIVERSION; both the
-                           diversion FOOTNOTES and the two macros
-                           have, for PRINT_STYLE 2, an AUTOLEAD
-                           call, which requires that an LS be
-                           performed with the #SAVED_LEAD in
-                           order to remove register #AUTO_LEAD or
-                           #AUTO_LEAD_FACTOR.
-#SAVED_UNDERSCORE_WEIGHT       Stores underscore weight whenever needed
-#SAVED_UNDERSCORE_WEIGHT_ADJ   SAVED_UNDERSCORE_WEIGHT/2
-#SAVED_VFP                 Store variable footer position whenever needed
-#SAVED_WEIGHT              Stores weight given to RULE_WEIGHT whenever needed
-#SAVED_WEIGHT_ADJ          SAVED_UNDERSCORE_WEIGHT/2
-#SEP_TYPE                  Set to 1 if LIST separator is ( or [ or {
-#SH_COLOR                  Colorize subheads? (boolean)
-#SH_LEAD_ADJUST            #DOC_LEAD/8 (TYPESET) or /2 (TYPEWRITE)
-                           (used for subhead spacing)
-#SH_NUM                    Subhead number
-#SHIM                      Amount of lead required to advance to
-                           next valid baseline
-#SILENT_BQUOTE_LN          "Silently" linenumber blockquotes? (boolean)
-#SILENT_QUOTE_LN           "Silently" linenumber quotes? (boolean)
-#SINGLE_SPACE              Is TYPEWRITE in single space mode? (boolean)
-#SKIP_FOOTER               If 1, instructs DO_FOOTER to do nothing
-                           if B_MARGIN falls below FOOTER_MARGIN
-#SLANT_MEANS_SLANT         For TYPEWRITE. (boolean)
-#SLANT_WAS_ON              Keeps track of SLANT when it needs to go off
-                           for a while
-#SPACE_REMAINING           Space remaining to footer trap; used to
-                           decide whether or not to defer a footnote
-#SPACE_TO_FOOTER           Distance to FOOTER trap; used to calculate
-                           available space when FOOTNOTE is called inside
-                           a diversion
-#SR_ADJ_FACTOR             An adjustment factor that compensates
-                           for the fact that #SPACE_REMAINING
-                           sometimes reports a fractionally larger
-                           space than is actually available for
-                           footnote text.
-#START                     If 1, signals completion of START
-#START_FOR_FOOTERS         Toggle set in START; signals to
-                           PRINT_HDRFTR that START has been invoked,
-                           allowing PRINT_HDRFTR to decide whether or
-                           not to print a footer on page 1
-#START_FOR_MNinit          If 1, defer processing MN_INIT until #START
-#STORED_PP_INDENT          Temporarily holds value of #PP_INDENT
-#SUBTITLE_COLOR            Colorize subtitle? (boolean)
-#SUBTITLE_COVER_NUM        Incrementing register used to define strings
-                           $SUBTITLE_COVER_&lt;n&gt;
-#SUBTITLE_DOCCOVER_NUM     Incrementing register used to define strings
-                           $SUBTITLE_DOCCOVER_&lt;n&gt;
-#SUBTITLE_NUM              Incrementing register used to define strings
-                           $SUBTITLE_&lt;n&gt;
-#SUBTITLES                 Holds number of subtitle items
-#SUITE                     Current page number (for letters)
-#SUP_PT_SIZE               Point size of superscript
-#SUSPEND_PAGINATION        Suspend pagination prior to endnotes?
-#SWITCH_HDRFTR             Switch HDRFTR_LEFT and HDRFTR_RIGHT?
-                           (boolean)
-#T_MARGIN_LEAD_ADJ         \n(.v-12000; ensures critically accurate
-                           placement of first lines on pages when
-                           doc processing is not being used and
-                           a T_MARGIN has been set
-#TAB_OFFSET#               "#" at the end is from $CURRENT_TAB
-#TERMINATE                 Has TERMINATE been called? (boolean)
-#TITLE_COLOR               Colorize title? (boolean)
-#TITLE_NUM                 Number of title items
-#TOC_AUTHORS               Whether to append author(s) to toc doc
-                           title entries (boolean)
-#TOC_ENTRY_PN              Current page number when a toc entry is
-                           collected
-#TOC_FIRST_PAGE            If 1, tells PRINT_PAGE_NUMBER that this
-                           is the first page of the toc
-#TOC_LEAD                  Leading of toc pages
-#TOC_PN_PADDING            Max. # of placeholders for toc entries
-                           page numbers
-#TOC_PS                    Point size of toc pages
-#TOC_RV_SWITCH             Switch L/R margins of toc pages
-#TOC_HEAD_INDENT           Indent of toc head entries
-#TOC_HEAD_SIZE_CHANGE      ps in/decrease of toc head entries****
-#TOC_PH_INDENT             Indent of toc parahead entries
-#TOC_PH_SIZE_CHANGE        ps in/decrease of toc parahead entries****
-#TOC_SH_INDENT             Indent of toc subhead entries
-#TOC_SH_SIZE_CHANGE        ps in/decrease of toc subhead entries****
-#TOC_TITLE_INDENT          Indent of toc doc title entries
-#TOC_TITLE_SIZE_CHANGE     ps in/decrease of toc doc title entries****
-#TOTAL_FIELDS              Total number of letter header fields
-#TRAP                      \n(.t-1 (used in DO_QUOTE)
-#UNDERLINE_ITALIC          For TYPEWRITE. (boolean)
-#UNDERLINE_ON              Was UNDERLINE called? (boolean)
-#UNDERLINE_QUOTES          Was UNDERLINE_QUOTES called? (boolean)
-#UNDERLINE_QUOTE           Underline pquotes? (boolean)
-#UNDERLINE_SLANT           For TYPEWRITE. (boolean)
-#UNDERLINE_WAS_ON          In HEADER to re-enable running text
-                           UNDERLINE (boolean)
-#USER_DEF_HDRFTR_CENTER    Has user defined hdrftr center? (boolean)
-#USER_DEF_HDRFTR_LEFT      Has user defined hdrftr left? (boolean)
-#USER_DEF_HDRFTR_RIGHT     Has user defined hdrftr right? (boolean)
-#USER_DEF_HEADER_CENTER    User defined CENTER title? (boolean);
-                           used in COPYSTYLE
-#USER_DEF_HEADER_LEFT      User defined CENTER title? (boolean);
-                           used in COPYSTYLE
-#USER_DEF_HEADER_RIGHT     User defined CENTER title? (boolean)
-                           used in COPYSTYLE
-#USERDEF_HDRFTR            User defined single string recto/verso
-                           header/footer? (boolean)
-#USERDEF_HDRFTR_RECTO_QUAD 1=left, 2=CENTER, 3=right
-#USERDEF_HDRFTR_VERSO_QUAD 1=left, 2=CENTER, 3=right
-#VARIABLE_FOOTER_POS       Wandering trap position for processing
-                           footnotes and footers; pos depends on number of
-                           footnotes
-#VISUAL_B_MARGIN           Set in TRAPS, what \n(nl would report
-                           on the last line of running text before
-                           FOOTER is sprung.
-#VFP_DIFF                  #FN_DEPTH minus #SAVED_FN_DEPTH; the
-                           number of footnote lines that will fit
-                           on the page when there will be over, and
-                           therefore the amount by which to raise
-                           the VFP for footnotes with overflow after
-                           the 1st footnote.
-y                          Vertical position stored with mk in hdrftrs.
+  PROCESS_SHIM         Calculates #SHIM when \n[.d] is lower on the
+                         page than #T_MARGIN
+  PROCESS_FN_IN_DIVER  Processes footnotes gathered in a diversion (called
+                         at page/column breaks)
+  REMOVE_INDENT        Removes indents set with CHECK_INDENT
+  Q_FITS               Handles spacing of quotes when quote fits on the page
+  Q_NOFIT              Handles spacing of quotes when quote does not fit on
+                         the page
+  QUIT_LISTS           Exit lists cleanly and completely
+  SET_LIST_INDENT      Restore indent of a prev. level of list
+  SHIM                 Advance to next "valid" baseline
+  TERMINATE            .em that ensures deferred footnotes get output
+                         on final pages
+  TRAPS                Sets hdrftr traps; optionally adjusts #DOC_LEAD
+                         to fill page to #B_MARGIN
+  TYPEWRITER           Sets family (C), font (R) and point size (12)
+                         for PRINTSTYLE TYPEWRITE
+  VFP_CHECK            Trap-sprung macro 1 valid baseline higher than
+                         where FOOTER will be sprung; checks whether
+                         there is, in fact, just enough room for
+                           another line of running text to be added to
+                         the page without jamming footnotes too close
+                         to running text.
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++DIVERSIONS+++</span>
+
+  B_QUOTE           Block (indented) quote text
+  CLOSING           Closing (i.e. Yours truly,)
+  EPI_TEXT          Epigraph text
+  END_NOTES         Endnotes text
+  FN_IN_DIVER       Footnotes gathered from inside a diversion
+  FN_OVERFLOW       Excess footnotes when B_MARGIN is reached
+  FOOTNOTES         Text of footnotes
+  GREETING          Full salutation (e.g. Dear John Smith,)
+  LETTERHEAD&lt;n&gt;     Date, addresser, addressee or greeting;
+                      &lt;n&gt; is from 1 to 4, supplied by #FIELD
+  P_QUOTE           Line for line (poetic) quote text
+  RUNON_FOOTNOTES   Special diversion for run-on footnotes
+  RUNON_FN_IN_DIVER Special diversion for run-on footnotes inside
+                      (block)quotes
+  TOC_ENTRIES       TOC entries
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++NUMBER REGISTERS+++</span>
+
+  #ADJ_BIB_LEAD              Adjust BIB_LEAD? (boolean)
+  #ADJ_DOC_LEAD              Adjust DOC_LEAD? (boolean)
+  #ADJ_EN_LEAD               Adjust EN_LEAD? (boolean)
+  #ADJ_TOC_LEAD              Adjust TOC_LEAD? (boolean)
+  #ADVANCE_FROM_TOP          Distance from page top to start of
+                               running text if no docheader
+  #ARG_NUM                   Keeps track of number of args passed to a
+                               macro
+  #ARGS_TO_LIST              Was LIST passed some args? (boolean)
+  #ATTRIBUTE_COLOR           Colorize attribute string? (boolean)
+  #AUTHOR_&lt;n&gt;                Strings passed to AUTHOR
+  #AUTHOR_COLOR              Colorize author(s)? (boolean)
+  #AUTHOR_COVER_NUM          Incrementing register used in definining
+                               $AUTHOR_COVER_&lt;n&gt; strings
+  #AUTHOR_DOCCOVER_NUM       Incrementing register used in definining
+                               $AUTHOR_COVER_&lt;n&gt; strings
+  #AUTHOR_NUM                Keeps track of user-defined string
+                               AUTHOR_&lt;n&gt; in AUTHOR
+  #AUTHORS                   Equals final value of AUTHOR_NUM;
+                               used for authors in doc header
+  #BASELINE_MARK             In PP, the vertical position on the page
+                               (when paragraph spacing is on) after a
+                               quote or blockquote has been output and
+                               the post-quote space has been added.
+  #BMARG                     Position of unvarying bottom margin
+                               during doc processing; required for
+                               collecting footnotes inside diversions
+  #BIB_ALLOWS_HEADERS        Put headers on bib pages? (boolean)
+  #BIB_ALLOWS_HEADERS_ALL    Put headers on all bib pages? (boolean)
+  #BIB_FIRST_PAGE            Tells PRINT_PAGE_NUMBER about bibliography
+                               first page number
+  #BIB_FIRST_PN              Starting pagenumber for bibliographies
+  #BIB_HDRFTR_CENTER         Put a center string in bib page headers?
+                               (boolean)
+  #BIB_LEAD                  Bibliography lead, expressed in points
+  #BIB_LIST                  Output bibs in list style? (boolean)
+  #BIB_NO_COLS               De-columnize bibliographies? (boolean)
+  #BIB_NO_FIRST_PN           Put a page number on the first page of
+                               bibliographies? (boolean)
+  #BIB_SINGLESPACE           Single-space TYPEWRITE bibliographies? (boolean)
+  #BIB_SPACE                 Post item space for bibliography pages
+  #BIB_STRING_ADVANCE        Vertical position of "BIBLIOGRAPHY" string
+                               (relative to the top edge of the page)
+  #BIB_STRING_CAPS           Capitalize bib title? (boolean)
+  #BIB_STRING_UNDERLINE      Underscore bib title? 0=no; 1=yes; 2=double
+  #BIB_STRING_UNDERLINE_WEIGHT       Underline weight in units
+  #BIB_STRING_UNDERLINE_WEIGHT_ADJ   Underline weight/2
+  #BIB_PS                    Base point size for bibliography pages expressed
+                               in points
+  #BIBLIOGRAPHY              Are we doing a bib page? (boolean)
+  #BQ_AUTOLEAD               Register created by BLOCKQUOTE_AUTOLEAD
+  #BQ_LEAD                   Leading of blockquotes
+  #BQUOTE_COLOR              Colorize blockquotes? (boolean)
+  #BQUOTE_LN                 Number blockquotes? (boolean)
+  #BROKEN_QUOTE              Did we invoke BREAK_QUOTE? (boolean)
+  #CAP_HEIGHT_ADJUST         Tallest cap height of strings LEFT, CENTER,
+                               and RIGHT in footers; used to place rule
+                               over footer
+  #CAPS_WAS_ON               In HDRFTR, to re-enable running text CAPS
+                               (boolean)
+  #CENTER_CAP_HEIGHT         Cap height of CENTER string in
+                               headers/footers
+  #CH_NUM                    The chapter number obtained by
+                               PREFIX_CHAPTER_NUMBER
+  #CHAPTER_CALLED            Has CHAPTER been invoked? (boolean); used
+                               by PREFIX_CHAPTER_NUMBER to see whether
+                               to try to get the chapter number from
+                               the arg passed to CHAPTER
+  #CHAPTER_TITLE_NUM         Incrementing register used to define strings
+                               $CHAPTER_TITLE_&lt;n&gt;
+  #CHAPTER_TITLE_COLOR       Colorize chapter title? (boolean)
+  #CLOSING                   Is there a closing (for letters)? (boolean)
+  #CODE_COLOR                Colorize CODE? (boolean)
+  #CODE_SIZE_ADJ             Percentage by which to scale CODE font
+  #COL_L_LENGTH              Line length of columns
+  #COL_&lt;n&gt;_L_MARGIN          Left margin of column &lt;n&gt;
+  #COL_NEXT                  Was COL_NEXT invoked? (boolean; used in
+                               FOOTER)
+  #COL_NUM                   Incrementing counter of num of columns;
+                               for use with #COL_&lt;n&gt;_L_MARGIN
+  #COL_TOTAL                 #COL_L_LENGTH + #GUTTER; used to calculate
+                               #COL_&lt;n&gt;_L_MARGIN
+  #COLLATE                   Are we performing a COLLATE? (boolean)
+  #COLLATED_DOC              If 1, instructs TOC that this is a collated
+                               doc
+  #COLUMNS                   Are columns turned on? (boolean)
+  #COLUMNS_WERE_ON           Stores columnar state prior to outputting
+                               endnotes in no-columns mode
+  #COPY_STYLE                1=draft, 2=final
+  #COUNTERS_RESET            Tells FOOTNOTE if fn counters have
+                               been reset because of footnotes gathered
+                               inside a diversion
+  #COVER                     Print a COVER? (boolean)
+  #COVER_ATTRIBUTE_COLOR     Colorize cover attribution string? (boolean)
+  #COVER_AUTHOR              Put AUTHOR(s) on COVER? (boolean)
+  #COVER_AUTHOR_COLOR        Colorize cover author(s)? (boolean)
+  #COVER_BLANKPAGE           Output blankpage after COVER? (boolean)
+  #COVER_COLOR               Colorize COVER? (boolean)
+  #COVER_COPYRIGHT           Put copyright on COVER? (boolean)
+  #COVER_COPYRIGHT_COLOR     Colorize cover copyright line? (boolean)
+  #COVER_DOCTYPE             Put doctype on COVER? (boolean)
+  #COVER_DOCTYPE_COLOR       Colorize cover doctype? (boolean)
+  #COVER_END                 Are we ending a COVER? (boolean)
+  #COVER_LEAD                Cover leading
+  #COVER_MISC                Put misc on COVER? (boolean)
+  #COVER_MISC_COLOR          Colorize cover misc line? (boolean)
+  #COVER_RULE_WEIGHT         Doctype underline weight on COVER
+  #COVER_RULE_WEIGHT_ADJ     COVER_RULE_WEIGHT/2
+  #COVER_START_POS           Vertical starting pos of cover material
+  #COVER_SUBTITLE            Put subtitle on COVER? (boolean)
+  #COVER_TITLE               Put title on COVER? (boolean)
+  #COVER_TITLE_NUM           Number of cover title items
+  #COVER_TITLE_COLOR         Colorize cover title? (boolean)
+  #COVER_SUBTITLE_COLOR      Colorize cover subtitle? (boolean)
+  #COVER_UNDERLINE           Underline doctype on COVER? (boolean)
+  #COVER_UNDERLINE_WEIGHT       Doctype underline weight on COVER
+  #COVER_UNDERLINE_WEIGHT_ADJ   COVER_UNDERLINE_WEIGHT/2
+  #CURRENT_V_POS             \n[.d] ; used in SHIM
+  #COVERS                    Print covers? (boolean)
+  #COVERS_COUNT              Include COVER in pagination scheme? (boolean)
+  #COVERS_OFF                Don't print COVERs (boolean)
+  #DATE_FIRST                Was .DATE invoked as first letter
+                               header after .START? (boolean)
+  dc                         "mark" register for document columns
+  #DIVER_FN                  Register that tells FOOTNOTE whether to
+                               "move" or "defer" a footnote collected
+                               inside a diversion
+  #DEFER_BIB_SPACING         Tells DEFAULTS to do BIBLIOGRAPHY_SPACING
+                               if it was called before START
+  #DEFER_PAGINATION          Tells COLLATE to restore pagination (from
+                               RESTORE_PAGINATION
+  #DEFER_SPACE_ADDED         Was space added between two "first" footnotes that
+                               appear on the same page? (boolean)
+  #DELAY_SHIM                Instructs DO_QUOTE to delay SHIM when quote
+                               falls at the top of a page
+  #DEPTH                     LIST depth
+  #DEPTH_1                   Doc header depth with lead adjustment
+                               (#DOCHEADER_LINES * #DOCHEADER_LEAD)
+  #DEPTH_2                   Doc header depth without lead adjustment
+                               (#DOCHEADER_LINES * #DOC_LEAD)
+  #DEPTH_TO_B_MARGIN         Page length minus #B_MARGIN
+  #DIVERSIONS_HY_MARGIN      A reasonable value for .hym applied to
+                               QUOTE, BLOCKQUOTE and EPIGRAPH to
+                               avoid excessive hyphenation if these are
+                               set quad left
+  #DIVERTED                  Set to 1 in DIVERT_FN_OVERFLOW; reset
+                               subsequently in FOOTNOTES when called by
+                               PROCESS_FN_LEFTOVER to 2 or 3 for use by
+                               FOOTER to decide whether to in/decrease
+                               #FN_DEPTH when outputting footnotes
+  #DOC_COVER                 Are we doing a DOC_COVER? (boolean)
+  #DOC_COVER_AUTHOR          Put AUTHOR(s) on DOC_COVER? (boolean)
+  #DOCCOVER_BLANKPAGE        Output blank page after DOC_COVER? (boolean)
+  #DOC_COVER_CHAPTER_TITLE_COLOR  Colorize CHAPTER_TITLE on DOC_COVER? (boolean)
+  #DOC_COVER_COPYRIGHT       Put copyright on DOC_COVER? (boolean)
+  #DOC_COVER_DOCTYPE         Put doctype on DOC_COVER? (boolean)
+  #DOCCOVER_END              Are we finishing a DOC_COVER? (boolean)
+  #DOC_COVER_LEAD            Doc cover leading
+  #DOC_COVER_MISC            Put misc on DOC_COVER? (boolean)
+  #DOC_COVER_START_POS       Vertical starting pos of doc cover material
+  #DOC_COVER_COLOR           Colorize cover? (boolean)
+  #DOC_COVER_START_POS       Vertical starting pos of cover material
+  #DOC_COVER_TITLE_COLOR     Colorize doc cover title? (boolean)
+  #DOC_COVER_SUBTITLE_COLOR  Colorize doc cover subtitle? (boolean)
+  #DOC_COVER_ATTRIBUTE_COLOR Colorize doc cover attribution string? (boolean)
+  #DOC_COVER_AUTHOR_COLOR    Colorize doc cover author(s)? (boolean)
+  #DOC_COVER_DOCTYPE_COLOR   Colorize doc cover doctype? (boolean)
+  #DOC_COVER_COPYRIGHT_COLOR Colorize doc cover copyright line? (boolean)
+  #DOC_COVER_MISC_COLOR      Colorize doc cover misc line? (boolean)
+  #DOC_COVER_SUBTITLE        Put subtitle on DOC_COVER? (boolean)
+  #DOC_COVER_TITLE           Put title on DOC_COVER? (boolean)
+  #DOC_COVER_TITLE_NUM       Number of doc cover title items
+  #DOC_COVERS                Print doc covers? (boolean)
+  #DOC_COVERS_OFF            Don't print DOC_COVERs (boolean)
+  #DOCCOVER_RULE_WEIGHT      Doctype underline weight on DOC_COVER
+  #DOCCOVER_RULE_WEIGHT_ADJ  DOCCOVER_RULE_WEIGHT/2
+  #DOCCOVER_UNDERLINE        Underline doctype on DOC_COVER? (boolean)
+  #DOCCOVER_UNDERLINE_WEIGHT      Doctype underline weight on DOC_COVER
+  #DOCCOVER_UNDERLINE_WEIGHT_ADJ  DOCCOVER_UNDERLINE_WEIGHT/2
+  #DOCCOVERS_COUNT           Include DOC_COVER in pagination scheme? (boolean)
+  #DOC_HEADER                Whether to print a doc header (boolean)
+  #DOC_LEAD_ADJ              Incrementing value (in units) added to
+                               #DOC_LEAD to fill page to #B_MARGIN
+  #DOC_LEAD                  Leading used in body
+  #DOC_L_LENGTH              Global L_LENGTH
+  #DOC_L_MARGIN              Global L_MARGIN
+  #DOC_LR_MARGIN_TMP         In HEADER, if RECTO_VERSO=1, temporarily
+                               holds DOC_L_MARGIN during page margin switch
+  #DOC_PT_SIZE               Point size used for body text
+  #DOC_R_MARGIN              Global R_MARGIN
+  #DOC_TYPE                  1=default, 2=chapter, 3=named, 4=letter
+  #DOCHEADER_ADVANCE         Distance from top-of-page to baseline of
+                               docheader
+  #DOCHEADER_COLOR           Colorize docheader? (boolean)
+  #DOCHEADER_DEPTH           Depth of docheader
+  #DOCHEADER_LEAD            Lead of doc header
+                               (#DOC_LEAD + #DOCHEADER_LEAD_ADJ)
+  #DOC_LEAD_ADJUST_OFF       Don't adjust DOC_LEAD (boolean)
+  #DOCS                      Always 1 after START
+  #DOCTITLE_NUM              Number of doctitle items
+  #DOCTYPE_COLOR             Colorize doctype? (boolean)
+  #DOCTYPE_RULE_WEIGHT       Doctype underline weight
+  #DOCTYPE_RULE_WEIGHT_ADJ   DOCTYPE_RULE_WEIGHT/2
+  #DOCTYPE_UNDERLINE         Underline doctype? (boolean)
+  #DOCTYPE_UNDERLINE_WEIGHT       Weight of doctype underline
+  #DOCTYPE_UNDERLINE_WEIGHT_ADJ   DOCTYPE_UNDERLINE_WEIGHT/2
+  #DOING_COVER               Tells PRINT_AUTHORS that it's printing
+                               the authors for a cover or doc cover
+  #DONE_ONCE                 Keeps track of how many times footnotes
+                               have been collected inside the same diversion
+  #DONT_RULE_ME              Rule this (apparent) first footnote? (boolean)
+  #DIVER_LN_OFF              Turn linenumbering off in (block)quotes?
+                               (boolean)
+  #DRAFT_WITH_PAGENUM        Are we attaching draft/revision info to page
+                               number? (boolean)
+  #EM_ADJUST                 Amount to raise \(em at END
+  #EN_ALLOWS_HEADERS         Put page headers on endnotes pages? (boolean)
+  #EN_ALLOWS_HEADERS_ALL     Put page headers on all endnotes pages?
+                               (boolean)
+  #EN_BQ_AUTOLEAD            Register created by EN_BLOCKQUOTE_AUTOLEAD
+  #EN_BQ_LEAD                Leading of blockquotes on endnotes pages
+  #EN_FIGURE_SPACE           Width of \0, for use with formatting endnotes
+  #EN_FIRST_PAGE             Tells PRINT_PAGE_NUMBER about endnotes
+                               first page number
+  #EN_FIRST_PN               Page number that appears on page 1 of
+                               endnotes pages.
+  #EN_HDRFTR_CENTER          Should we print centre string of
+                               headers/footers on endnotes pages? (boolean)
+  #EN_LEAD                   Lead of endnotes
+  #EN_LN_BRACKETS            Are we using brackets for line-numbered
+                               endnotes (boolean)
+  #EN_LN_SEP                 Are we using a separator for line-numbered
+                               endnotes (boolean)
+  #EN_MARK                   \n[ln] when \*[EN-MARK] is called
+  #EN_MARK_2                 \n[ln] when ENDNOTE is called
+  #EN_MARKER_STYLE           1=NUMBER; 2=LINE
+  #EN_NO_COLS                Do not set endnotes in columns? (boolean)
+  #EN_NO_FIRST_PN            Put pagenumber on 1st page of endnotes?
+                               (boolean)
+  #EN_NUMBER                 Number of current endnote
+  #EN_NUMBER_PLACEHOLDERS    Number of placeholders to reserve for endnotes
+                               numbers
+  #EN_NUMBERS_ALIGN_RIGHT    Hang and align endnote numbers right?
+                               (boolean)
+  #EN_NUMBERS_ALIGN_LEFT     Align endnote numbers with left margin?
+                               (boolean)
+  #EN_NUMBERS_PLACEHOLDERS   Number of placeholders when endnote numbers
+                               hang and align right
+  #EN_NUMBER_L_LENGTH        Line length for endnote numbers when they're
+                               right aligned
+  #EN_PP_INDENT              First line indent of paras in multi-para
+                               endnotes
+  #EN_PP_SPACE               Space multi-paras in endnotes? (boolean)
+  #EN_PS                     ps of endnotes
+  #EN_Q_AUTOLEAD             Register created by EN_QUOTE_AUTOLEAD
+  #EN_Q_LEAD                 Leading of quotes on endnotes pages
+  #EN_REF                    Put REFs in endnotes? (boolean)
+  #EN_SINGLESPACE            Single space endnotes pages? (boolean)
+  #EN_STRING_ADVANCE         Vertical position of "ENDNOTES" string (relative to
+                               the top edge of the page)
+  #EN_STRING_CAPS            Should ENDNOTES capitalize the endnotes
+                               string? (boolean)
+  #EN_STRING_UNDERLINE       Underscore endnotes page head? (boolean)
+  #EN_STRING_UNDERLINE_WEIGHT  Weight of endnotes page title underscore
+  #EN_STRING_UNDERLINE_WEIGHT_ADJ   EN_STRING_UNDERLINE_WEIGHT_ADJ/2
+  #EN_TEXT_INDENT            Page offset for text of endnotes when
+                               numbers right align
+  #EN_TITLE_UNDERLINE        Underscore endnotes document identifier?
+                               (boolean)
+  #EN_TITLE_UNDERLINE_WEIGHT  Weight of endnotes document identification
+                                 underscore
+  #EN_TITLE_UNDERLINE_WEIGHT_ADJ  #EN_STRING_UNDERLINE_WEIGHT_ADJ/2
+  #END_QUOTE                 For PP=0 indenting; did we just end a quote?
+                               (boolean)
+  #ENDNOTE                   Are we in an endnote? (boolean)
+  #ENDNOTE_REFS              Are REFs going to endnotes? (boolean)
+  #ENDNOTES                  Are we in an endnote (for FOOTERs; boolean)
+  #EPI_ACTIVE                Are we in an epigraph? (boolean)
+  #EPI_AUTOLEAD              Autolead value for epigraphs
+  #EPI_COLOR                 Colorize epigraphs? (boolean)
+  #EPI_DEPTH                 Depth of epigraph from first baseline to
+                               last
+  #EPI_FITS                  Does epigraph fit on page/column? (boolean)
+  #EPIGRAPH                  Did we have an epigraph? (boolean) 
+  #EPI_LEAD_DIFF             Difference between #DOC_LEAD and #EPI_LEAD
+  #EPI_LEAD                  Leading of epigraph; set by AUTOLEAD
+  #EPI_LINES_EVEN            Even # of lines at end of epi crossing page in
+                               TYPEWRITE (d-spaced)?
+  #EPI_LINES                 Number of lines in the epigraph
+  #EPI_LINES_TO_END          Number of epigraph lines remaining after
+                               footer trap is sprung
+  #EPI_LINES_TO_TRAP         Number of epigraph lines till footer trap is
+                               sprung
+  #EPI_L_LENGTH              Epigraph line length
+  #EPI_OFFSET                Left margin of epigraphs
+  #EPI_OFFSET_VALUE          Epigraph indent as a function of page offset
+  #EPI_ON                    Are we in an epigraph? (boolean)
+  #EPI_WHITESPACE            Space after epigraph to compensate for
+                               epigraph leading
+  #FIELD                     Incrementing register tacked onto LETTERHEAD
+  #FINIS                     Was FINIS invoked? (boolean)
+  #FINIS_STRING_CAPS         Capitalize finis string? (boolean)
+  #FINIS_COLOR               Colorize FINIS? (boolean)
+  #FIRST_DOC_TITLE_PN        Page number of 1st (collated) doc (for TOC)
+  #FIRST_DOC_TOC_PN_PADDING  Padding for 1st page number of 1st (collated) doc
+                               (for TOC)
+  #FN_AUTOLEAD               Autolead value of footnotes
+  #FN_BL_INDENT              Left indent of INDENT BOTH in footnotes
+  #FN_BR_INDENT              Right indent of INDENT BOTH in footnotes
+  #FN_COUNT                  Which fn marker to print; also to
+                               tell mom to reserve space for and print
+                               the rule above footnotes
+  #FN_COUNT_AT_FOOTER        The FN_COUNT after FOOTNOTES has been
+                               output in FOOTER
+  #FN_COUNT_FOR_COLS         Holds a separate footnote count for columns
+                               (so they don't reset to 0 1 until page break)
+  #FN_DEFER                  Defer footnote to next page/column? (boolean)
+                               If 0, don't defer.
+  #FN_DEFER_SPACE            Whether to deposit space before
+                               footnote 1 because there's a deferred
+                               footnote on the page
+  #FN_DEPTH                  Depth of footnote diversion(s)
+  #FN_FOR_EPI                Signals to epigraph that a footnote is being
+                               processed
+  #FN_GAP                    When there are footnotes on a page, the
+                               difference between where FOOTER will be
+                               sprung and the next valid baseline.
+                               Used in VFP_CHECK.
+  #FN_LEAD                   Lead in footnotes after FN_AUTOLEAD is
+                               applied
+  #FN_L_INDENT               Left indent of INDENT LEFT in footnotes
+  #FN_LINES                  Number of lines in fn; used to calculate
+                               fn depth
+  #FN_LN_BRACKETS            Are footnote linenumber brackets being used?
+                               (boolean)
+  #FN_LN_SEP                 Is a footnote linenumber separator being used?
+                               (boolean)
+  #FN_MARK                   \n[ln] when \*[FN-MARK] is called
+  #FN_MARK_2                 \n[nl] when FOOTNOTE is called
+  #FN_MARKER_STYLE           1=STAR; 2=NUMBER
+  #FN_MARKERS                Print footnote markers? (boolean)
+  #FN_NUMBER                 The footnote number attached to running text
+                               (and fns) when numbers instead of
+                               star/dagger is being used for footnootes
+                               numbers
+  #FN_OVERFLOW_DEPTH         Depth of leftover from footnote processing
+  #FN_OVERFLOW_TRAP_POS      The register that sets the position of
+                               trap FN_OVERFLOW_TRAP.
+  #FN_R_INDENT               Right indent of INDENT RIGHT in footnotes
+  #FN_REF                    Put REFs in footnotes? (boolean)
+  #FN_RULE                   Print fn rule? (boolean)
+  #FN_RULE_ADJ               # of points to raise footnote separator from
+                               its baseline
+  #FN_RULE_LENGTH            Length of footnote separator rule
+  #FN_RULE_WEIGHT            Weight of the footnote separator rule
+  #FN_RULE_WEIGHT_ADJ        FN_RULE_WEIGHT/2
+  #FN_WAS_DEFERED            Tells HEADER about a deferred footnote
+  #FOOTER_DIFF               In TRAPS, the difference between the
+                               original #B_MARGIN and #VISUAL_B_MARGIN
+  #FOOTER_GAP                Amount of space between end of text and
+                               page #
+  #FOOTER_MARGIN             Amount of space between page # and bottom
+                               of page
+  #FOOTER_POS                Position of footer trap (required for
+                               collecting footnotes inside a diversion)
+  #FOOTER_RULE               Print footer rule? (boolean)
+  #FOOTER_RULE_GAP           Gap between footer and separator rule above
+  #FOOTER_RULE_WEIGHT        Weight of footer rule
+  #FOOTER_RULE_WEIGHT_ADJ    #FOOTER_RULE_WEIGHT/2
+  #FOOTERS_ON                Are we using footers? (boolean)
+  #FOOTERS_WERE_ON           Were footers on? - used in FINIS and BLANKPAGE
+                               (boolean)
+  #FOOTNOTE_COLOR            Colorize footnotes? (boolean)
+  #FROM_BIB_STRING           Tells UNDERSCORE it's underscoring $BIB_STRING
+  #FROM_COVER                Tells UNDERSCORE it's underscoring on a cover
+  #FROM_DOC_COVER            Tells UNDERSCORE it's underscoring on a doccover
+  #FROM_DOCTYPE              Tells UNDERSCORE it's underscoring the doctype
+  #FROM_EN_STRING            Tells UNDERSCORE it's underscoring $EN_STRING
+  #FROM_EN_TITLE             Tells UNDERSCORE it's underscoring $EN_TITLE
+  #FROM_HEAD                 Tells UNDERSCORE it's underscoring a head
+  #FROM_DIVERT_FN            Signals to FOOTNOTE, when run from
+                               within DIVERT_FN_LEFTOVER, to set
+                               #SPACE_REMAINING to the total area
+                               allowable for running text
+  #FROM_FOOTER               In col to col footnote processing, tells
+                               FOOTNOTE that FOOTNOTES was output from
+                               FOOTER.
+  #FROM_HEADER               In col to col footnote processing, tells
+                               FOOTNOTE that FOOTNOTES was output from
+                               HEADER.
+  #FULLSPACE_QUOTES          Should we fullspace quotes? (boolean)
+  #GET_DC_HEIGHT             Used in routine to get the correct point size for
+                               dropcaps
+  #GET_DEPTH                 Signals to FOOTNOTE that it should
+                               measure the depth of current footnotes
+                               plus the most recently added one, except
+                               where the footnote is to be deferred to
+                               the next page or column
+  #GUTTER                    Width of gutter between columns
+  #HDRFTR_BOTH               Are we setting both headers and footers? (boolean)
+  #HDRFTR_CENTER_CAPS        CENTER part of header/footer in caps?
+                               (boolean; default=off)
+  #HDRFTR_CENTER_COLOR       Colorize header/footer center? (boolean)
+  #HDRFTR_COLOR              Colorize headers/footers? (boolean)
+  #HDRFTR_CTR_PAD_LEFT       Amount of hdrftr CENTER padding on the left
+  #HDRFTR_CTR_PAD_RIGHT      Amount of hdrftr CENTER padding on the right
+  #HDRFTR_CTR_PAD_TMP        Temp storage of left hdrftr CENTER padding
+                               (for recto/verso switch)
+  #HDRFTR_HEIGHT             Cap height of $HDRFTR_RECTO/$HDRFTR_VERSO
+                               strings
+  #HDRFTR_LEFT_CAPS          Left part of header/footer in caps?
+                               (boolean; default=off)
+  #HDRFTR_LEFT_COLOR         Colorize header/footer left? (boolean)
+  #HDRFTR_PT_SIZE            Initial point size of headers/footers
+  #HDRFTR_RECTO_CAPS         Header/footer recto caps? (boolean)
+  #HDRFTR_RIGHT_CAPS         Right part of header/footer in caps?
+                               (boolean; default=on)
+  #HDRFTR_RIGHT_COLOR        Colorize header/footer right? (boolean)
+  #HDRFTR_RULE               Print head/footer rule? (boolean)
+  #HDRFTR_RULE_COLOR         Colorize header/footer rule? (boolean)
+  #HDRFTR_RULE_GAP           Space between header/footer and
+                               header/footer rule
+  #HDRFTR_RULE_WEIGHT        Weight of header/footer rule
+  #HDRFTR_RULE_WEIGHT_ADJ    HDRFTR_RULE_WEIGHT/2
+  #HDRFTR_TMP_CAPS_SWITCH    Temporarily holds HDRFTR_LEFT_CAPS value if
+                               #SWITCH_HDRFTR=1
+  #HDRFTR_VERSO_CAPS         Header/footer verso caps? (boolean)
+  #HEAD                      1=main/section head 2=subhead
+  #HEAD_CAPS                 Print section titles in caps? (boolean)
+  #HEAD_COLOR                Colorize heads? (boolean)
+  #HEADER_GAP                Distance from header to running text
+  #HEAD_NUM                  Head number
+  #HEAD_SPACE                2 line spaces before heads? (boolean)
+  #HEAD_UNDERLINE            Underline heads? (boolean)
+  #HEAD_UNDERLINE_WEIGHT     Head underline weight
+  #HEAD_UNDERLINE_WEIGHT_ADJ HEAD_UNDERLINE_WEIGHT/2
+  #HEADER_MARGIN             Distance from top of page to header
+  #HEADER_RULE               Print header rule? (boolean)
+  #HEADER_RULE_GAP           Gap between header and header rule
+  #HEADER_RULE_WEIGHT        Header rule weight
+  #HEADER_RULE_WEIGHT_ADJ    HEADER_RULE_WEIGHT/2
+  #HEADERS_ON                Headers on? (boolean)
+  #HEADER_STATE              Saves header state in COLLATE for use in
+                               START after COLLATE
+  #HEADERS_WERE_ON           Were headers on? - used in BLANKPAGE (boolean)
+  #HF_OFF                    Has HEADERS_AND_FOOTERS been turned off? (boolean)
+  #HORIZ_MARK                Horizontal 
+  #HOW_MANY                  Number of blank pages to output
+  #IGNORE                    Should we ignore this macro? Set to 1 in
+                               TYPEWRITE.
+  #IN_BIB_LIST               Tells ITEM we're doing a bibliography in
+                               list style
+  #INDENT_FIRST_PARAS        Indent first paras? (boolean)
+  #INDENT_FIRSTS             Tells footnotes to leave INDENT_FIRST_PARAS
+                               alone if it's on for running text.
+  #ITALIC_MEANS_ITALIC       For TYPEWRITE. (boolean)
+  #ITEM                      Counter for removing _1, _2, _3... strings
+                               in TITLE, CHAPTER_TITLE, etc.
+  #L_LENGTH_FOR_EPI          Stores line length at top of doc for use
+                               with EPIGRAPH when columns are on
+  #L_MARGIN_DIFF             Difference between DOC_L_MARGIN and
+                               L_MARGIN
+  #LEFT_CAP_HEIGHT           Cap height of left string in headers/footers
+  #VALID_BASELINE            Calculates vert. position of next valid
+                               baseline in SHIM
+  #LETTER_STYLE              1=BUSINESS 2=PERSONAL
+  #LINEBREAK                 Did we have a linebreak? (boolean)
+  #LINEBREAK_COLOR           Colorize linebreak? (boolean)
+  #LINENUMBER_COLOR          Colorize linenumbers? (boolean)
+  #LINENUMBERS               Holds various states of line-numbering when
+                               line numbering is enabled
+  #LINES_PER_PAGE            # of lines (at DOC_LEAD) that fit on
+                               page after #B_MARGIN is set
+  #LN                        Are line numbers on? (boolean)
+    MN-active                  Are we doing a margin note? (boolean)
+    MN-curr                    Current margin note
+    MN-div-&lt;n&gt;-depth           Depth of margin note &lt;n&gt;
+    MN-hy                      Hyphenation flag of margin notes
+  #MNinit                    Have margin notes been initialized? (boolean)
+  #MNinit_DEFERRED           Did we have to defer a margin note? (boolean)
+    MN-last-pos                Baseline of previous margin note
+    MN-lead-adj                Difference between the current DOC_LEAD and the
+                                 leading used in margin notes
+    MN-left                    Number of current left margin note
+    MN-left-start              Horizontal start position of left margin note
+    MN-left-width              Width of left margin note
+    MN-right                   Number of current right margin note
+    MN-right-start             Horizontal start position of right margin note
+    MN-right-width             Width of right margin note
+    MN-sep                     Gutter between margin notes and running text
+    MN-shifted                 Did we have to shift a margin note down?
+                                (boolean)
+    MN-size                    Point size of margin notes
+    MN-spacing                 Leading of margin notes
+  #MISC_&lt;n&gt;                  Used to print "next" misc lines in DO_COVER
+  #MISC_COVER_NUM            Number of cover misc items
+  #MISC_DOCCOVER_NUM         Number od doc cover misc items
+  #MISC_NUM                  Number of MISC items
+  #MISCS                     =#MISC_NUM in DO_COVER
+  #MN_OVERFLOW_LEFT          If 1, left margin note text overflows
+  #MN_OVERFLOW_RIGHT         If 1, right margin note text overflows
+  #n%_AT_PAGENUM_SET         Page # from n% when PAGENUMBER invoked
+  #NEEDS_SPACE               Instruct FOOTNOTE, when called by
+                               PROCESS_FN_IN_DIVER, that if the footnote
+                               had to be deferred, the VFP must be
+                               raised by 1v (set in DIVER_FN_2_PRE)
+  #NEITHER                   Should we print no covers? (boolean)
+  #NEXT_AUTHOR               Supplies correct digit to AUTHOR_&lt;n&gt;
+                               when printing authors in doc header
+  #NEXT_LN                   Next linenumber when \n[ln] has to be stored
+                               because linenumbering suspended
+  #NEXT_MISC                 Incrementing counter for misc lines in
+                               DO_COVER
+  #NEXT_SUBTITLE             Incrementing register used to print subtitles
+  #no-repeat-MN-left         Don't repeat left margin note (boolean)
+  #no-repeat-MN-right        Don't repeat right margin note (boolean)
+  #NO_BACK_UP                Instructs FN_OVERFLOW_TRAP not to
+                               subtract 1 line of footnote lead from
+                               FN_OVERFLOW in a PREV_FN_DEFERRED
+                               situation.
+  #NO_BREAK                  Set to 1 in COLLATE if last line of
+                               text before COLLATE falls at the bottom
+                               of the page; instructs NEWPAGE to use
+                               'br instead of .br
+  #NO_COLUMNS                Don't print document in columns (boolean)
+  #NO_FN_MARKER              Don't print footnote markers (boolean)
+  #NO_SHIM                   Should SHIM shim? (boolean)
+  #NO_SPACE                  When para spacing is active, instructs
+                               PP not to add space after a quote or blockquote
+  #NO_TRAP_RESET             Should we reset page traps? (boolean)
+  #NOT_YET_ADJUSTED          Line on which a footnote was called has not yet
+                               been adjusted by groff (boolean)
+  #NUM_AUTHORS               # of authors mod 2 to test if odd or even
+                               # of authors
+  #NUM_MISCS                 Number of args passed to MISC
+  #NUM_MISCS_COVER           Number of args passed to MISC COVER
+  #NUM_MISCS_DOCCOVER        Number of args passed to MISC DOC_COVER
+  #NUMBER_HEAD               Are heads numbered? (boolean)
+  #NUMBER_PH                 Are paraheads numbered? (boolean)
+  #NUMBER_SH                 Are subheads numbered? (boolean)
+  #NUM_COLS                  Number of columns per page
+  #NUMBERED                  If set to 1, lets PARAHEAD know that
+                               main- and subhead numbers have already been
+                               prefixed to the parahead string
+  #NUM_FIELDS                Incrementing register used to match
+                               #TOTAL_FIELDS
+  #OK_PROCESS_LEAD           Initial processing of TOC and endnote
+                               leading is deferred until OK_PROCESS_LEAD=1
+  #ORIGINAL_B_MARGIN         The value for #B_MARGIN as set by the
+                               macro B_MARGIN
+  #ORIG_DOC_LEAD             DOC_LEAD before endnotes, bibliographies, tocs
+  #ORIG_L_LENGTH             \\n[.l] before starting LISTs
+  #ORIGINAL_DOC_LEAD         The lead for PRINT_STYLE 1 as set in
+                               PRINTSTYLE; required so that PRINT_STYLE 1
+                               footnotes have an unadjusted lead of
+                               12 points
+  #OVERFLOW                  Signals to FOOTNOTE that some of the
+                               footnote text won't fit on the page
+  #OVERFLOW_LEFT             Does left margin note overflow? (boolean)
+  #OVERFLOW_RIGHT            Does right margin note overflow? (boolean)  
+  #P                         Page number for margin notes
+  #PAD_LIST_DIGITS&lt;n&gt;        Pad LIST digits for LIST &lt;n&gt;? (boolean)
+  #PAGE_NUM_ADJ              What to add to n% to get #PAGENUMBER
+  #PAGE_NUM_H_POS            1=left 2=CENTER 3=right; default=2
+  #PAGE_NUM_COLOR            Colorize pagenumbers? (boolean)
+  #PAGE_NUM_HYPHENS          Print hyphens surrounding page numbers?
+                               (boolean)
+  #PAGE_NUM_HYPHENS_SET      Did user set (or unset) hyphens around page
+                               numbers? (boolean)
+  #PAGE_NUM_POS_SET          Did user set page number position? (boolean)
+  #PAGE_NUM_SET              Test if PAGE_1_NUM was used to set 1st page
+                               number
+  #PAGE_NUM_V_POS            1=top 2=bottom; default=2
+  #PAGE_NUMS                 Print page numbers? (boolean)
+  #PAGE_POS                  Exact position on page during a diversion
+                               (required for collecting footnotes inside
+                               a diversion)
+  #PAGE_TOP                  \n[nl] after HEADER completes itself
+  #PAGENUM_STYLE_SET         Did we set pagenumber style? (boolean)
+  #PAGENUMBER                The page number
+  #PAGES                     Number of blank pages to output
+  #PAGINATE                  Are we paginating? (boolean)
+  #PAGINATE_TOC              Is toc pagination on? (boolean)
+  #PAGINATE_WAS_ON           Keeps track of pagination state while
+                               outputting blank pages
+  #PAGINATION_STATE          Saves pagination state in COLLATE for use in
+                               START after a COLLATE
+  #PAGINATION_WAS_ON         Was pagination on? - used in FINIS (boolean)
+  #PH_COLOR                  Colorize paraheads? (boolean)
+  #PH_INDENT                 Size of parahead indent
+  #PH_NUM                    Parahead number
+  #PP                        0 at first para; auto-increments
+  #PP_AT_PAGE_BREAK          # of last (incl. partial) para on page
+  #PP_INDENT                 How much to indent paras
+  #PP_SPACE                  Put space before paras? (boolean)
+  #PP_SPACE_SUSPEND          Suspend para spacing for blockquotes and
+                               epigraphs
+  #PP_STYLE_PREV             In footnotes, stores PP style in effect
+                               prior to invoking FOOTNOTE
+  #PP_STYLE                  Regular para=1; quote or epi para=2
+  #PRE_COLLATE               Set to 1 in COLLATE; prevents FAMILY
+                               from clobbering a user-set DOC_FAMILY
+  #PREFIX_CH_NUM             Prefix the chapter number to numbered
+                               heads, subheads and/or paraheads? (boolean)
+  #PREV_FN_DEFERRED          Was previous footnote deferred? (boolean)
+  #PRINT_PAGENUM_ON_PAGE_1   Should we print the page number on first
+                               page of doc when footers are on? (boolean)
+  #PRINT_STYLE               Typewrite=1, typeset=2
+  #PT_SIZE_IN_UNITS          Stored value of \n[.ps] from last time
+                               PT_SIZE was called
+  #Q_AUTOLEAD                Register created by QUOTE_AUTOLEAD
+  #Q_DEPTH                   Depth of quote
+  #Q_FITS                    Does this quote fit on one page/column?
+                               (boolean)
+  #Q_LEAD                    Leading of quotes
+  #Q_LEAD_DIFF               Difference between leading of running text
+                               and the leading used in quotes/blockquotes
+  #Q_LEAD_REAL               Leading of quotes and blockquotes saved at the
+                               ends of their respective diversions
+  #Q_L_LENGTH                Line length of quotes
+  #Q_OFFSET                  Page offset for quotes
+  #Q_OFFSET_VALUE            Factor by which to multiply PP_INDENT to
+                               offset quotes
+  #Q_PARTIAL_DEPTH           The amount of a quote/blockquote that fits at
+                               the bottom of a page when a quote/blockquote
+                               spans pages
+  #Q_PP                      In PP, stores para # in QUOTE.  Removed in
+                               ENDQUOTE.
+  #Q_SPACE_ADJ               The flexible amount of whitespace to add before
+                               and after a quote/blockquote
+  #Q_TOP                     Vertical place on page that a quote starts
+  #QUOTE                     1=PQUOTE, 2=BQUOTE
+  #QUOTE_COLOR               Colorize quotes (poetic)? (boolean)
+  #QUOTE_LN                  Linenumber quotes? (boolean)
+  #RECTO_VERSO               Switch HEADER_LEFT and HEADER_RIGHT on
+                               alternate pages? (boolean)
+  ref*suppress-period        Suppress period at end of ref field? (boolean)
+  ref*type                   Kind of reference we're building
+  #REF                       Was REF called? (boolean)
+  #REF_HY                    Hyphenate REFs? (boolean)
+  #REF_WARNING               Have we issued a ref warning? (boolean)
+  #REPEAT                    Number of times to repeat linebreak
+                               character
+  #RERUN_TRAPS               Should we invoke TRAPS? (boolean)
+  #RESERVED_SPACE            Just enough room to put 1 more line of
+                               footnotes on the page
+  #RESET_EN_PP               Holds value of register #EN_PP_INDENT
+  #RESET_EN_PP_INDENT        Holds value of register #EN_PP_INDENT
+  #RESET_FN_COUNTERS         1 = "moved" footnote collected in a diversion
+                               2 = "deferred" fn collected in a diversion
+  #RESET_FN_NUMBER           Should fn# start at 1 on every page?
+                               (boolean)
+  #RESET_L_LENGTH            Stores current line length when necessary
+  #RESET_PARA_SPACE          Holds current value of boolean register
+                               #PP_SPACE
+  #RESET_PP_INDENT           Stores value of PP_INDENT when needed
+  #RESET_QUOTE_SPACING       Stores value of boolean register
+                               #FULLSPACE_QUOTES (used in endnotes)
+  #RESTORE_ADJ_DOC_LEAD      Stores value of #ADJ_DOC_LEAD whenever needed
+  #RESTORE_B_MARGIN          Stores #B_MARGIN whenever needed
+  #RESTORE_DOC_LEAD          Stores value of current doc lead (used in
+                               endnotes)
+  #RESTORE_HY                Restore hyphenation after .][? (boolean)
+  #RESTORE_INDENT            Store \n[.i] whenever needed
+  #RESTORE_L_LENGTH          Stores \n[.l] whenever needed
+  #RESTORE_LN_NUM            Should we restore line numbering? (boolean)
+  #RESTORE_OFFSET            Page offset at moment footer trap is sprung;
+                               not currently used
+  #RESTORE_TOC_PN_PADDING    Saves #TOC_PN_PADDING in TOC prior to
+                               processing $FIRST_DOC_TITLE
+  #RESTORE_UNDERLINE         Instructs CODE OFF to restore underlining of
+                                italics (TYPEWRITE) if underlining was
+                                formerly on 
+  #RIGHT_CAP_HEIGHT          Cap height of right string in
+                               headers/footers
+  #RULED                     Tells FOOTNOTE if a rule (or space has been
+                               put above the first footnote on the page
+  #RUNON_FN_IN_DIVER         If #LN=1, if we're in a (block)quote, instructs
+                               FOOTNOTE to unformat diversion RUNON_FN_IN_DIVER
+  #RUNON_FOOTNOTES           If #LN=1, instructs FOOTNOTE to unformat
+                               diversion RUNON_FOOTNOTES
+  #RUN_ON                    Are we using run-on footnotes? (boolean)
+  #SAVED_DIVER_FN_COUNT      In the case of a footnote inside a
+                               diversion that should be treated as a
+                               "normal" footnote, FOOTNOTE needs to
+                               distinguish between a "normal" deferred
+                               footnote (always the 1st footnote on the
+                               page) and one that only looks as if
+                               it should be deferred, when, in fact,
+                               it's an overflow; this register lets
+                               FOOTNOTE know whether the diversion
+                               footnote is, in fact, the first on the
+                               page.
+  #SAVED_DOC_LEAD            Stored value of #DOC_LEAD (used in DEFAULTS after
+                               a COLLATE)
+  #SAVED_FN_COUNT            #FN_COUNT+1 prior to +#FN_COUNT; used
+                               in FOOTNOTES while gathering fns inside
+                               diversions
+  #SAVED_FN_COUNT_FOR_COLS   #FN_COUNT_FOR_COLS+1 prior to
+                               +#FN_COUNT_FOR_COLS; used in FOOTNOTES
+                               while gathering fns inside diversions
+  #SAVED_FN_DEPTH_1          Footnote depth prior to adding footnote
+                               diversion depth to FN_DEPTH; used when
+                               footnote text will overflow
+  #SAVED_FN_DEPTH_2          Footnote depth after to adding footnote
+                               diversion depth to FN_DEPTH; used when
+                               footnote text will overflow
+  #SAVED_FN_NUMBER           Stores current FN_NUMBER whenever needed
+  #SAVED_FOOTER_POS          Position of FOOTER in DO_QUOTE (hack)
+  #SAVED_LEAD                In FOOTER and DO_FOOTER, stores the
+                               lead in effect prior to outputting
+                               FOOTNOTES or performing either
+                               PROCESS_FN_LEFTOVER or
+                               PROCESS_FN_IN_DIVERSION; both the
+                               diversion FOOTNOTES and the two macros
+                               have, for PRINT_STYLE 2, an AUTOLEAD
+                               call, which requires that an LS be
+                               performed with the #SAVED_LEAD in
+                               order to remove register #AUTO_LEAD or
+                               #AUTO_LEAD_FACTOR.
+  #SAVED_UNDERSCORE_WEIGHT       Stores underscore weight whenever needed
+  #SAVED_UNDERSCORE_WEIGHT_ADJ   SAVED_UNDERSCORE_WEIGHT/2
+  #SAVED_VFP                 Store variable footer position whenever needed
+  #SAVED_WEIGHT              Stores weight given to RULE_WEIGHT whenever needed
+  #SAVED_WEIGHT_ADJ          SAVED_UNDERSCORE_WEIGHT/2
+  #SEP_TYPE                  Set to 1 if LIST separator is ( or [ or {
+  #SH_COLOR                  Colorize subheads? (boolean)
+  #SH_LEAD_ADJUST            #DOC_LEAD/8 (TYPESET) or /2 (TYPEWRITE)
+                               (used for subhead spacing)
+  #SH_NUM                    Subhead number
+  #SHIM                      Amount of lead required to advance to
+                               next valid baseline
+  #SILENT_BQUOTE_LN          "Silently" linenumber blockquotes? (boolean)
+  #SILENT_QUOTE_LN           "Silently" linenumber quotes? (boolean)
+  #SINGLE_SPACE              Is TYPEWRITE in single space mode? (boolean)
+  #SKIP_FOOTER               If 1, instructs DO_FOOTER to do nothing
+                               if B_MARGIN falls below FOOTER_MARGIN
+  #SLANT_MEANS_SLANT         For TYPEWRITE. (boolean)
+  #SLANT_WAS_ON              Keeps track of SLANT when it needs to go off
+                               for a while
+  #SPACE_REMAINING           Space remaining to footer trap; used to
+                               decide whether or not to defer a footnote
+  #SPACE_TO_FOOTER           Distance to FOOTER trap; used to calculate
+                               available space when FOOTNOTE is called inside
+                               a diversion
+  #SR_ADJ_FACTOR             An adjustment factor that compensates
+                               for the fact that #SPACE_REMAINING
+                               sometimes reports a fractionally larger
+                               space than is actually available for
+                               footnote text.
+  #START                     If 1, signals completion of START
+  #START_FOR_FOOTERS         Toggle set in START; signals to
+                               PRINT_HDRFTR that START has been invoked,
+                               allowing PRINT_HDRFTR to decide whether or
+                               not to print a footer on page 1
+  #START_FOR_MNinit          If 1, defer processing MN_INIT until #START
+  #STORED_PP_INDENT          Temporarily holds value of #PP_INDENT
+  #SUBTITLE_COLOR            Colorize subtitle? (boolean)
+  #SUBTITLE_COVER_NUM        Incrementing register used to define strings
+                               $SUBTITLE_COVER_&lt;n&gt;
+  #SUBTITLE_DOCCOVER_NUM     Incrementing register used to define strings
+                               $SUBTITLE_DOCCOVER_&lt;n&gt;
+  #SUBTITLE_NUM              Incrementing register used to define strings
+                               $SUBTITLE_&lt;n&gt;
+  #SUBTITLES                 Holds number of subtitle items
+  #SUITE                     Current page number (for letters)
+  #SUP_PT_SIZE               Point size of superscript
+  #SUSPEND_PAGINATION        Suspend pagination prior to endnotes?
+  #SWITCH_HDRFTR             Switch HDRFTR_LEFT and HDRFTR_RIGHT?
+                               (boolean)
+  #T_MARGIN_LEAD_ADJ         \n[.v]-12000; ensures critically accurate
+                               placement of first lines on pages when
+                               doc processing is not being used and
+                               a T_MARGIN has been set
+  #TAB_OFFSET#               "#" at the end is from $CURRENT_TAB
+  #TERMINATE                 Has TERMINATE been called? (boolean)
+  #TITLE_COLOR               Colorize title? (boolean)
+  #TITLE_NUM                 Number of title items
+  #TOC_AUTHORS               Whether to append author(s) to toc doc
+                               title entries (boolean)
+  #TOC_ENTRY_PN              Current page number when a toc entry is
+                               collected
+  #TOC_FIRST_PAGE            If 1, tells PRINT_PAGE_NUMBER that this
+                               is the first page of the toc
+  #TOC_LEAD                  Leading of toc pages
+  #TOC_PN_PADDING            Max. # of placeholders for toc entries
+                               page numbers
+  #TOC_PS                    Point size of toc pages
+  #TOC_RV_SWITCH             Switch L/R margins of toc pages
+  #TOC_HEAD_INDENT           Indent of toc head entries
+  #TOC_HEAD_SIZE_CHANGE      ps in/decrease of toc head entries
+  #TOC_PH_INDENT             Indent of toc parahead entries
+  #TOC_PH_SIZE_CHANGE        ps in/decrease of toc parahead entries
+  #TOC_SH_INDENT             Indent of toc subhead entries
+  #TOC_SH_SIZE_CHANGE        ps in/decrease of toc subhead entries
+  #TOC_TITLE_INDENT          Indent of toc doc title entries
+  #TOC_TITLE_SIZE_CHANGE     ps in/decrease of toc doc title entries
+  #TOTAL_FIELDS              Total number of letter header fields
+  #TRAP                      \n[.t]-1 (used in DO_QUOTE)
+  #UNADJUSTED_DOC_LEAD       Argument passed to DOC_LEAD prior to
+                             adjusting (set in TRAPS)
+  #UNDERLINE_ITALIC          For TYPEWRITE. (boolean)
+  #UNDERLINE_ON              Was UNDERLINE called? (boolean)
+  #UNDERLINE_QUOTES          Was UNDERLINE_QUOTES called? (boolean)
+  #UNDERLINE_QUOTE           Underline pquotes? (boolean)
+  #UNDERLINE_SLANT           For TYPEWRITE. (boolean)
+  #UNDERLINE_WAS_ON          Was underlining on prior to the
+                             invocation of current macro? (boolean)
+  #UNDERLINE_WAS_ON_FN       As above, but for footnotes only
+  #USER_DEF_HDRFTR_CENTER    Has user defined hdrftr center? (boolean)
+  #USER_DEF_HDRFTR_LEFT      Has user defined hdrftr left? (boolean)
+  #USER_DEF_HDRFTR_RIGHT     Has user defined hdrftr right? (boolean)
+  #USER_DEF_HEADER_CENTER    User defined CENTER title? (boolean);
+                               used in COPYSTYLE
+  #USER_DEF_HEADER_LEFT      User defined CENTER title? (boolean);
+                               used in COPYSTYLE
+  #USER_DEF_HEADER_RIGHT     User defined CENTER title? (boolean)
+                               used in COPYSTYLE
+  #USERDEF_HDRFTR            User defined single string recto/verso
+                               header/footer? (boolean)
+  #USERDEF_HDRFTR_RECTO_QUAD 1=left, 2=CENTER, 3=right
+  #USERDEF_HDRFTR_VERSO_QUAD 1=left, 2=CENTER, 3=right
+  #VARIABLE_FOOTER_POS       Wandering trap position for processing
+                               footnotes and footers; pos depends on number of
+                               footnotes
+  #VISUAL_B_MARGIN           Set in TRAPS, what \n[nl] would report
+                               on the last line of running text before
+                               FOOTER is sprung.
+  #VFP_DIFF                  #FN_DEPTH minus #SAVED_FN_DEPTH; the
+                               number of footnote lines that will fit
+                               on the page when there will be over, and
+                               therefore the amount by which to raise
+                               the VFP for footnotes with overflow after
+                               the 1st footnote.
+  y                          Vertical position stored with mk in hdrftrs.
  
-+++STRINGS+++
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++STRINGS+++</span>
 
-$1ST_LETTER                      First letter of first arg to LIST
-$ADJUST_BIB_LEAD                 2nd arg to BIBLIOGRAPHY_LEAD; if not blank
-                                 adjust bib leading
-$ADJUST_EN_LEAD                  2nd arg to ENDNOTE_LEAD; if not blank adjust
-                                 endnote leading
-$ADJUST_TOC_LEAD                 2nd arg to TOC_LEAD; if not blank adjust
-                                 toc leading
-$ATTRIBUTE_COLOR                 Attribution string color
-$ATTRIBUTE_STRING                Attribution string in doc header
-$ATTRIBUTE_STRING_COVER          Attribution string on cover
-$ATTRIBUTE_STRING_DOCCOVER       Attribution string on doc cover
-$AUTHOR_&lt;n&gt;                      Document author(s)
-$AUTHOR                          The author, or the first argument
-                                 passed to .AUTHOR ($AUTHOR_1)
-$AUTHOR_COLOR                    Author color
-$AUTHOR_COVER_&lt;n&gt;                Author(s) on cover
-$AUTHOR_DOCCOVER_&lt;n&gt;             Author(s) on doc cover
-$AUTHOR_FAM                      Family to use for author in doc header
-$AUTHOR_FT                       Font to use for author in doc header
-$AUTHOR_SIZE_CHANGE              ps in/decrease of author in doc header*
-$AUTHOR_PT_SIZE                  Absolute ps of authors
-$AUTHORS                         Comma-separated concatenated
-                                 string of all args passed to .AUTHOR
-$BIB_FAM                         Bibliography page family
-$BIB_FT                          Bibliography page font
-$BIB_LEAD                        Base leading for bibliographies
-$BIB_LIST_SEPARATOR              Separator between enumerator and text
-                                 when outputting bibliographies in LIST style
-$BIB_LIST_PREFIX                 Prefix before enumerator when outputting
-                                 bibliographies in LIST style
-$BIB_PN_STYLE                    Format of bibliography page numbers
-$BIB_QUAD
-$BIB_SPACE                       Post entry space for bibliographies
-$BIB_STRING                      Bibliography title string
-$BIB_STRING_FAM                  Bib title family
-$BIB_STRING_FT                   Bib title font
-$BIB_STRING_QUAD                 Bib title quad
-$BIB_STRING_RULE_GAP             Distance between the underscores when BIB_STRING
-                                 (bib first-page header) is double-underlined
-$BIB_STRING_SIZE_CHANGE          Bib title size (+ or -)
-$BIB_STRING_UNDERLINE_GAP        Distance between BIB_STRING text and (first)
-                                 underline rule
-$BQ_LN_GUTTER                    Gutter between line numbers and bquotes in
-                                 bquotes
-$BQUOTE_COLOR                    Blockquote color
-$BQUOTE_FAM                      Family to use for blockquotes
-$BQUOTE_FT                       Font to use for blockquotes
-$BQUOTE_QUAD                     Quad value for blockquotes
-$BQUOTE_SIZE_CHANGE              ps in/decrease of blockquotes*
-$BX_COLOR                        Box color
-$BX_DEPTH                        Box depth
-$BX_INDENT                       Box left margin starting position
-$BX_WEIGHT                       Box rule weight
-$BX_WIDTH                        Box width
-$CENTER_TITLE                    What to put in the middle of header
-                                 title
-$CH_NUM                          Chapter number (as a string)
-$CHAPTER                         The chapter number
-$CHAPTER_STRING                  What to print whenever the word
-                                 "chapter" is required
-$CHAPTER_TITLE                   Concatenated args passed to CHAPTER_TITLE
-$CHAPTER_TITLE_&lt;n&gt;               Chapter title items
-$CHAPTER_TITLE_FAM               Family of chapter title
-$CHAPTER_TITLE_FT                Font of chapter title
-$CHAPTER_TITLE_SIZE_CHANGE       ps in/decrease of chapter title*
-$CHAPTER_TITLE_PT_SIZE           Absolute ps of chapter title
-$CHAPTER_TITLE_COLOR             Color of chapter title
-$CL_COLOR                        Circle (ellipse) color
-$CL_DEPTH                        Circle (ellipse) depth
-$CL_INDENT                       Circle (ellipse) left margin starting position
-$CL_WEIGHT                       Circle (ellipse) rule weight
-$CL_WIDTH                        Circle (ellipse) width
-$CODE_FAM                        Family to use with CODE
-$COLOR_SCHEME                    Color scheme arg passed to NEWCOLOR
-$COPY_STYLE                      DRAFT or FINAL
-$COPYRIGHT                       Copyright info
-$COPYRIGHT_COVER                 Copyright info for cover
-$COPYRIGHT_DOCCOVER              Copyright info for doc cover
-$COPYRIGHT_FAM                   Copyright line family
-$COPYRIGHT_FT                    Copyright line font
-$COPYRIGHT_PT_SIZE               Base string to which $COPYRIGHT_SIZE_CHANGE
-                                 is appended
-$COPYRIGHT_SIZE_CHANGE           Copyright line size*
-$COPYRIGHT_COLOR                 Copyright line color
-$COPYRIGHT_QUAD                  Copyright line quad direction
-$COVER_ATTRIBUTE_COLOR           Cover attribution string color
-$COVER_AUTHOR_COLOR              Cover author(s) color
-$COVER_AUTHOR_FAM                Cover author(s) family
-$COVER_AUTHOR_FT                 Cover author(s) font
-$COVER_AUTHOR_PT_SIZE            Author point size on cover
-$COVER_AUTHOR_SIZE_CHANGE        Cover author(s) size*
-$COVER_CHAPTER_TITLE_COLOR       Color of chapter title on cover
-$COVER_CHAPTER_TITLE_PT_SIZE     Size of chapter title on cover
-$COVER_COLOR                     Overall cover color
-$COVER_COPYRIGHT_PT_SIZE         Size of copyright info on cover
-$COVER_DOCTYPE_PT_SIZE           Size of doctype on cover
-$COVER_FAM                       Overall cover family
-$COVER_LEAD_ADJ                  String appended to DOC_LEAD to arrive at
-                                 base leading of covers
-$COVER_SUBTITLE_PT_SIZE          Size of subtitle on cover
-$COVER_TITLE_PT_SIZE             Size of title on cover
-$COVER_TITLE                     User-defined cover title string
-$COVER_TITLE_&lt;n&gt;                 Cover title items
-$COVER_TITLE_FAM                 Cover title family
-$COVER_TITLE_FT                  Cover title font
-$COVER_TITLE_SIZE_CHANGE         Cover title size*
-$COVER_TITLE_COLOR               Cover title color
-$COVER_UNDERLINE_GAP             Distance between baseline of the doctype on covers
-                                 and the underline
-$COVER_SUBTITLE_FAM              Cover subtitle family
-$COVER_SUBTITLE_FT               Cover subtitle font
-$COVER_SUBTITLE_SIZE_CHANGE      Cover subtitle size*
-$COVER_SUBTITLE_COLOR            Cover subtitle color
-$COVER_DOCTYPE_FAM               Cover doctype family
-$COVER_DOCTYPE_FT                Cover doctype font
-$COVER_DOCTYPE_SIZE_CHANGE       Cover doctype size*
-$COVER_DOCTYPE_COLOR             Cover doctype color
-$COVER_COPYRIGHT_FAM             Cover copyright family
-$COVER_COPYRIGHT_FT              Cover copyright font
-$COVER_COPYRIGHT_SIZE_CHANGE     Cover copyright size*
-$COVER_COPYRIGHT_COLOR           Cover copyright color
-$COVER_MISC_FAM                  Cover misc family
-$COVER_MISC_FT                   Cover misc font
-$COVER_MISC_SIZE_CHANGE          Cover misc size*
-$COVER_MISC_COLOR                Cover misc color
-$CURRENT_EV                      \n[.ev] at REF_BRACKETS_START
-$DC_COLOR                        Dropcap color
-$DOC_COVER_ATTRIBUTE_COLOR       Doc cover attribution string color
-$DOC_COVER_AUTHOR_COLOR          Doc cover author(s) color
-$DOC_COVER_AUTHOR_FAM            Doc cover author(s) family
-$DOC_COVER_AUTHOR_FT             Doc cover author(s) font
-$DOC_COVER_AUTHOR_PT_SIZE        Size of author on doc cover
-$DOC_COVER_AUTHOR_SIZE_CHANGE    Doc cover author(s) size*
-$DOC_COVER_CHAPTER_TITLE_COLOR   Color of chapter title on doc cover
-$DOC_COVER_CHAPTER_TITLE_PT_SIZE Size of chapter title on doc cover
-$DOC_COVER_COLOR                 Overall doc cover color
-$DOC_COVER_COPYRIGHT_COLOR       Doc cover copyright color
-$DOC_COVER_COPYRIGHT_FAM         Doc cover copyright family
-$DOC_COVER_COPYRIGHT_FT          Doc cover copyright font
-$DOC_COVER_COPYRIGHT_PT_SIZE     Size of copyright info on doc cover
-$DOC_COVER_COPYRIGHT_SIZE_CHANGE Doc cover copyright size*
-$DOC_COVER_DOCTYPE_COLOR         Doc cover doctype color
-$DOC_COVER_DOCTYPE_FAM           Doc cover doctype family
-$DOC_COVER_DOCTYPE_FT            Doc cover doctype font
-$DOC_COVER_DOCTYPE_PT_SIZE       Size of doctype on doc cover
-$DOC_COVER_DOCTYPE_SIZE_CHANGE   Doc cover doctype size*
-$DOC_COVER_MISC_COLOR            Doc cover misc color
-$DOC_COVER_MISC_FAM              Doc cover misc family
-$DOC_COVER_MISC_FT               Doc cover misc font
-$DOC_COVER_MISC_SIZE_CHANGE      Doc cover misc size*
-$DOC_COVER_FAM                   Overall doc cover family
-$DOC_COVER_LEAD_ADJ              String appended to DOC_LEAD to arrive at base
-                                 leading of doc covers
-$DOC_COVER_SUBTITLE_FAM          Doc cover subtitle family
-$DOC_COVER_SUBTITLE_FT           Doc cover subtitle font
-$DOC_COVER_SUBTITLE_PT_SIZE      Size of subtitle on doc cover
-$DOC_COVER_SUBTITLE_SIZE_CHANGE  Doc cover subtitle size*
-$DOC_COVER_SUBTITLE_COLOR        Doc cover subtitle color
-$DOC_COVER_TITLE                 User-defined doc cover title string
-$DOC_COVER_TITLE_&lt;n&gt;             Doc cover title items
-$DOC_COVER_TITLE_COLOR           Doc cover title color
-$DOC_COVER_TITLE_FAM             Doc cover title family
-$DOC_COVER_TITLE_FT              Doc cover title font
-$DOC_COVER_TITLE_PT_SIZE         Size of title on doc cover
-$DOC_COVER_TITLE_SIZE_CHANGE     Doc cover title size*
-$DOC_FAM                         Predominant font family used in the
-                                 document
-$DOC_QUAD                        Quad used for body text (justified or
-                                 left) 
-$DOC_TITLE                       Concatenated args passed to DOCTITLE
-$DOC_TITLE_&lt;n&gt;             DOCTITLE items
-$DOC_TYPE                        Document type (default, chapter, named,
-                                 letter)
-$DOCCOVER_UNDERLINE_GAP          Distance between baseline of doctype and the
-                                 underline on covers
-$DOCHEADER_COLOR                 Color of docheader
-$DOCHEADER_FAM                   Family used for all parts of the docheader
-$DOCHEADER_LEAD_ADJ              +|- value applied to #DOC_LEAD to
-                                 in/decrease leading of doc header
-$DOCTYPE_COLOR                   Color of DOCTYPE string in doc header
-$DOCTYPE_FAM                     Family to use for DOCTYPE string in
-                                 doc header
-$DOCTYPE_FT                      Font to use for DOCTYPE string in
-                                 doc header
-$DOCTYPE_SIZE_CHANGE             ps in/decrease of DOCTYPE string in
-                                 doc header*
-$DOCTYPE_PT_SIZE                 Absolute ps of DOCTYPE
-$DOCTYPE_UNDERLINE_GAP           Distance between baseline of DOCTYPE and the
-                                 underline in doc header
-$DRAFT                           The draft number (string valued)
-$DRAFT_STRING                    What to print whenever the word "draft"
-                                 is required
-EN_MARK                          Inline, gets #EN_MARK (\(ln)
-$EN_CLOSE_BRACKET                Close bracket for line-number enumerated
-                                 endnotes
-$EN_FAMILY                       Family for endnotes
-$EN_FT                           Font for endnotes
-$EN_LEAD                         Leading of endnotes pages
-$EN_LINENUMBER                   String to print for line-number enumerators
-                                 in line-numbered endnotes
-$EN_LN_FAM                       Family for line-numbers in line-number
-                                 identified endnotes
-$EN_LN_FT                        Font for line-numbers in line-number
-                                 identified endnotes
-$EN_LN_GAP                       Gap to leave in initial endnote lines
-                                 between line-number identifies and text
-$EN_LN_SEP                       User-defined separator to use between line number(s)
-                                 and endnotes when endnotes are identified by line
-                                 number
-$EN_OPEN_BRACKET                 Open bracket for line-number enumerated
-                                 endnotes
-$EN_LN_SIZE_CHANGE               Size change (+ or -) for line-numbers in
-                                 line-number identified endnotes
-$EN_PN_STYLE                     Pagenumbering style for endnotes pages
-$EN_QUAD                         Quad for endnotes
-$EN_STRING                       Endnotes page head
-$EN_STRING_FAM                   Endnotes page head family
-$EN_STRING_FT                    Endnotes page head font
-$EN_STRING_QUAD                  Endnotes page head quad direction
-$EN_STRING_RULE_GAP              Distance between rules when EN_STRING is
-                                 double-underlined
-$EN_STRING_UNDERLINE_GAP         Distance between baseline of EN_STRING and
-                                 underline rule
-$EN_STRING_SIZE_CHANGE           Endnotes page head size***
-$EN_TITLE                        Endnote document identifier
-$EN_TITLE_FAM                    Endnote document identifier family
-$EN_TITLE_FT                     Endnote document identifier font
-$EN_TITLE_QUAD                   Endnote document identifier quad
-                                 direction
-$EN_TITLE_SIZE_CHANGE            Endnote document identifier size***
-$EN_TITLE_UNDERLINE_GAP          Distance between baseline of EN_TITLE and underline
-                                 rule
-$EN_NUMBER_FAM                   Endnote numbering family
-$EN_NUMBER_FT                    Endnote numbering font
-$EN_NUMBER_SIZE_CHANGE           Endnote numbering size***
-$EPI_AUTOLEAD                    Autolead value (decimals ok) of
-                                 epigraphs
-$EPI_COLOR                       Color of epigraphs
-$EPI_FAM                         Family to use in epigraphs
-$EPI_FT                          Font to use in epigraphs
-$EPI_OFFSET_VALUE                Arg passed to EPIGRAPH_INDENT if the
-                                 arg has a unit of measure appended to it
-$EPI_QUAD                        Quad in block-style epigraphs
-                                 (justified or left)
-$EPI_SIZE_CHANGE                 ps in/decrease of epigraphs*
-$EVAL_BIB_SPACE                  Temporary string to find out if the
-                                 arg to BIBLIOGRAPHY_SPACING ended in "v"
-$EVAL_EI_ARG                     Temporary string to find out whether
-                                 the arg to EPIGRAPH_INDENT ended with
-                                 a unit of measure
-$EVAL_QI_ARG                     Temporary string to find out whether
-                                 the arg to QUOTE_INDENT ended with
-                                 a unit of measure
-eval*[B                          Used to get substring of \*([B
-eval*[S                          Used to get substring of \*([S
-eval*[s                          Used to get substring of \*([s
-$FINIS_COLOR                     Color of FINIS string
-$FINIS_STRING                    What to print when FINIS macro is
-                                 invoked
-$FIRST_DOC_TITLE                 1st doc's title captured in COLLATE
-FN_MARK                          Inline, gets #FN_MARK (\n(ln)
-$FN_CLOSE_BRACKET                Close bracket for line-number identified
-                                 footnotes
-$FN_FAM                          Family used in footnotes
-$FN_FT                           Font used in footnotes
-$FN_LINENUMBER                   String to print before footnotes when
-                                 line-numbering enabled for footnotes
-$FN_LN_SEP                       Separator after line-number identified
-                                 footnotes
-$FN_OPEN_BRACKET                 Open bracket for line-number identified
-                                 footnotes
-$FN_QUAD                         Quad used in footnotes
-$FN_SIZE_CHANGE                  ps in/decrease of footnotes*
-$FOOTNOTE_COLOR                  Footnote color
-$FTR_RECTO_QUAD                  Quad direction of footer recto
-$FTR_RECTO_STRING                String for footer recto
-$FTR_VERSO_QUAD                  Quad direction of footer verso
-$FTR_VERSO_STRING                String for footer verso
-$HDR_RECTO_QUAD                  Quad of header recto
-$HDR_RECTO_STRING                String for header recto
-$HDR_VERSO_QUAD                  Quad of header verso
-$HDR_VERSO_STRING                String for header verso
-**Note: &quot;header&quot;, in the descriptions below, means either headers or footers**
-
-$HDRFTR_CENTER                   What to put in CENTER part of headers;
-                                 default doctype
-$HDRFTR_CENTER_COLOR             Color of CENTER part of headers
-$HDRFTR_CENTER_FAM               Family of CENTER part of headers
-$HDRFTR_CENTER_FT                Font of centre part of headers
-$HDRFTR_CENTER_NEW               HDRFTR_CENTER after the start of TOC;
-                                 defined in HDRFTR_CENTER if
-                                 HDRFTR_CENTER is called as
-                                 FOOTER_CENTER
-$HDRFTR_CENTER_OLD               HDRFTR_CENTER just prior to start of
-                                 TOC; defined in HDRFTR_CENTER if
-                                 HDRFTR_CENTER is called as
-                                 FOOTER_CENTER
-$HDRFTR_CENTER_SIZE_CHANGE       ps in/decrease of centre title in
-                                 headers**
-$HDRFTR_COLOR                    Color of headers/footers
-$HDRFTR_FAM                      Family to use in headers
-$HDRFTR_LEFT_COLOR               Color of LEFT part of headers
-$HDRFTR_LEFT_FAM                 Family of left part of headers
-$HDRFTR_LEFT_FT                  Font of left part of headers
-$HDRFTR_LEFT_SIZE_CHANGE         ps in/decrease of author in headers**
-$HDRFTR_LEFT                     What to put in left part of headers;
-                                 default author
-$HDRFTR_RIGHT_COLOR              Color of RIGHT part of headers
-$HDRFTR_RIGHT_FAM                Family of right part of headers
-$HDRFTR_RIGHT_FT                 Font of right part of headers
-$HDRFTR_RIGHT_SIZE_CHANGE        ps in/decrease of right part of
-                                 headers**
-$HDRFTR_RIGHT                    What to put in right part of headers;
-                                 default title
-$HDRFTR_RULE_COLOR               Color of header rule
-$HDRFTR_SIZE_CHANGE              ps in/decrease of headers*
-$HDRFTR_TMP_SIZE_CHANGE_SWITCH   Temporarily holds
-                                 HDRFTR_LEFT_SIZE_CHANGE if
-                                 #SWITCH_HDRFTRS=1
-$HDRFTR_TMP_SWITCH               Temporarily holds HDRFTR_LEFT if
-                                 #SWITCH_HDRFTRS=1
-$HDRFTR_TMP_COLOR_SWITCH         Temporarily holds HDRFTR_LEFT_COLOR if
-                                 #SWITCH_HDRFTRS=1
-$HEAD_COLOR                      Head color
-$HEAD_FAM                        Family to use for section titles
-$HEAD_FT                         Font to use for section titles
-$HEAD_QUAD                       Quad value of section titles
-$HEAD_SIZE_CHANGE                ps in/decrease of section titles*
-$HEAD_UNDERLINE_GAP              Distance between a head and the underline
-$HYPHEN                          Vertically adjusted hyphen used around page numbers
-$LHS                             Holds digits on the left side of the decimal in
-                                 weight arg passed to RULE_WEIGHT
-$LINEBREAK_CHAR                  Character that marks line breaks
-$LINEBREAK_CHAR_V_ADJ            +|- amount by which to raise/lower
-                                 linebreak character
-$LAST_CHAR                       Temporary string used to discover whether
-                                 user has remembered to put a digit after
-                                 ROMAN or roman in arg to LIST
-$LINEBREAK_COLOR                 Linebreak color
-$LIST_ARG_1                      The first arg to LIST (minus digits if
-                                 ROMAN or roman
-$LN_COLOR                        Linenumber color
-$LN_FAMILY                       Linenumber family
-$LN_FONT                         Linenumber font
-$LN_GUTTER                       Gutter to leave between line numbers
-                                 and text
-$LN_INC                          2nd arg to NUMBER_LINES as a string
-$LN_NUM                          1st arg to NUMBER_LINES as a string
-$LN_SIZE_CHANGE                  ps in/decrease of linenumbers
-$MISC_&lt;n&gt;
-$MISC_COLOR                      Misc olor
-$MISC_COVER_&lt;n&gt;            Misc items for cover
-$MISC_DOCCOVER_&lt;n&gt;         Misc items for doc cover
-$MISC_QUAD                       Misc quad direction
-$MN-arg&lt;n&gt;                 Sequentially numbered args passed to MNinit
-MN-color                         Color of margin note
-MN-curr                          Number of current margin note
-MN-dir                           Left or right margin note
-MN-font                          Font of margin note
-MN-left-ad                       Fill mode of margin note
-PAGE#                            For use in hdrftr strings where page #
-                                 is needed; \*[PAGE]
-$PAGENUM_COLOR                   Page number color
-$PAGENUM_STYLE                   String passed to PAGENUM_STYLE
-$PAGE_NUM_FAM                    Family of page numbers
-$PAGE_NUM_FT                     Font of page numbers
-$PAGE_NUM_SIZE_CHANGE            ps in/decrease of page numbers
-$PAPER                           Paper size (LETTER, A4, LEGAL);
-                                 default=LETTER
-$PH_COLOR                        Parahead color
-$PP_FT                           Font used in paragraphs
-$RESTORE_PAGENUM_STYLE           Hold previous page numbering style
-$ROMAN_WIDTH&lt;n&gt;                     The digit(s) appended by user to ROMAN or
-                                 roman when LIST is invoked
-$Q_LN_GUTTER                     Gutter between linenumbers and quotes
-                                 in quotes
-$Q_OFFSET_VALUE                  Arg passed to QUOTE_INDENT if the
-                                 arg has a unit of measure appended to it
-$QUOTE_COLOR                     Quote (poetic) color
-$QUOTE_FAM                       Family to use for pquotes
-$QUOTE_FT                        Font to use for pquotes
-$QUOTE_SIZE_CHANGE               ps in/decrease of pquotes*
-ref*post-punct                   Final punctuation mark of references
-ref*spec!&lt;n&gt;                     Holds fields required by differing reference types
-ref*string                       The data passed to a reference
-$REF_BIB_INDENT                  2nd line indent value for references in
-                                 bibliographies
-$REF_EN_INDENT                   2nd line indent value for references in
-                                 endnotes
-$REF_FN_INDENT                   2nd line indent value for references in
-                                 footnotes
-$RESTORE_SS_VAR                  Saves \*[$SS_VAR] for use with ref*build
-#REVISION                        The revision number (string valued)
-$REVISION_STRING                 What to print whenever the word
-                                 "revision" is required
-$RHS                             Holds digits on the right side of the decimal in
-                                 weight arg passed to RULE_WEIGHT
-$RL_COLOR                        Rule color (DRH/DRV)
-$RL_DEPTH                        Rule depth (DRH/DRV)
-$RL_INDENT                       Left start position of rule (DRH/DRV)
-$RL_LENGTH                       Rule length (DRH/DRV)
-$RL_WEIGHT                       Rule weight (DRH/DRV)
-$SAVED_COPYRIGHT                 Temporarily holds string in $COPYRIGHT
-$SAVED_RULE_GAP                  Temporarily holds string in $RULE_GAP
-$SAVED_PP_FT                     $PP_FT in effect at start of
-                                 .COLLATE; tested for and removed
-                                 in .PP
-$SH_FAM                          Family to use in subheads
-$SH_FT                           Font to use in subheads
-$SH_SIZE_CHANGE                  ps in/decrease of subheads*
-$SH_COLOR                        Subhead color
-$SUBTITLE                        Concatenated args passed to SUBTITLE
-$SUBTITLE_&lt;n&gt;              Subtitle items for doc header
-$SUBTITLE_COLOR                  Color of subtitle
-$SUBTITLE_COVER_&lt;n&gt;        Subtitle items for cover
-$SUBTITLE_DOCCOVER_&lt;n&gt;     Subtitle items for doc cover
-$SUBTITLE_FAM                    Family to use for subtitle in doc
-                                 header
-$SUBTITLE_FT                     Font to use for subtitle in doc header
-$SUBTITLE_SIZE_CHANGE            ps in/decrease of subtitle*
-$SUBTITLE_PT_SIZE                Absolute ps of subtitle
-$SUITE                           The #SUITE number register
-$TITLE                           Concatenated args pass to TITLE
-$TITLE_&lt;n&gt;                 Title items
-$TITLE_COLOR                     Color of title
-$TITLE_FAM                       Family to use for title in doc header
-$TITLE_FT                        Font to use for title in doc header
-$TITLE_PT_SIZE                   Absolute point size of title in docheader
-$TITLE_SIZE_CHANGE               ps in/decrease of title in doc header*
-$TOC_AUTHORS                     What to print after toc doc title entry
-                                 if #TOC_AUTHORS=1
-$TOC_FAM                         Family to use on toc pages
-$TOC_HEAD_FAM                    Family of toc head entries
-$TOC_HEAD_FT                     Font of toc head entries
-$TOC_HEAD_ITEM                   A head as collected for TOC_ENTRIES
-$TOC_HEADER_FAM                  Family to use for "Contents"
-$TOC_HEADER_FT                   Font to use for "Contents"
-$TOC_HEADER_QUAD                 Quad direction of "Contents"
-$TOC_HEADER_SIZE                 ps in/decrease of "Contents"****
-$TOC_HEADER_STRING               Header string of first toc page
-$TOC_LEAD                        Leading of toc pages
-$TOC_PH_ITEM                     Toc parahead entry
-$TOC_PN                          Sets up toc leaders + entry pn
-                                 (typeset)
-$TOC_PN_FAM                      Family for toc entries page numbers
-$TOC_PN_FT                       Font for toc entries page numbers
-$TOC_PN_SIZE_CHANGE              ps in/decrease of toc entries page
-                                 numbers
-$TOC_PN_STYLE                    Page-numbering style of toc pages
-$TOC_PN_TYPEWRITE                Sets up toc leaders + entry pn
-                                 (typewrite)
-$TOC_PH_FAM                      Family of toc parahead entries
-$TOC_PH_FT                       Font of toc parahead entries
-$TOC_PARAHEAD_ITEM               A parahead collected for TOC_ENTRIES
-$TOC_SH_FAM                      Family of toc subhead entries
-$TOC_SH_FT                       Font of toc subhead entries
-$TOC_SH_ITEM                     A subhead collected for TOC_ENTRIES
-$TOC_TITLE_FAM                   Family of toc doc title entries
-$TOC_TITLE_FT                    Font of toc doc title entries
-$TOC_TITLE_ITEM                  Toc document title item
-$USER_SET_TITLE_ITEM             User defined toc doc title entry as
-                                 set by TOC_TITLE_ENTRY
-$UR_PAGINATION_STYLE             Pagination style prior to endnotes
-$USERDEF_HDRFTR_RECTO            User defined header/footer recto string
-$USERDEF_HDRFTR_VERSO            User defined header/footer verso string
-
-   *relative to #DOC_PT_SIZE
-  **relative to overall ps of headers as set by HEADER_SIZE
- ***relative to overall ps of endnotes
-****relative to overall ps of toc pages
-
-+++PREPROCESSOR KEYWORDS+++
-
-(eqn)
-EQ
-EN
-
-(grn)
-GS
-GE
-GF
-
-(pic)
-PS
-PE
-
-(refer)
-R1
-R2
-[
-]
-
-(tbl)
-TS
-TE
-TH
-
-(grap)
-G1
-G2
-
-(ideal)
-IS
-IE
-
-(chem)
-cstart
-cend
+  $1ST_LETTER                      First letter of first arg to LIST
+  $ADJUST_BIB_LEAD                 2nd arg to BIBLIOGRAPHY_LEAD; if not blank
+                                     adjust bib leading
+  $ADJUST_EN_LEAD                  2nd arg to ENDNOTE_LEAD; if not blank adjust
+                                     endnote leading
+  $ADJUST_TOC_LEAD                 2nd arg to TOC_LEAD; if not blank adjust
+                                     toc leading
+  $ATTRIBUTE_COLOR                 Attribution string color
+  $ATTRIBUTE_STRING                Attribution string in doc header
+  $ATTRIBUTE_STRING_COVER          Attribution string on cover
+  $ATTRIBUTE_STRING_DOCCOVER       Attribution string on doc cover
+  $AUTHOR_&lt;n&gt;                      Document author(s)
+  $AUTHOR                          The author, or the first argument
+                                     passed to .AUTHOR ($AUTHOR_1)
+  $AUTHOR_COLOR                    Author color
+  $AUTHOR_COVER_&lt;n&gt;                Author(s) on cover
+  $AUTHOR_DOCCOVER_&lt;n&gt;             Author(s) on doc cover
+  $AUTHOR_FAM                      Family to use for author in doc header
+  $AUTHOR_FT                       Font to use for author in doc header
+  $AUTHOR_SIZE_CHANGE              ps in/decrease of author in doc header
+  $AUTHOR_PT_SIZE                  Absolute ps of authors
+  $AUTHORS                         Comma-separated concatenated
+                                     string of all args passed to .AUTHOR
+  $BIB_FAM                         Bibliography page family
+  $BIB_FT                          Bibliography page font
+  $BIB_LEAD                        Base leading for bibliographies
+  $BIB_LIST_SEPARATOR              Separator between enumerator and text
+                                     when outputting bibliographies in
+                                     LIST style
+  $BIB_LIST_PREFIX                 Prefix before enumerator when outputting
+                                     bibliographies in LIST style
+  $BIB_PN_STYLE                    Format of bibliography page numbers
+  $BIB_QUAD
+  $BIB_SPACE                       Post entry space for bibliographies
+  $BIB_STRING                      Bibliography title string
+  $BIB_STRING_FAM                  Bib title family
+  $BIB_STRING_FT                   Bib title font
+  $BIB_STRING_QUAD                 Bib title quad
+  $BIB_STRING_RULE_GAP             Distance between the underscores when
+                                     BIB_STRING (bib first-page header) is
+                                     double-underlined
+  $BIB_STRING_SIZE_CHANGE          Bib title size (+ or -)
+  $BIB_STRING_UNDERLINE_GAP        Distance between BIB_STRING text and (first)
+                                     underline rule
+  $BQ_LN_GUTTER                    Gutter between line numbers and bquotes in
+                                     bquotes
+  $BQUOTE_COLOR                    Blockquote color
+  $BQUOTE_FAM                      Family to use for blockquotes
+  $BQUOTE_FT                       Font to use for blockquotes
+  $BQUOTE_QUAD                     Quad value for blockquotes
+  $BQUOTE_SIZE_CHANGE              ps in/decrease of blockquotes
+  $BX_COLOR                        Box color
+  $BX_DEPTH                        Box depth
+  $BX_INDENT                       Box left margin starting position
+  $BX_WEIGHT                       Box rule weight
+  $BX_WIDTH                        Box width
+  $CENTER_TITLE                    What to put in the middle of header
+                                     title
+  $CH_NUM                          Chapter number (as a string)
+  $CHAPTER                         The chapter number
+  $CHAPTER_STRING                  What to print whenever the word
+                                     "chapter" is required
+  $CHAPTER_TITLE                   Concatenated args passed to CHAPTER_TITLE
+  $CHAPTER_TITLE_&lt;n&gt;               Chapter title items
+  $CHAPTER_TITLE_FAM               Family of chapter title
+  $CHAPTER_TITLE_FT                Font of chapter title
+  $CHAPTER_TITLE_SIZE_CHANGE       ps in/decrease of chapter title
+  $CHAPTER_TITLE_PT_SIZE           Absolute ps of chapter title
+  $CHAPTER_TITLE_COLOR             Color of chapter title
+  $CL_COLOR                        Circle (ellipse) color
+  $CL_DEPTH                        Circle (ellipse) depth
+  $CL_INDENT                       Circle (ellipse) left margin starting
+                                     position
+  $CL_WEIGHT                       Circle (ellipse) rule weight
+  $CL_WIDTH                        Circle (ellipse) width
+  $CLOSE_INDENT                    Argument passed to CLOSING_INDENT
+  $CODE_FAM                        Family to use with CODE
+  $CODE_FT                         Font to use with CODE
+  $CODE_COLOR                      Color of CODE
+  $COLOR_SCHEME                    Color scheme arg passed to NEWCOLOR
+  $COPY_STYLE                      DRAFT or FINAL
+  $COPYRIGHT                       Copyright info
+  $COPYRIGHT_COVER                 Copyright info for cover
+  $COPYRIGHT_DOCCOVER              Copyright info for doc cover
+  $COPYRIGHT_FAM                   Copyright line family
+  $COPYRIGHT_FT                    Copyright line font
+  $COPYRIGHT_PT_SIZE               Base string to which $COPYRIGHT_SIZE_CHANGE
+                                     is appended
+  $COPYRIGHT_SIZE_CHANGE           Copyright line size
+  $COPYRIGHT_COLOR                 Copyright line color
+  $COPYRIGHT_QUAD                  Copyright line quad direction
+  $COVER_ATTRIBUTE_COLOR           Cover attribution string color
+  $COVER_AUTHOR_COLOR              Cover author(s) color
+  $COVER_AUTHOR_FAM                Cover author(s) family
+  $COVER_AUTHOR_FT                 Cover author(s) font
+  $COVER_AUTHOR_PT_SIZE            Author point size on cover
+  $COVER_AUTHOR_SIZE_CHANGE        Cover author(s) size
+  $COVER_CHAPTER_TITLE_COLOR       Color of chapter title on cover
+  $COVER_CHAPTER_TITLE_PT_SIZE     Size of chapter title on cover
+  $COVER_COLOR                     Overall cover color
+  $COVER_COPYRIGHT_PT_SIZE         Size of copyright info on cover
+  $COVER_DOCTYPE_PT_SIZE           Size of doctype on cover
+  $COVER_FAM                       Overall cover family
+  $COVER_LEAD_ADJ                  String appended to DOC_LEAD to arrive at
+                                     base leading of covers
+  $COVER_SUBTITLE_PT_SIZE          Size of subtitle on cover
+  $COVER_TITLE_PT_SIZE             Size of title on cover
+  $COVER_TITLE                     User-defined cover title string
+  $COVER_TITLE_&lt;n&gt;                 Cover title items
+  $COVER_TITLE_FAM                 Cover title family
+  $COVER_TITLE_FT                  Cover title font
+  $COVER_TITLE_SIZE_CHANGE         Cover title size
+  $COVER_TITLE_COLOR               Cover title color
+  $COVER_UNDERLINE_GAP             Distance between baseline of the doctype
+                                     on covers and the underline
+  $COVER_SUBTITLE_FAM              Cover subtitle family
+  $COVER_SUBTITLE_FT               Cover subtitle font
+  $COVER_SUBTITLE_SIZE_CHANGE      Cover subtitle size
+  $COVER_SUBTITLE_COLOR            Cover subtitle color
+  $COVER_DOCTYPE_FAM               Cover doctype family
+  $COVER_DOCTYPE_FT                Cover doctype font
+  $COVER_DOCTYPE_SIZE_CHANGE       Cover doctype size
+  $COVER_DOCTYPE_COLOR             Cover doctype color
+  $COVER_COPYRIGHT_FAM             Cover copyright family
+  $COVER_COPYRIGHT_FT              Cover copyright font
+  $COVER_COPYRIGHT_SIZE_CHANGE     Cover copyright size
+  $COVER_COPYRIGHT_COLOR           Cover copyright color
+  $COVER_MISC_FAM                  Cover misc family
+  $COVER_MISC_FT                   Cover misc font
+  $COVER_MISC_SIZE_CHANGE          Cover misc size
+  $COVER_MISC_COLOR                Cover misc color
+  $CURRENT_EV                      \n[.ev] at REF_BRACKETS_START
+  $DC_COLOR                        Dropcap color
+  $DOC_COVER_ATTRIBUTE_COLOR       Doc cover attribution string color
+  $DOC_COVER_AUTHOR_COLOR          Doc cover author(s) color
+  $DOC_COVER_AUTHOR_FAM            Doc cover author(s) family
+  $DOC_COVER_AUTHOR_FT             Doc cover author(s) font
+  $DOC_COVER_AUTHOR_PT_SIZE        Size of author on doc cover
+  $DOC_COVER_AUTHOR_SIZE_CHANGE    Doc cover author(s) size
+  $DOC_COVER_CHAPTER_TITLE_COLOR   Color of chapter title on doc cover
+  $DOC_COVER_CHAPTER_TITLE_PT_SIZE Size of chapter title on doc cover
+  $DOC_COVER_COLOR                 Overall doc cover color
+  $DOC_COVER_COPYRIGHT_COLOR       Doc cover copyright color
+  $DOC_COVER_COPYRIGHT_FAM         Doc cover copyright family
+  $DOC_COVER_COPYRIGHT_FT          Doc cover copyright font
+  $DOC_COVER_COPYRIGHT_PT_SIZE     Size of copyright info on doc cover
+  $DOC_COVER_COPYRIGHT_SIZE_CHANGE Doc cover copyright size
+  $DOC_COVER_DOCTYPE_COLOR         Doc cover doctype color
+  $DOC_COVER_DOCTYPE_FAM           Doc cover doctype family
+  $DOC_COVER_DOCTYPE_FT            Doc cover doctype font
+  $DOC_COVER_DOCTYPE_PT_SIZE       Size of doctype on doc cover
+  $DOC_COVER_DOCTYPE_SIZE_CHANGE   Doc cover doctype size
+  $DOC_COVER_MISC_COLOR            Doc cover misc color
+  $DOC_COVER_MISC_FAM              Doc cover misc family
+  $DOC_COVER_MISC_FT               Doc cover misc font
+  $DOC_COVER_MISC_SIZE_CHANGE      Doc cover misc size
+  $DOC_COVER_FAM                   Overall doc cover family
+  $DOC_COVER_LEAD_ADJ              String appended to DOC_LEAD to arrive at base
+                                     leading of doc covers
+  $DOC_COVER_SUBTITLE_FAM          Doc cover subtitle family
+  $DOC_COVER_SUBTITLE_FT           Doc cover subtitle font
+  $DOC_COVER_SUBTITLE_PT_SIZE      Size of subtitle on doc cover
+  $DOC_COVER_SUBTITLE_SIZE_CHANGE  Doc cover subtitle size
+  $DOC_COVER_SUBTITLE_COLOR        Doc cover subtitle color
+  $DOC_COVER_TITLE                 User-defined doc cover title string
+  $DOC_COVER_TITLE_&lt;n&gt;             Doc cover title items
+  $DOC_COVER_TITLE_COLOR           Doc cover title color
+  $DOC_COVER_TITLE_FAM             Doc cover title family
+  $DOC_COVER_TITLE_FT              Doc cover title font
+  $DOC_COVER_TITLE_PT_SIZE         Size of title on doc cover
+  $DOC_COVER_TITLE_SIZE_CHANGE     Doc cover title size
+  $DOC_FAM                         Predominant font family used in the
+                                     document
+  $DOC_QUAD                        Quad used for body text (justified or
+                                     left) 
+  $DOC_TITLE                       Concatenated args passed to DOCTITLE
+  $DOC_TITLE_&lt;n&gt;                   DOCTITLE items
+  $DOC_TYPE                        Document type (default, chapter, named,
+                                     letter)
+  $DOCCOVER_UNDERLINE_GAP          Distance between baseline of doctype and the
+                                     underline on covers
+  $DOCHEADER_COLOR                 Color of docheader
+  $DOCHEADER_FAM                   Family used for all parts of the docheader
+  $DOCHEADER_QUAD                  Quad direction (LRC) of docheader
+  $DOCHEADER_LEAD_ADJ              +|- value applied to #DOC_LEAD to
+                                     in/decrease leading of doc header
+  $DOCTYPE_COLOR                   Color of DOCTYPE string in doc header
+  $DOCTYPE_FAM                     Family to use for DOCTYPE string in
+                                     doc header
+  $DOCTYPE_FT                      Font to use for DOCTYPE string in
+                                     doc header
+  $DOCTYPE_SIZE_CHANGE             ps in/decrease of DOCTYPE string in
+                                     doc header
+  $DOCTYPE_PT_SIZE                 Absolute ps of DOCTYPE
+  $DOCTYPE_UNDERLINE_GAP           Distance between baseline of DOCTYPE and the
+                                     underline in doc header
+  $DRAFT                           The draft number (string valued)
+  $DRAFT_STRING                    What to print whenever the word "draft"
+                                     is required
+  EN_MARK                          Inline, gets #EN_MARK (\(ln)
+  $EN_CLOSE_BRACKET                Close bracket for line-number enumerated
+                                     endnotes
+  $EN_FAMILY                       Family for endnotes
+  $EN_FT                           Font for endnotes
+  $EN_LEAD                         Leading of endnotes pages
+  $EN_LINENUMBER                   String to print for line-number enumerators
+                                     in line-numbered endnotes
+  $EN_LN_FAM                       Family for line-numbers in line-number
+                                     identified endnotes
+  $EN_LN_FT                        Font for line-numbers in line-number
+                                     identified endnotes
+  $EN_LN_GAP                       Gap to leave in initial endnote lines
+                                     between line-number identifies and text
+  $EN_LN_SEP                       User-defined separator to use between line
+                                     number(s) and endnotes when endnotes are
+                                     identified by line number
+  $EN_LN_SIZE_CHANGE               Size change (+ or -) for line-numbers in
+                                     line-number identified endnotes
+  $EN_OPEN_BRACKET                 Open bracket for line-number enumerated
+                                     endnotes
+  $EN_PN_STYLE                     Pagenumbering style for endnotes pages
+  $EN_QUAD                         Quad for endnotes
+  $EN_STRING                       Endnotes page head
+  $EN_STRING_FAM                   Endnotes page head family
+  $EN_STRING_FT                    Endnotes page head font
+  $EN_STRING_QUAD                  Endnotes page head quad direction
+  $EN_STRING_RULE_GAP              Distance between rules when EN_STRING is
+                                     double-underlined
+  $EN_STRING_UNDERLINE_GAP         Distance between baseline of EN_STRING and
+                                     underline rule
+  $EN_STRING_SIZE_CHANGE           Endnotes page head size
+  $EN_TITLE                        Endnote document identifier
+  $EN_TITLE_FAM                    Endnote document identifier family
+  $EN_TITLE_FT                     Endnote document identifier font
+  $EN_TITLE_QUAD                   Endnote document identifier quad
+                                     direction
+  $EN_TITLE_SIZE_CHANGE            Endnote document identifier size
+  $EN_TITLE_UNDERLINE_GAP          Distance between baseline of EN_TITLE and
+                                     underline rule
+  $EN_NUMBER_FAM                   Endnote numbering family
+  $EN_NUMBER_FT                    Endnote numbering font
+  $EN_NUMBER_SIZE_CHANGE           Endnote numbering size
+  $EPI_AUTOLEAD                    Autolead value (decimals ok) of
+                                     epigraphs
+  $EPI_COLOR                       Color of epigraphs
+  $EPI_FAM                         Family to use in epigraphs
+  $EPI_FT                          Font to use in epigraphs
+  $EPI_OFFSET_VALUE                Arg passed to EPIGRAPH_INDENT if the
+                                     arg has a unit of measure appended to it
+  $EPI_QUAD                        Quad in block-style epigraphs
+                                     (justified or left)
+  $EPI_SIZE_CHANGE                 ps in/decrease of epigraphs
+  $EVAL_BIB_SPACE                  Temporary string to find out if the
+                                     arg to BIBLIOGRAPHY_SPACING ended in "v"
+  $EVAL_EI_ARG                     Temporary string to find out whether
+                                     the arg to EPIGRAPH_INDENT ended with
+                                     a unit of measure
+  $EVAL_QI_ARG                     Temporary string to find out whether
+                                     the arg to QUOTE_INDENT ended with
+                                     a unit of measure
+  eval*[B                          Used to get substring of \*([B
+  eval*[S                          Used to get substring of \*([S
+  eval*[s                          Used to get substring of \*([s
+  $FINIS_COLOR                     Color of FINIS string
+  $FINIS_STRING                    What to print when FINIS macro is
+                                     invoked
+  $FIRST_DOC_TITLE                 1st doc's title captured in COLLATE
+    FN_MARK                          Inline, gets #FN_MARK ( \n[ln] )
+  $FN_CLOSE_BRACKET                Close bracket for line-number identified
+                                     footnotes
+  $FN_FAM                          Family used in footnotes
+  $FN_FT                           Font used in footnotes
+  $FN_LINENUMBER                   String to print before footnotes when
+                                     line-numbering enabled for footnotes
+  $FN_LN_SEP                       Separator after line-number identified
+                                     footnotes
+  $FN_OPEN_BRACKET                 Open bracket for line-number identified
+                                     footnotes
+  $FN_QUAD                         Quad used in footnotes
+  $FN_SIZE_CHANGE                  ps in/decrease of footnotes
+  $FN_SPACE                        Post footnote space
+  $FOOTNOTE_COLOR                  Footnote color
+  $FTR_RECTO_QUAD                  Quad direction of footer recto
+  $FTR_RECTO_STRING                String for footer recto
+  $FTR_VERSO_QUAD                  Quad direction of footer verso
+  $FTR_VERSO_STRING                String for footer verso
+  $HDR_RECTO_QUAD                  Quad of header recto
+  $HDR_RECTO_STRING                String for header recto
+  $HDR_VERSO_QUAD                  Quad of header verso
+  $HDR_VERSO_STRING                String for header verso
+
+<span style="display: block; border-top: 1px solid black; border-bottom: 1px solid black; padding-top: 2px;">**Note: "header", in the descriptions below, means either headers or footers</span>
+  $HDRFTR_CENTER                   What to put in CENTER part of headers;
+                                     default doctype
+  $HDRFTR_CENTER_COLOR             Color of CENTER part of headers
+  $HDRFTR_CENTER_FAM               Family of CENTER part of headers
+  $HDRFTR_CENTER_FT                Font of centre part of headers
+  $HDRFTR_CENTER_NEW               HDRFTR_CENTER after the start of TOC;
+                                     defined in HDRFTR_CENTER if
+                                     HDRFTR_CENTER is called as
+                                     FOOTER_CENTER
+  $HDRFTR_CENTER_OLD               HDRFTR_CENTER just prior to start of
+                                     TOC; defined in HDRFTR_CENTER if
+                                     HDRFTR_CENTER is called as
+                                     FOOTER_CENTER
+  $HDRFTR_CENTER_SIZE_CHANGE       ps in/decrease of centre title in
+                                     headers
+  $HDRFTR_COLOR                    Color of headers/footers
+  $HDRFTR_FAM                      Family to use in headers
+  $HDRFTR_LEFT_COLOR               Color of LEFT part of headers
+  $HDRFTR_LEFT_FAM                 Family of left part of headers
+  $HDRFTR_LEFT_FT                  Font of left part of headers
+  $HDRFTR_LEFT_SIZE_CHANGE         ps in/decrease of author in headers
+  $HDRFTR_LEFT                     What to put in left part of headers;
+                                     default author
+  $HDRFTR_RIGHT_COLOR              Color of RIGHT part of headers
+  $HDRFTR_RIGHT_FAM                Family of right part of headers
+  $HDRFTR_RIGHT_FT                 Font of right part of headers
+  $HDRFTR_RIGHT_SIZE_CHANGE        ps in/decrease of right part of
+                                     headers
+  $HDRFTR_RIGHT                    What to put in right part of headers;
+                                     default title
+  $HDRFTR_RULE_COLOR               Color of header rule
+  $HDRFTR_SIZE_CHANGE              ps in/decrease of headers
+  $HDRFTR_TMP_SIZE_CHANGE_SWITCH   Temporarily holds
+                                     HDRFTR_LEFT_SIZE_CHANGE if
+                                     #SWITCH_HDRFTRS=1
+  $HDRFTR_TMP_SWITCH               Temporarily holds HDRFTR_LEFT if
+                                     #SWITCH_HDRFTRS=1
+  $HDRFTR_TMP_COLOR_SWITCH         Temporarily holds HDRFTR_LEFT_COLOR if
+                                     #SWITCH_HDRFTRS=1
+  $HEAD_COLOR                      Head color
+  $HEAD_FAM                        Family to use for section titles
+  $HEAD_FT                         Font to use for section titles
+  $HEAD_QUAD                       Quad value of section titles
+  $HEAD_SIZE_CHANGE                ps in/decrease of section titles
+  $HEAD_UNDERLINE_GAP              Distance between a head and the underline
+  $HYPHEN                          Vertically adjusted hyphen used around page
+                                     numbers
+  $LHS                             Holds digits on the left side of the decimal
+                                     in weight arg passed to RULE_WEIGHT
+  $LINEBREAK_CHAR                  Character that marks line breaks
+  $LINEBREAK_CHAR_V_ADJ            +|- amount by which to raise/lower
+                                     linebreak character
+  $LAST_CHAR                       Temporary string used to discover whether
+                                     user has remembered to put a digit after
+                                     ROMAN or roman in arg to LIST
+  $LINEBREAK_COLOR                 Linebreak color
+  $LIST_ARG_1                      The first arg to LIST (minus digits if
+                                     ROMAN or roman
+  $LN_COLOR                        Linenumber color
+  $LN_FAMILY                       Linenumber family
+  $LN_FONT                         Linenumber font
+  $LN_GUTTER                       Gutter to leave between line numbers
+                                     and text
+  $LN_INC                          2nd arg to NUMBER_LINES as a string
+  $LN_NUM                          1st arg to NUMBER_LINES as a string
+  $LN_SIZE_CHANGE                  ps in/decrease of linenumbers
+  $MISC_&lt;n&gt;                        Position of args pass to MISC
+  $MISC_COLOR                      Misc color
+  $MISC_COVER_&lt;n&gt;                  Misc items for cover
+  $MISC_DOCCOVER_&lt;n&gt;               Misc items for doc cover
+  $MISC_QUAD                       Misc quad direction
+  $MN-arg&lt;n&gt;                       Sequentially numbered args passed to MNinit
+    MN-color                         Color of margin note
+    MN-curr                          Number of current margin note
+    MN-dir                           Left or right margin note
+    MN-font                          Font of margin note
+    MN-left-ad                       Fill mode of margin note
+    PAGE#                            For use in hdrftr strings where page #
+                                       is needed; \*[PAGE]
+  $PAGENUM_COLOR                   Page number color
+  $PAGENUM_STYLE                   String passed to PAGENUM_STYLE
+  $PAGE_NUM_FAM                    Family of page numbers
+  $PAGE_NUM_FT                     Font of page numbers
+  $PAGE_NUM_SIZE_CHANGE            ps in/decrease of page numbers
+  $PAPER                           Paper size (LETTER, A4, LEGAL);
+                                     default=LETTER
+  $PH_COLOR                        Parahead color
+  $PH_FAM                          Parahead family
+  $PH_FT                           Parahead font
+  $PH_SIZE_CHANGE                  ps in/decrease of paraheads
+  $PH_SPACE                        Amount of horizontal space between a parahead
+                                     and the start of paragraph text
+  $PP_FT                           Font used in paragraphs
+  $RESTORE_PAGENUM_STYLE           Hold previous page numbering style
+  $ROMAN_WIDTH&lt;n&gt;                     The digit(s) appended by user to ROMAN or
+                                      roman when LIST is invoked
+  $Q_LN_GUTTER                     Gutter between linenumbers and quotes
+                                     in quotes
+  $Q_OFFSET_VALUE                  Arg passed to QUOTE_INDENT if the
+                                     arg has a unit of measure appended to it
+  $QUOTE_COLOR                     Quote (poetic) color
+  $QUOTE_FAM                       Family to use for pquotes
+  $QUOTE_FT                        Font to use for pquotes
+  $QUOTE_SIZE_CHANGE               ps in/decrease of pquotes
+  ref*post-punct                   Final punctuation mark of references
+  ref*spec!&lt;n&gt;                     Holds fields required by differing reference
+                                     types
+  ref*string                       The data passed to a reference
+  $REF_BIB_INDENT                  2nd line indent value for references in
+                                     bibliographies
+  $REF_EN_INDENT                   2nd line indent value for references in
+                                     endnotes
+  $REF_FN_INDENT                   2nd line indent value for references in
+                                     footnotes
+  $REF_STYLE                       MLA bibliography-style or footnote/endnote
+                                     style; used in ref*add-&lt;x&gt;
+  $RESTORE_SS_VAR                  Saves \*[$SS_VAR] for use with ref*build
+  #REVISION                        The revision number (string valued)
+  $REVISION_STRING                 What to print whenever the word
+                                     "revision" is required
+  $RHS                             Holds digits on the right side of the decimal
+                                     in weight arg passed to RULE_WEIGHT
+  $RL_COLOR                        Rule color (DRH/DRV)
+  $RL_DEPTH                        Rule depth (DRH/DRV)
+  $RL_INDENT                       Left start position of rule (DRH/DRV)
+  $RL_LENGTH                       Rule length (DRH/DRV)
+  $RL_WEIGHT                       Rule weight (DRH/DRV)
+  $SAVED_COPYRIGHT                 Temporarily holds string in $COPYRIGHT
+  $SAVED_RULE_GAP                  Temporarily holds string in $RULE_GAP
+  $SAVED_PP_FT                     $PP_FT in effect at start of
+                                     .COLLATE; tested for and removed
+                                     in .PP
+  $SH_FAM                          Family to use in subheads
+  $SH_FT                           Font to use in subheads
+  $SH_SIZE_CHANGE                  ps in/decrease of subheads
+  $SH_COLOR                        Subhead color
+  $SIG_SPACE                       Arg passed to macro, SIGNATURE_SPACE
+  $SUBTITLE                        Concatenated args passed to SUBTITLE
+  $SUBTITLE_&lt;n&gt;                    Subtitle items for doc header
+  $SUBTITLE_COLOR                  Color of subtitle
+  $SUBTITLE_COVER_&lt;n&gt;              Subtitle items for cover
+  $SUBTITLE_DOCCOVER_&lt;n&gt;           Subtitle items for doc cover
+  $SUBTITLE_FAM                    Family to use for subtitle in doc
+                                     header
+  $SUBTITLE_FT                     Font to use for subtitle in doc header
+  $SUBTITLE_SIZE_CHANGE            ps in/decrease of subtitle
+  $SUBTITLE_PT_SIZE                Absolute ps of subtitle
+  $SUITE                           The #SUITE number register
+  $TITLE                           Concatenated args pass to TITLE
+  $TITLE_&lt;n&gt;                       Title items
+  $TITLE_COLOR                     Color of title
+  $TITLE_FAM                       Family to use for title in doc header
+  $TITLE_FT                        Font to use for title in doc header
+  $TITLE_PT_SIZE                   Absolute point size of title in docheader
+  $TITLE_SIZE_CHANGE               ps in/decrease of title in doc header
+  $TOC_AUTHORS                     What to print after toc doc title entry
+                                     if #TOC_AUTHORS=1
+  $TOC_FAM                         Family to use on toc pages
+  $TOC_HEAD_FAM                    Family of toc head entries
+  $TOC_HEAD_FT                     Font of toc head entries
+  $TOC_HEAD_ITEM                   A head as collected for TOC_ENTRIES
+  $TOC_HEADER_FAM                  Family to use for "Contents"
+  $TOC_HEADER_FT                   Font to use for "Contents"
+  $TOC_HEADER_QUAD                 Quad direction of "Contents"
+  $TOC_HEADER_SIZE                 ps in/decrease of "Contents"****
+  $TOC_HEADER_STRING               Header string of first toc page
+  $TOC_LEAD                        Leading of toc pages
+  $TOC_PH_ITEM                     Toc parahead entry
+  $TOC_PN                          Sets up toc leaders + entry pn
+                                     (typeset)
+  $TOC_PN_FAM                      Family for toc entries page numbers
+  $TOC_PN_FT                       Font for toc entries page numbers
+  $TOC_PN_SIZE_CHANGE              ps in/decrease of toc entries page
+                                     numbers
+  $TOC_PN_STYLE                    Page-numbering style of toc pages
+  $TOC_PN_TYPEWRITE                Sets up toc leaders + entry pn
+                                     (typewrite)
+  $TOC_PH_FAM                      Family of toc parahead entries
+  $TOC_PH_FT                       Font of toc parahead entries
+  $TOC_PARAHEAD_ITEM               A parahead collected for TOC_ENTRIES
+  $TOC_SH_FAM                      Family of toc subhead entries
+  $TOC_SH_FT                       Font of toc subhead entries
+  $TOC_SH_ITEM                     A subhead collected for TOC_ENTRIES
+  $TOC_TITLE_FAM                   Family of toc doc title entries
+  $TOC_TITLE_FT                    Font of toc doc title entries
+  $TOC_TITLE_ITEM                  Toc document title item
+  $USER_SET_TITLE_ITEM             User defined toc doc title entry as
+                                     set by TOC_TITLE_ENTRY
+  $UR_PAGINATION_STYLE             Pagination style prior to endnotes
+  $USERDEF_HDRFTR_RECTO            User defined header/footer recto string
+  $USERDEF_HDRFTR_VERSO            User defined header/footer verso string
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++PREPROCESSOR KEYWORDS+++</span>
 
-+++ALIASES+++
+  (eqn) EQ EN   (grn) GS GE GF   (pic) PS PE   (refer) R1 R2 [ ]
 
-Please note:
+  (tbl) TS TE TH   (grap) G1 G2   (ideal) IS IE   (chem) cstart cend
 
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++ALIASES+++</span>
+
+<span style="display: block; border: 1px solid black; padding-left: 12px; padding-bottom: 9px;">
+<span style="display: block; margin-top: -1em;">Please note:</span>
 Prior to version 1.1.9, all macros that included the word COLOR had
 aliases that used COLOUR instead.  This convenience has now been
 removed, in an effort to reduce the size of the om.tmac file.
 
-Furthermore, if you want the convenience, you'll have to edit the
+  Furthermore, if you want the convenience, you'll have to edit the
 om.tmac file.  Simply aliasing, say, HEAD_COLOR as HEAD_COLOUR will
 not work, owing to significant changes in the handling of
 docelement control macros that end in _COLOR.
+</span>
+
+<span style="display: block; margin-top: -1.5em; margin-bottom: -2.5em;">+++These aliases are for convenience, and header/footer management+++</span>
+
+  BIBLIOGRAPHY_STRING_UNDERSCORE    BIBLIOGRAPHY_STRING_UNDERLINE
+  BREAK_BLOCKQUOTE                  BREAK_QUOTE
+  BREAK_CITATION                    BREAK_QUOTE
+  BREAK_CITE                        BREAK_QUOTE
+  CITATION                          BLOCKQUOTE
+  CITE                              BLOCKQUOTE
+  COL_BREAK                         COL_NEXT
+  DOC_FAM                           DOC_FAMILY
+  DOC_LLENGTH                       DOC_LINE_LENGTH
+  DOC_L_LENGTH                      DOC_LINE_LENGTH
+  DOC_L_MARGIN                      DOC_LEFT_MARGIN
+  DOC_LMARGIN                       DOC_LEFT_MARGIN
+  DOC_LS                            DOC_LEAD
+  DOC_PS                            DOC_PT_SIZE
+  DOC_R_MARGIN                      DOC_RIGHT_MARGIN
+  DOC_RMARGIN                       DOC_RIGHT_MARGIN
+  ENDNOTE_STRING_UNDERSCORE         ENDNOTE_STRING_UNDERLINE
+  ENDNOTE_TITLE_UNDERSCORE          ENDNOTE_TITLE_UNDERLINE
+  FOOTER_CENTER_CAPS                HDRFTR_CENTER_CAPS
+  FOOTER_CENTER                     HDRFTR_CENTER
+  FOOTER_CENTRE_CAPS                HDRFTR_CENTER_CAPS
+  FOOTER_CENTRE                     HDRFTR_CENTER
+  FOOTER_LEFT_CAPS                  HDRFTR_LEFT_CAPS
+  FOOTER_LEFT                       HDRFTR_LEFT
+  FOOTER_PLAIN                      HDRFTR_PLAIN
+  FOOTER_RECTO                      HDRFTR_RECTO
+  FOOTER_RIGHT_CAPS                 HDRFTR_RIGHT_CAPS
+  FOOTER_RIGHT                      HDRFTR_RIGHT
+  FOOTER_RULE_GAP                   HDRFTR_RULE_GAP
+  FOOTER_RULE                       HDRFTR_RULE
+  FOOTER_VERSO                      HDRFTR_VERSO
+  HDRFTR_RULE_INTERNAL              HDRFTR_RULE
+  HEADER_CENTER_CAPS                HDRFTR_CENTER_CAPS
+  HEADER_CENTER                     HDRFTR_CENTER
+  HEADER_CENTRE_CAPS                HDRFTR_CENTER_CAPS
+  HEADER_CENTRE                     HDRFTR_CENTER
+  HEADER_LEFT_CAPS                  HDRFTR_LEFT_CAPS
+  HEADER_LEFT                       HDRFTR_LEFT
+  HEADER_PLAIN                      HDRFTR_PLAIN
+  HEADER_RECTO                      HDRFTR_RECTO
+  HEADER_RIGHT_CAPS                 HDRFTR_RIGHT_CAPS
+  HEADER_RIGHT                      HDRFTR_RIGHT
+  HEADER_RULE_GAP                   HDRFTR_RULE_GAP
+  HEADER_RULE                       HDRFTR_RULE
+  HEADER_VERSO                      HDRFTR_VERSO
+  PAGENUM                           PAGENUMBER
+  PAGINATION                        PAGINATE
+  PP_FT                             PP_FONT
+  PRINT_FOOTNOTE_RULE               FOOTNOTE_RULE
+  SWITCH_FOOTERS                    SWITCH_HDRFTR
+  SWITCH_HEADERS                    SWITCH_HDRFTR
+  TOC_LS                            TOC_LEAD
+  TOC_PS                            TOC_PT_SIZE
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++These aliases are used for docelement type-style control+++</span>
+
+  AUTHOR_FAMILY                 _FAMILY
+  AUTHOR_FONT                   _FONT
+  AUTHOR_SIZE                   _SIZE
+  BIBLIOGRAPHY_FAMILY           _FAMILY
+  BIBLIOGRAPHY_FONT             _FONT
+  BIBLIOGRAPHY_FOOTER_CENTER    BIBLIOGRAPHY_HDRFTR_CENTER
+  BIBLIOGRAPHY_FOOTER_CENTRE    BIBLIOGRAPHY_HDRFTR_CENTRE
+  BIBLIOGRAPHY_HEADER_CENTER    BIBLIOGRAPHY_HDRFTR_CENTER
+  BIBLIOGRAPHY_HEADER_CENTRE    BIBLIOGRAPHY_HDRFTR_CENTRE
+  BIBLIOGRAPHY_QUAD             _QUAD
+  BIBLIOGRAPHY_STRING_FAMILY    _FAMILY
+  BIBLIOGRAPHY_STRING_FONT      _FONT
+  BIBLIOGRAPHY_STRING_QUAD      _QUAD
+  BIBLIOGRAPHY_STRING_SIZE      _SIZE
+  BLOCKQUOTE_AUTOLEAD           Q_AUTOLEAD
+  BLOCKQUOTE_AUTOLEAD           QUOTE_AUTOLEAD
+  BLOCKQUOTE_COLOR              _COLOR
+  BLOCKQUOTE_FAMILY             _FAMILY
+  BLOCKQUOTE_FONT               _FONT
+  BLOCKQUOTE_QUAD               _QUAD
+  BLOCKQUOTE_SIZE               _SIZE
+  CHAPTER_TITLE_COLOR           _COLOR
+  CHAPTER_TITLE_FAMILY          _FAMILY
+  CHAPTER_TITLE_FONT            _FONT
+  CHAPTER_TITLE_SIZE            _SIZE
+  COVER_ATTRIBUTE_COLOR         _COLOR
+  COVER_AUTHOR_COLOR            _COLOR
+  COVER_AUTHOR_FAMILY           _FAMILY
+  COVER_AUTHOR_FONT             _FONT
+  COVER_AUTHOR_SIZE             _SIZE
+  COVER_COLOR                   _COLOR
+  COVER_COPYRIGHT_COLOR         _COLOR
+  COVER_COPYRIGHT_FAMILY        _FAMILY
+  COVER_COPYRIGHT_FONT          _FONT
+  COVER_COPYRIGHT_QUAD          _QUAD
+  COVER_COPYRIGHT_SIZE          _SIZE
+  COVER_DOCTYPE_COLOR           _COLOR
+  COVER_DOCTYPE_FAMILY          _FAMILY
+  COVER_DOCTYPE_FONT            _FONT
+  COVER_DOCTYPE_SIZE            _SIZE
+  COVER_FAMILY                  _FAMILY
+  COVER_MISC_COLOR              _COLOR
+  COVER_MISC_QUAD               _QUAD
+  COVER_SUBTITLE_COLOR          _COLOR
+  COVER_SUBTITLE_FAMILY         _FAMILY
+  COVER_SUBTITLE_FONT           _FONT
+  COVER_SUBTITLE_SIZE           _SIZE
+  COVER_TITLE_COLOR             _COLOR
+  COVER_TITLE_FAMILY            _FAMILY
+  COVER_TITLE_FONT              _FONT
+  COVER_TITLE_SIZE              _SIZE
+  DOC_COVER_ATTRIBUTE_COLOR     _COLOR
+  DOC_COVER_AUTHOR_COLOR        _COLOR
+  DOC_COVER_AUTHOR_FAMILY       _FAMILY
+  DOC_COVER_AUTHOR_FONT         _FONT
+  DOC_COVER_AUTHOR_SIZE         _SIZE
+  DOC_COVER_COLOR               _COLOR
+  DOC_COVER_COPYRIGHT_COLOR     _COLOR
+  DOC_COVER_COPYRIGHT_FAMILY    _FAMILY
+  DOC_COVER_COPYRIGHT_FONT      _FONT
+  DOC_COVER_COPYRIGHT_QUAD      _QUAD
+  DOC_COVER_COPYRIGHT_SIZE      _SIZE
+  DOC_COVER_DOCTYPE_COLOR       _COLOR
+  DOC_COVER_DOCTYPE_FAMILY      _FAMILY
+  DOC_COVER_DOCTYPE_FONT        _FONT
+  DOC_COVER_DOCTYPE_SIZE        _SIZE
+  DOC_COVER_FAMILY              _FAMILY
+  DOC_COVER_MISC_COLOR          _COLOR
+  DOC_COVER_MISC_QUAD           _QUAD
+  DOC_COVER_SUBTITLE_COLOR      _COLOR
+  DOC_COVER_SUBTITLE_FAMILY     _FAMILY
+  DOC_COVER_SUBTITLE_FONT       _FONT
+  DOC_COVER_SUBTITLE_SIZE       _SIZE
+  DOC_COVER_TITLE_COLOR         _COLOR
+  DOC_COVER_TITLE_FAMILY        _FAMILY
+  DOC_COVER_TITLE_FONT          _FONT
+  DOC_COVER_TITLE_SIZE          _SIZE
+  DOCHEADER_COLOR               _COLOR
+  DOCHEADER_FAMILY              _FAMILY
+  DOCHEADER_QUAD                _QUAD
+  DOC_QUAD                      _QUAD
+  DOCTYPE_FAMILY                _FAMILY
+  DOCTYPE_FONT                  _FONT
+  DOCTYPE_SIZE                  _SIZE
+  ENDNOTE_BLOCKQUOTE_AUTOLEAD   Q_AUTOLEAD
+  ENDNOTE_BLOCKQUOTE_AUTOLEAD   QUOTE_AUTOLEAD
+  ENDNOTE_FAMILY                _FAMILY
+  ENDNOTE_FONT                  _FONT
+  ENDNOTE_LINENUMBER_FAMILY     _FAMILY
+  ENDNOTE_LINENUMBER_FONT       _FONT
+  ENDNOTE_LINENUMBER_SIZE       _SIZE
+  ENDNOTE_NUMBER_FAMILY         _FAMILY
+  ENDNOTE_NUMBER_FONT           _FONT
+  ENDNOTE_NUMBER_SIZE           _SIZE
+  ENDNOTE_QUAD                  _QUAD
+  ENDNOTE_QUOTE_AUTLOEAD        Q_AUTOLEAD
+  ENDNOTE_QUOTE_AUTOLEAD        QUOTE_AUTOLEAD
+  ENDNOTE_STRING_FAMILY         _FAMILY
+  ENDNOTE_STRING_FONT           _FONT
+  ENDNOTE_STRING_QUAD           _QUAD
+  ENDNOTE_STRING_SIZE           _SIZE
+  ENDNOTE_TITLE_FAMILY          _FAMILY
+  ENDNOTE_TITLE_FONT            _FONT
+  ENDNOTE_TITLE_QUAD            _QUAD
+  ENDNOTE_TITLE_SIZE            _SIZE
+  EPIGRAPH_COLOR                _COLOR
+  EPIGRAPH_FAMILY               _FAMILY
+  EPIGRAPH_FONT                 _FONT
+  EPIGRAPH_QUAD                 _QUAD
+  EPIGRAPH_SIZE                 _SIZE
+  FINIS_COLOR                   _COLOR
+  FOOTNOTE_COLOR                _COLOR
+  FOOTNOTE_FAMILY               _FAMILY
+  FOOTNOTE_FONT                 _FONT
+  FOOTNOTE_QUAD                 _QUAD
+  FOOTNOTE_SIZE                 _SIZE
+  HDRFTR_CENTER_FAMILY          _FAMILY
+  HDRFTR_CENTER_FONT            _FONT
+  HDRFTR_CENTER_SIZE            _SIZE
+  HDRFTR_COLOR                  _COLOR
+  HDRFTR_FAMILY                 _FAMILY
+  HDRFTR_LEFT_FAMILY            _FAMILY
+  HDRFTR_LEFT_FONT              _FONT
+  HDRFTR_LEFT_SIZE              _SIZE
+  HDRFTR_RIGHT_FAMILY           _FAMILY
+  HDRFTR_RIGHT_FONT             _FONT
+  HDRFTR_RIGHT_SIZE             _SIZE
+  HDRFTR_RULE_COLOR             _COLOR
+  HDRFTR_SIZE                   _SIZE
+  HEAD_COLOR                    _COLOR
+  HEAD_FAMILY                   _FAMILY
+  HEAD_FONT                     _FONT
+  HEAD_QUAD                     _QUAD
+  HEAD_SIZE                     _SIZE
+  LINEBREAK_COLOR               _COLOR
+  LINENUMBER_FAMILY             _COLOR
+  LINENUMBER_FONT               _COLOR
+  LINENUMBER_SIZE               _COLOR
+  LINENUMBER_COLOR              _COLOR
+  MISC_COLOR                    _COLOR
+  MISC_QUAD                     _QUAD
+  PAGENUM_COLOR                 _COLOR
+  PAGENUM_FAMILY                _FAMILY
+  PAGENUM_FONT                  _FONT
+  PARAHEAD_COLOR                _COLOR
+  PARAHEAD_FAMILY               _FAMILY
+  PARAHEAD_FONT                 _FONT
+  PARAHEAD_SIZE                 _SIZE
+  QUOTE_COLOR                   _COLOR
+  QUOTE_FAMILY                  _FAMILY
+  QUOTE_FONT                    _FONT
+  QUOTE_INDENT                  _INDENT
+  QUOTE_SIZE                    _SIZE
+  REF_INDENT                    INDENT_REFS
+  REF)                          REF_BRACKETS_END
+  REF]                          REF_BRACKETS_END
+  REF}                          REF_BRACKETS_END
+  REF(                          REF_BRACKETS_START
+  REF[                          REF_BRACKETS_START
+  REF{                          REF_BRACKETS_START
+  SUBHEAD_COLOR                 _COLOR
+  SUBHEAD_FAMILY                _FAMILY
+  SUBHEAD_FONT                  _FONT
+  SUBHEAD_SIZE                  _SIZE
+  SUBTITLE_COLOR                _COLOR
+  SUBTITLE_FAMILY               _FAMILY
+  SUBTITLE_FONT                 _FONT
+  SUBTITLE_SIZE                 _SIZE
+  TITLE_COLOR                   _COLOR
+  TITLE_FAMILY                  _FAMILY
+  TITLE_FONT                    _FONT
+  TITLE_SIZE                    _SIZE
+  TOC_FAM                       _FAMILY
+  TOC_FAMILY                    _FAMILY
+  TOC_HEADER_FAMILY             _FAMILY
+  TOC_HEADER_FONT               _FONT
+  TOC_HEADER_QUAD               _QUAD
+  TOC_HEADER_SIZE               _SIZE
+  TOC_HEAD_FAMILY               _FAMILY
+  TOC_HEAD_FONT                 _FONT
+  TOC_HEAD_SIZE                 _SIZE
+  TOC_PARAHEAD_FAMILY           _FAMILY
+  TOC_PARAHEAD_FONT             _FONT
+  TOC_PARAHEAD_SIZE             _SIZE
+  TOC_PN_FAMILY                 _FAMILY
+  TOC_PN_FONT                   _FONT
+  TOC_PN_SIZE                   _SIZE
+  TOC_PT_SIZE                   _SIZE
+  TOC_SUBHEAD_FAMILY            _FAMILY
+  TOC_SUBHEAD_FONT              _FONT
+  TOC_SUBHEAD_SIZE              _SIZE
+  TOC_TITLE_FAMILY              _FAMILY
+  TOC_TITLE_FONT                _FONT
+  TOC_TITLE_SIZE                _SIZE
+
+<span style="display: block; margin-top: -.5em; margin-bottom: -2.5em;">+++These aliases are used to control underlining/underscoring weights+++</span>
+
+  UNDERSCORE_WEIGHT                     RULE_WEIGHT
+  HEAD_UNDERLINE_WEIGHT                 RULE_WEIGHT
+  HEADER_RULE_WEIGHT                    RULE_WEIGHT
+  FOOTER_RULE_WEIGHT                    RULE_WEIGHT
+  FOOTNOTE_RULE_WEIGHT                  RULE_WEIGHT
+  COVER_UNDERLINE_WEIGHT                RULE_WEIGHT
+  DOC_COVER_UNDERLINE_WEIGHT            RULE_WEIGHT
+  ENDNOTE_STRING UNDERLINE_WEIGHT       RULE_WEIGHT
+  ENDNOTE_TITLE UNDERLINE_WEIGHT        RULE_WEIGHT
+  BIBLIOGRAPHY_STRING UNDERLINE_WEIGHT  RULE_WEIGHT
+</span>
+
+<div class="rule-long" style="margin-top: 2em;"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: right;"><a href="#top">Top</a></td>
+</tr>
+</table>
 
-+++The following are for convenience, and header/footer management+++
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
-BIBLIOGRAPHY_STRING_UNDERSCORE    BIBLIOGRAPHY_STRING_UNDERLINE
-BREAK_BLOCKQUOTE                  BREAK_QUOTE
-BREAK_CITATION                    BREAK_QUOTE
-BREAK_CITE                        BREAK_QUOTE
-CITATION                          BLOCKQUOTE
-CITE                              BLOCKQUOTE
-COL_BREAK                         COL_NEXT
-DOC_FAM                           DOC_FAMILY
-DOC_LLENGTH                       DOC_LINE_LENGTH
-DOC_L_LENGTH                      DOC_LINE_LENGTH
-DOC_L_MARGIN                      DOC_LEFT_MARGIN
-DOC_LMARGIN                       DOC_LEFT_MARGIN
-DOC_LS                            DOC_LEAD
-DOC_PS                            DOC_PT_SIZE
-DOC_R_MARGIN                      DOC_RIGHT_MARGIN
-DOC_RMARGIN                       DOC_RIGHT_MARGIN
-ENDNOTE_STRING_UNDERSCORE         ENDNOTE_STRING_UNDERLINE
-ENDNOTE_TITLE_UNDERSCORE          ENDNOTE_TITLE_UNDERLINE
-FOOTER_CENTER_CAPS                HDRFTR_CENTER_CAPS
-FOOTER_CENTER                     HDRFTR_CENTER
-FOOTER_CENTRE_CAPS                HDRFTR_CENTER_CAPS
-FOOTER_CENTRE                     HDRFTR_CENTER
-FOOTER_LEFT_CAPS                  HDRFTR_LEFT_CAPS
-FOOTER_LEFT                       HDRFTR_LEFT
-FOOTER_PLAIN                      HDRFTR_PLAIN
-FOOTER_RECTO                      HDRFTR_RECTO
-FOOTER_RIGHT_CAPS                 HDRFTR_RIGHT_CAPS
-FOOTER_RIGHT                      HDRFTR_RIGHT
-FOOTER_RULE_GAP                   HDRFTR_RULE_GAP
-FOOTER_RULE                       HDRFTR_RULE
-FOOTER_VERSO                      HDRFTR_VERSO
-HDRFTR_RULE_INTERNAL              HDRFTR_RULE
-HEADER_CENTER_CAPS                HDRFTR_CENTER_CAPS
-HEADER_CENTER                     HDRFTR_CENTER
-HEADER_CENTRE_CAPS                HDRFTR_CENTER_CAPS
-HEADER_CENTRE                     HDRFTR_CENTER
-HEADER_LEFT_CAPS                  HDRFTR_LEFT_CAPS
-HEADER_LEFT                       HDRFTR_LEFT
-HEADER_PLAIN                      HDRFTR_PLAIN
-HEADER_RECTO                      HDRFTR_RECTO
-HEADER_RIGHT_CAPS                 HDRFTR_RIGHT_CAPS
-HEADER_RIGHT                      HDRFTR_RIGHT
-HEADER_RULE_GAP                   HDRFTR_RULE_GAP
-HEADER_RULE                       HDRFTR_RULE
-HEADER_VERSO                      HDRFTR_VERSO
-PAGENUM                           PAGENUMBER
-PAGINATION                        PAGINATE
-PP_FT                             PP_FONT
-PRINT_FOOTNOTE_RULE               FOOTNOTE_RULE
-SWITCH_FOOTERS                    SWITCH_HDRFTR
-SWITCH_HEADERS                    SWITCH_HDRFTR
-TOC_LS                            TOC_LEAD
-TOC_PS                            TOC_PT_SIZE
-
-+++The following are used for docelement type-style control+++
-
-AUTHOR_FAMILY                 _FAMILY
-AUTHOR_FONT                   _FONT
-AUTHOR_SIZE                   _SIZE
-BIBLIOGRAPHY_FAMILY           _FAMILY
-BIBLIOGRAPHY_FONT             _FONT
-BIBLIOGRAPHY_FOOTER_CENTER    BIBLIOGRAPHY_HDRFTR_CENTER
-BIBLIOGRAPHY_FOOTER_CENTRE    BIBLIOGRAPHY_HDRFTR_CENTRE
-BIBLIOGRAPHY_HEADER_CENTER    BIBLIOGRAPHY_HDRFTR_CENTER
-BIBLIOGRAPHY_HEADER_CENTRE    BIBLIOGRAPHY_HDRFTR_CENTRE
-BIBLIOGRAPHY_QUAD             _QUAD
-BIBLIOGRAPHY_STRING_FAMILY    _FAMILY
-BIBLIOGRAPHY_STRING_FONT      _FONT
-BIBLIOGRAPHY_STRING_QUAD      _QUAD
-BIBLIOGRAPHY_STRING_SIZE      _SIZE
-BLOCKQUOTE_AUTOLEAD           Q_AUTOLEAD
-BLOCKQUOTE_AUTOLEAD           QUOTE_AUTOLEAD
-BLOCKQUOTE_COLOR              _COLOR
-BLOCKQUOTE_FAMILY             _FAMILY
-BLOCKQUOTE_FONT               _FONT
-BLOCKQUOTE_QUAD               _QUAD
-BLOCKQUOTE_SIZE               _SIZE
-CHAPTER_TITLE_COLOR           _COLOR
-CHAPTER_TITLE_FAMILY          _FAMILY
-CHAPTER_TITLE_FONT            _FONT
-CHAPTER_TITLE_SIZE            _SIZE
-COVER_ATTRIBUTE_COLOR         _COLOR
-COVER_AUTHOR_COLOR            _COLOR
-COVER_AUTHOR_FAMILY           _FAMILY
-COVER_AUTHOR_FONT             _FONT
-COVER_AUTHOR_SIZE             _SIZE
-COVER_COLOR                   _COLOR
-COVER_COPYRIGHT_COLOR         _COLOR
-COVER_COPYRIGHT_FAMILY        _FAMILY
-COVER_COPYRIGHT_FONT          _FONT
-COVER_COPYRIGHT_QUAD          _QUAD
-COVER_COPYRIGHT_SIZE          _SIZE
-COVER_DOCTYPE_COLOR           _COLOR
-COVER_DOCTYPE_FAMILY          _FAMILY
-COVER_DOCTYPE_FONT            _FONT
-COVER_DOCTYPE_SIZE            _SIZE
-COVER_FAMILY                  _FAMILY
-COVER_MISC_COLOR              _COLOR
-COVER_MISC_QUAD               _QUAD
-COVER_SUBTITLE_COLOR          _COLOR
-COVER_SUBTITLE_FAMILY         _FAMILY
-COVER_SUBTITLE_FONT           _FONT
-COVER_SUBTITLE_SIZE           _SIZE
-COVER_TITLE_COLOR             _COLOR
-COVER_TITLE_FAMILY            _FAMILY
-COVER_TITLE_FONT              _FONT
-COVER_TITLE_SIZE              _SIZE
-DOC_COVER_ATTRIBUTE_COLOR     _COLOR
-DOC_COVER_AUTHOR_COLOR        _COLOR
-DOC_COVER_AUTHOR_FAMILY       _FAMILY
-DOC_COVER_AUTHOR_FONT         _FONT
-DOC_COVER_AUTHOR_SIZE         _SIZE
-DOC_COVER_COLOR               _COLOR
-DOC_COVER_COPYRIGHT_COLOR     _COLOR
-DOC_COVER_COPYRIGHT_FAMILY    _FAMILY
-DOC_COVER_COPYRIGHT_FONT      _FONT
-DOC_COVER_COPYRIGHT_QUAD      _QUAD
-DOC_COVER_COPYRIGHT_SIZE      _SIZE
-DOC_COVER_DOCTYPE_COLOR       _COLOR
-DOC_COVER_DOCTYPE_FAMILY      _FAMILY
-DOC_COVER_DOCTYPE_FONT        _FONT
-DOC_COVER_DOCTYPE_SIZE        _SIZE
-DOC_COVER_FAMILY              _FAMILY
-DOC_COVER_MISC_COLOR          _COLOR
-DOC_COVER_MISC_QUAD           _QUAD
-DOC_COVER_SUBTITLE_COLOR      _COLOR
-DOC_COVER_SUBTITLE_FAMILY     _FAMILY
-DOC_COVER_SUBTITLE_FONT       _FONT
-DOC_COVER_SUBTITLE_SIZE       _SIZE
-DOC_COVER_TITLE_COLOR         _COLOR
-DOC_COVER_TITLE_FAMILY        _FAMILY
-DOC_COVER_TITLE_FONT          _FONT
-DOC_COVER_TITLE_SIZE          _SIZE
-DOCHEADER_COLOR               _COLOR
-DOCHEADER_FAMILY              _FAMILY
-DOC_QUAD                      _QUAD
-DOCTYPE_FAMILY                _FAMILY
-DOCTYPE_FONT                  _FONT
-DOCTYPE_SIZE                  _SIZE
-ENDNOTE_BLOCKQUOTE_AUTOLEAD   Q_AUTOLEAD
-ENDNOTE_BLOCKQUOTE_AUTOLEAD   QUOTE_AUTOLEAD
-ENDNOTE_FAMILY                _FAMILY
-ENDNOTE_FONT                  _FONT
-ENDNOTE_LINENUMBER_FAMILY     _FAMILY
-ENDNOTE_LINENUMBER_FONT       _FONT
-ENDNOTE_LINENUMBER_SIZE       _SIZE
-ENDNOTE_NUMBER_FAMILY         _FAMILY
-ENDNOTE_NUMBER_FONT           _FONT
-ENDNOTE_NUMBER_SIZE           _SIZE
-ENDNOTE_QUAD                  _QUAD
-ENDNOTE_QUOTE_AUTLOEAD        Q_AUTOLEAD
-ENDNOTE_QUOTE_AUTOLEAD        QUOTE_AUTOLEAD
-ENDNOTE_STRING_FAMILY         _FAMILY
-ENDNOTE_STRING_FONT           _FONT
-ENDNOTE_STRING_QUAD           _QUAD
-ENDNOTE_STRING_SIZE           _SIZE
-ENDNOTE_TITLE_FAMILY          _FAMILY
-ENDNOTE_TITLE_FONT            _FONT
-ENDNOTE_TITLE_QUAD            _QUAD
-ENDNOTE_TITLE_SIZE            _SIZE
-EPIGRAPH_COLOR                _COLOR
-EPIGRAPH_FAMILY               _FAMILY
-EPIGRAPH_FONT                 _FONT
-EPIGRAPH_QUAD                 _QUAD
-EPIGRAPH_SIZE                 _SIZE
-FINIS_COLOR                   _COLOR
-FOOTNOTE_COLOR                _COLOR
-FOOTNOTE_FAMILY               _FAMILY
-FOOTNOTE_FONT                 _FONT
-FOOTNOTE_QUAD                 _QUAD
-FOOTNOTE_SIZE                 _SIZE
-HDRFTR_CENTER_FAMILY          _FAMILY
-HDRFTR_CENTER_FONT            _FONT
-HDRFTR_CENTER_SIZE            _SIZE
-HDRFTR_COLOR                  _COLOR
-HDRFTR_FAMILY                 _FAMILY
-HDRFTR_LEFT_FAMILY            _FAMILY
-HDRFTR_LEFT_FONT              _FONT
-HDRFTR_LEFT_SIZE              _SIZE
-HDRFTR_RIGHT_FAMILY           _FAMILY
-HDRFTR_RIGHT_FONT             _FONT
-HDRFTR_RIGHT_SIZE             _SIZE
-HDRFTR_RULE_COLOR             _COLOR
-HDRFTR_SIZE                   _SIZE
-HEAD_COLOR                    _COLOR
-HEAD_FAMILY                   _FAMILY
-HEAD_FONT                     _FONT
-HEAD_QUAD                     _QUAD
-HEAD_SIZE                     _SIZE
-LINEBREAK_COLOR               _COLOR
-LINENUMBER_FAMILY             _COLOR
-LINENUMBER_FONT               _COLOR
-LINENUMBER_SIZE               _COLOR
-LINENUMBER_COLOR              _COLOR
-MISC_COLOR                    _COLOR
-MISC_QUAD                     _QUAD
-PAGENUM_COLOR                 _COLOR
-PAGENUM_FAMILY                _FAMILY
-PAGENUM_FONT                  _FONT
-PARAHEAD_COLOR                _COLOR
-PARAHEAD_FAMILY               _FAMILY
-PARAHEAD_FONT                 _FONT
-PARAHEAD_SIZE                 _SIZE
-QUOTE_COLOR                   _COLOR
-QUOTE_FAMILY                  _FAMILY
-QUOTE_FONT                    _FONT
-QUOTE_INDENT                  _INDENT
-QUOTE_SIZE                    _SIZE
-REF_INDENT                    INDENT_REFS
-REF)                          REF_BRACKETS_END
-REF]                          REF_BRACKETS_END
-REF}                          REF_BRACKETS_END
-REF(                          REF_BRACKETS_START
-REF[                          REF_BRACKETS_START
-REF{                          REF_BRACKETS_START
-SUBHEAD_COLOR                 _COLOR
-SUBHEAD_FAMILY                _FAMILY
-SUBHEAD_FONT                  _FONT
-SUBHEAD_SIZE                  _SIZE
-SUBTITLE_COLOR                _COLOR
-SUBTITLE_FAMILY               _FAMILY
-SUBTITLE_FONT                 _FONT
-SUBTITLE_SIZE                 _SIZE
-TITLE_COLOR                   _COLOR
-TITLE_FAMILY                  _FAMILY
-TITLE_FONT                    _FONT
-TITLE_SIZE                    _SIZE
-TOC_FAM                       _FAMILY
-TOC_FAMILY                    _FAMILY
-TOC_HEADER_FAMILY             _FAMILY
-TOC_HEADER_FONT               _FONT
-TOC_HEADER_QUAD               _QUAD
-TOC_HEADER_SIZE               _SIZE
-TOC_HEAD_FAMILY               _FAMILY
-TOC_HEAD_FONT                 _FONT
-TOC_HEAD_SIZE                 _SIZE
-TOC_PARAHEAD_FAMILY           _FAMILY
-TOC_PARAHEAD_FONT             _FONT
-TOC_PARAHEAD_SIZE             _SIZE
-TOC_PN_FAMILY                 _FAMILY
-TOC_PN_FONT                   _FONT
-TOC_PN_SIZE                   _SIZE
-TOC_PT_SIZE                   _SIZE
-TOC_SUBHEAD_FAMILY            _FAMILY
-TOC_SUBHEAD_FONT              _FONT
-TOC_SUBHEAD_SIZE              _SIZE
-TOC_TITLE_FAMILY              _FAMILY
-TOC_TITLE_FONT                _FONT
-TOC_TITLE_SIZE                _SIZE
-
-+++The following are used to control underlining/underscoring weights+++
-
-UNDERSCORE_WEIGHT                     RULE_WEIGHT
-HEAD_UNDERLINE_WEIGHT                 RULE_WEIGHT
-HEADER_RULE_WEIGHT                    RULE_WEIGHT
-FOOTER_RULE_WEIGHT                    RULE_WEIGHT
-FOOTNOTE_RULE_WEIGHT                  RULE_WEIGHT
-COVER_UNDERLINE_WEIGHT                RULE_WEIGHT
-DOC_COVER_UNDERLINE_WEIGHT            RULE_WEIGHT
-ENDNOTE_STRING UNDERLINE_WEIGHT       RULE_WEIGHT
-ENDNOTE_TITLE UNDERLINE_WEIGHT        RULE_WEIGHT
-BIBLIOGRAPHY_STRING UNDERLINE_WEIGHT  RULE_WEIGHT
-</pre>
-
-<hr/>
-<a href="appendices.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
 </body>
 </html>
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/stylesheet.css groff-1.21/contrib/mom/momdoc/stylesheet.css
--- groff-1.20.1/contrib/mom/momdoc/stylesheet.css	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/stylesheet.css	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,653 @@
+/* stylesheet for the mom macros documentation */
+
+a:link    { color: blue; text-decoration: none; }
+a:hover   { color: red; text-decoration: underline; }
+a:visited { color: purple; text-decoration: none; }
+a:visited:hover { color: purple; text-decoration: underline; }
+a.header-link:visited { color: #6e70cc ; }
+a.header-link:visited:hover { color: #6e70cc ; }
+
+a:link.quick { text-decoration: underline; }
+.version /* version number for top of toc.html */
+{
+  font-size: 90% ;
+  text-align: center ;
+}
+
+.page /* Page setup: page color, size and border */
+{
+  width: 760px ;
+  position: relative ;
+  top: 12px ;
+  bottom: 12px ;
+  margin: auto ;
+  padding: 12px ; 
+  border: solid 1px #ceac8d ;
+  color: #302419 ;
+  background-color: #ffffeb ;
+  font: 1em/1.5em arial,sans-serif ;
+}
+
+/* Heads */
+
+h1.docs
+{
+  font-family: arial,sans-serif ;
+  font-size: 175% ;
+  text-align: center ;
+  color: #002b56 ;
+  background-color: #e2f1ff ;
+  outline: solid 1px #99cccc ;
+  padding: 6px ;
+}
+h2.docs
+{
+  margin-bottom: -.25em ;
+  font-size: 120% ;
+  color: #000056 ;
+}
+h2.macro-group /* ie "Page setup" or "Indents" or "Multi-columns" */
+{
+  margin-top: 1em ;
+  font-size: 120% ;
+  color: #000056 ;
+  background-color: #dfccad ;
+  padding: 6px ;
+}
+h3.docs
+{
+  margin-bottom: -.5em ;
+  font-size: 95% ;
+  color: #000056 ;
+  text-transform: uppercase ;
+}
+h3.appendices
+{
+ font-size: 100% ;
+ text-transform: none ;
+}
+h3.notes
+{
+  display: inline-block ;
+  margin-top: .5em ;
+}
+h3.control
+{
+  padding-top: .5em ;
+  font-size: 100% ;
+  text-transform: none ;
+}
+h3.numbered
+{
+  font-size: 100% ;
+  margin-bottom: -.5em ;
+}
+h3.macro-id
+{
+  font-size: 105% ;
+  color: #000056 ;
+  text-transform: uppercase ;
+  margin-top: 3px ;
+  margin-bottom: 0px ;
+}
+h4.docs
+{
+  margin-bottom: -.5em ;
+  color: #000056 ;
+}
+h4.doc-param-macros
+{
+  margin-top: -.5em ;
+}
+h4.arg-list
+{
+  margin-top: -.5em ;
+}
+h4.fields
+{
+  color: #302419 ;
+}
+h5.docs
+{
+  margin-bottom: -.5em ;
+  font-size: 95% ;
+  color: #000056 ;
+  text-transform: uppercase ;
+}
+ul.doc-param-macros
+{
+  margin-top: .75em ;
+  margin-left: -.5em ;
+}
+.control-macros-header
+{
+  display: inline-block ;
+  margin-bottom: -.25em ;
+  padding: 2px 6px 0 6px ;
+  outline: 1px solid #000058 ;
+  font-size: 100% ;
+  background-color: #e2f1ff ;
+}
+.control-macro
+{
+  font-size: 100% ;
+  margin-bottom: -.75em ;
+  color: #2f2f71 ;
+}
+.macro-id-overline
+{
+  display: inline-block ;
+  border-top: solid 2px #8d8775 ;
+  margin-bottom: .5em ;
+}
+
+/* Paragraphs */
+
+p.no-indent
+{
+  text-indent: 0px ;
+}
+p.requires
+{
+  font-family: arial,sans-serif ;
+  font-style: italic ;
+  text-indent: 0px ;
+  margin-top: .25em ;
+}
+p.alias
+{
+  font-family: arial,sans-serif ;
+  font-style: normal ;
+  text-indent: 0px ;
+  margin-top: .25em ;
+}
+
+/* Horizontal rules */
+
+hr /* horizontal rules need a border to be colorized) */
+{
+  border: solid 1px #8d8775 ;
+}
+div.rule-short /* for section breaks; top/bottom margins set manually */
+{
+  display: block ;
+  width: 25% ;
+  margin: auto;
+  clear: both ;
+}
+div.rule-medium /* underneath mini-tocs; top/bottom margins set manually */
+{
+  display: block ;
+  width: 40% ;
+  margin: auto;
+  clear: both ;
+}
+div.rule-long /* precedes nav bar at bottom of page */
+{
+  display: block ;
+  width: 90% ;
+  margin: auto;
+}
+
+/* Boxed text */
+
+.box-macro-args /* Macro name+args */
+{
+  display: block ;
+  width: 736px ;
+  max-width: 736px ;
+  border: solid 1px #302419 ;
+  padding-top: 5px ;
+  padding-bottom: 3px ;
+  padding-left: 12px ;
+  padding-right: 12px ;
+  background-color: #ffffff ;
+  white-space: nowrap ;
+  overflow: auto ;
+}
+.box-code
+{
+  display: block ;
+  width: 679px ;
+  max-width: 679px ;
+  border: solid 1px #302419 ;
+  padding-top: 5px ;
+  padding-bottom: 18px ;
+  padding-left: 15px ;
+  padding-right: 15px ;
+  color: #6f614a ;
+  background-color: #ffffff ;
+  white-space: nowrap ;
+}
+.box-tip
+{
+  outline: solid 1px #ceac8d ;
+  padding-left: 15px ; 
+  padding-right: 15px ; 
+  text-align: justify ;
+  background-color: #f9f9d9 ;
+  margin-bottom: 1.5em ;
+  }
+.box-example-layout
+{
+  outline: solid 1px #ceac8d ;
+  padding-left: 15px ; 
+  padding-right: 15px ; 
+  text-align: justify ;
+  background-color: #f9f9d9 ;
+  margin-bottom: 2.5em ;
+  }
+.box-notes
+{
+  outline: solid 1px #ceac8d ;
+  padding-left: 15px ; 
+  padding-right: 15px ; 
+  text-align: justify ;
+  background-color: #f9f9d9 ;
+  margin-bottom: 1.5em ;
+  }
+.box-important
+{
+  outline: solid 1px #ce7a65 ;
+  padding-left: 15px ; 
+  padding-right: 15px ; 
+  text-align: justify ;
+  background-color: #f9f9d9 ;
+  margin-bottom: 1.5em ;
+}
+p.tip
+{
+  padding-top: 9px ;
+  padding-bottom: 9px ;
+  text-indent: 0px ;
+}
+p.tip-top
+{
+  padding-top: 9px ;
+  text-indent: 0px ;
+}
+p.tip-bottom
+{
+  padding-bottom: 9px ;
+  text-indent: 0px ;
+}
+
+/* Pre-formatted code */
+
+span.pre /* pre-formatted multi-line blocks; indent must be exactly 2 spaces */
+{
+  display: block ;
+  position: relative ;
+  top: -1em ;
+  margin-bottom: -1.5em ;
+  font-family: "Lucida Console",monospace ;
+  font-weight: bolder ;
+  font-size: 100% ;
+  white-space: pre ;
+  overflow: auto ;
+}
+span.defaults
+{
+  margin-left: 6px ;
+  padding-bottom: 1em ;
+  font-size: 95% ;
+}
+span.pre-in-pp
+{
+  display: block ;
+  position: relative ;
+  top: -1em ;
+  margin-bottom: -.5em ;
+  font-family: "Lucida Console",monospace ;
+  font-weight: bolder ;
+  font-size: 100% ;
+  white-space: pre ;
+  overflow: auto ;
+}
+span.important
+{
+  font-family: arial,sans-serif ;
+  font-weight: bolder ;
+  color: #8b0000 ;
+}
+span.note
+{
+  font-family: arial,sans-serif ;
+  font-weight: bolder ;
+  color: #443526 ;
+}
+span.additional-note
+{
+  font-family: arial,sans-serif ;
+  font-weight: bolder ;
+  font-style: italic ;
+  color: #443526 ;
+}
+span.tip
+{
+  font-family: arial,sans-serif ;
+  font-weight: bolder ;
+  color: #443526 ;
+}
+span.experts
+{
+  font-family: arial,sans-serif ;
+  font-weight: bolder ;
+  color: #443526 ;
+}
+/* Mini-tocs (usually at top of page) */
+
+/* 1-column, centered mini-toc */
+ul.mini-toc-centered
+{
+  text-align: center ;
+  list-style-type: none ;
+  margin-left: -40px ;
+}
+
+/* 2-column mini-toc column defs*/
+.mini-toc-col-1
+{
+  float: left ;
+  width: 50% ;
+  margin-left: -6px ;
+}
+.mini-toc-col-2
+{
+  float: left ;
+  width: 50% ;
+  clear: right ;
+}
+
+/* 3-column mini-toc column defs */
+.col-1-definitions
+{
+  float: left ;
+  width: 32% ;
+  height: 52em ;
+  padding-bottom: 9px;
+  background-color: #ded4bd ;
+  margin-right: 2% ;
+}
+.col-2-definitions
+{
+  float: left ;
+  width: 32% ;
+  height: 52em ;
+  padding-bottom: 9px;
+  background-color: #ded4bd ;
+  margin-right: 2% ;
+}
+.col-3-definitions
+{
+  float: left ;
+  width: 32% ;
+  height: 52em ;
+  padding-bottom: 9px;
+  background-color: #ded4bd ;
+  margin-bottom: 24px ;
+}
+
+/* List styles */
+
+ul.toc
+{
+  margin-top: .5em ;
+}
+ul.no-enumerator
+{
+  list-style-type: none ;
+}
+.list-head
+{
+  font-family: arial,sans-serif ;
+  font-weight: bolder ;
+  font-size: 110% ;
+  color: #000056 ;
+}
+.list-head-goodies
+{
+  font-family: arial,sans-serif ;
+  font-weight: normal ;
+  font-size: 110% ;
+  color: #000056 ;
+}
+.no-anchor
+{
+  color: #302419 ;
+  font-weight: bold ;
+}
+.text-color
+{
+  color: #302419 ;
+}
+li.item
+{
+  font-family: arial,sans-serif ;
+  font-weight: normal ;
+  font-size: 100% ;
+  margin-left: -10px ;
+  list-style-type: disc ;
+}
+.mini-toc
+{
+  margin-top: -1em ;
+  font-size: 90% ;
+}
+.sublist
+{
+  margin-left: -1em ;
+  font-size: 90% ;
+  color: #302419 ;
+  list-style-type: disc ;
+}
+.sub
+{
+  list-style-type: circle ;
+}
+.normal
+{
+  font-style: normal ;
+  font-size: 100% ;
+}
+.normal-smaller
+{
+  font-weight: normal ;
+  color: #302419 ;
+  font-size: 90% ;
+}
+.normal-sub-sub
+{
+  font-weight: normal ;
+  color: #302419 ;
+  font-size: 90% ;
+}
+
+/* Macro lists / defaults */
+
+div.macro-list-container
+{
+  background-color: #ded4bd ;
+  margin-bottom: 1.5em ;
+}
+h3.macro-list
+{
+  font-size: 100% ;
+  color: #000056 ;
+  text-transform: uppercase ;
+  padding: 9px ;
+}
+ul.macro-list
+{
+  margin-left: -21px ;
+  list-style-type: none ;
+  font-family: arial,sans-serif ;
+  margin-top: -1.25em ;
+  padding-bottom: 6px ;
+}
+ol.macro-list
+{
+  font-family: arial,sans-serif ;
+  margin-top: -1.25em ;
+  padding-bottom: 6px ;
+}
+
+.defaults-container
+{
+  background-color: #e3d2b1 ;
+  border: 1px solid #3f2c00 ;
+  margin-bottom: 2.5em ;
+}
+h3.defaults
+{
+  font-size: 100% ;
+  color: #000056 ;
+  text-transform: uppercase ;
+  padding: 9px ;
+}
+p.defaults
+{
+  margin-top: .25em ;
+  margin-left: 6px ;
+  margin-bottom: 0 ;
+}
+#toc-title, #toc-head, #toc-subhead, #toc-parahead
+{
+  display: block ;
+  margin-top: -1em ;
+  margin-bottom: -1em ;
+}
+
+/* Bottom of page spacer */
+
+div.bottom-spacer
+{
+  display: block ;
+  height: 24px ;
+}
+
+/* General markup */
+
+kbd
+{
+  font-family: "Lucida Console",monospace ;
+  font-weight: bold ;
+  font-size: 100% ;
+}
+kbd.macro-args
+{
+  margin-right: .5em ;
+  color: #6f614a ;
+  white-space: nowrap ;
+  overflow: auto ;
+}
+
+/* tocs */
+
+h1.toc
+{
+  font-family: arial,sans-serif ;
+  font-size: 175% ;
+  text-align: center ;
+  color: #002b56 ;
+  background-color: #e2f1ff ;
+  outline: solid 1px #99cccc ;
+  padding: 6px ;
+}
+h2.toc
+{
+  font-size: 120% ;
+  color: #000056 ;
+}
+h3.toc
+{
+  margin-top: -.5em ;
+  margin-bottom: -.5em ;
+  font-size: 100% ;
+  color: #6e70cc ;
+}
+.highlight
+{
+  font-weight: bold ;
+}
+.fourth-level
+{
+  margin-left: -1.25em ;
+  list-style-type: none ;
+}
+ul.toc-docproc
+{
+  margin-left: -1em ;
+}
+.toc-docproc-header
+{
+  margin-top: -.5em ;
+  text-transform: uppercase ;
+}
+a.header-link
+{
+  color: #6e70cc ;
+  font-size: 95% ;
+}
+
+/* Examples */
+
+.examples-container
+{
+  border: solid 1px #917963 ;
+  background-color: #f9f9d9 ;
+  padding-left: 24px ;
+  padding-right: 24px ;
+  padding-top: 3px ;
+  padding-bottom: 3px ;
+}
+
+.examples
+{
+  font-weight: bolder ;
+  font-size: 98% ;
+  color: #524b3f ;
+  margin-top: 12px ;
+  margin-bottom: 3px ;
+}
+
+/* definitions.html */
+
+table.definitions /* mini-toc is set up as a table */
+{
+  margin-top: 12px ;
+  text-align: left ;
+  margin-left: 12px ;
+}
+th.definitions
+{
+  padding-bottom: 6px ;
+  font-size: 120% ;
+  color: #000056 ;
+}
+dt /* definition terms in italic*/
+{
+  font-style: italic ;
+}
+dt.no-italic
+{
+  font-style: normal ;
+}
+
+/* Tables */
+table.quick-ref
+{
+  margin-top: .25em ;
+}
+table.quick-ref, th.quick-ref
+{
+  padding-bottom: .25em ;
+  font-family: "Lucida Console",monospace ;
+  font-weight: bold ;
+  text-align: left ;
+}
+td
+{
+  padding: 0 ;
+  padding-left: .5em ;
+}
diff -ruN groff-1.20.1/contrib/mom/momdoc/tables-of-contents.html groff-1.21/contrib/mom/momdoc/tables-of-contents.html
--- groff-1.20.1/contrib/mom/momdoc/tables-of-contents.html	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/tables-of-contents.html	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,747 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is part of groff, the GNU roff type-setting system.
+
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+Written by Peter Schaffter.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being this comment section, with no Front-Cover
+Texts, and with no Back-Cover Texts.
+
+A copy of the Free Documentation License is included as a file called
+FDL in the main directory of the groff source package.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Document processing, tables of contents</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
+</head>
+
+<body style="background-color: #f5faff;">
+
+<!-- ==================================================================== -->
+
+<div id="top" class="page">
+
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="refer.html#top">Next: Bibliographies and references</a></td>
+</tr>
+</table>
+
+<h1 class="docs">Tables of contents</h1>
+
+<div style="width: 68%; margin: auto;">
+<ul class="no-enumerator">
+  <li><a href="#toc-intro">Introduction to tables of contents</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#toc-behaviour">Tables of contents behaviour</a></li>
+    <li><a href="#psselect">Using <kbd>psselect</kbd> to put the table of contents where you want it</a></li>
+  </ul></li>
+  <li><a href="#toc">Instruct mom to output a table of contents</a></li>
+  <li><a href="#toc-control-top">Control macros for tables of contents</a>
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#index-toc-control">Table of contents control macros and defaults</a></li>
+  </ul></li>
+</ul>
+</div>
+
+<div class="rule-medium"><hr/></div>
+
+<h2 id="toc-intro" class="docs">Introduction to tables of contents</h2>
+
+<p>
+Want a table of contents for your document?  Easy.  Just enter
+<br/>
+<span class="pre-in-pp">
+  .TOC
+</span>
+as the very last macro of your document file. Mom will have picked
+up all document titles (in
+<a href="rectoverso.html#collate">collated</a>
+documents), all heads, subheads, and paragraph heads, as well as
+any endnotes pages that have been output, and assigned them the
+appropriate page number (and page numbering style).  Talk about a
+no-brainer!
+</p>
+
+<p>
+That said, tables of contents have even more control macros than
+endnotes.  As always, the reason for so many control macros is so
+that if you want to change just about any aspect of the table of
+contents&#8217; typographic appearance, you can.  Mom is all about
+simplicity <i>and</i> flexibility.
+</p>
+
+<h3 id="toc-behaviour" class="docs">Tables of contents behaviour</h3>
+
+<p>
+When you output a table of contents (with
+<kbd><a href="#toc">.TOC</a></kbd>),
+mom finishes processing the last page of your document, then breaks
+to a new page for printing the table of contents.
+</p>
+
+<p>
+Mom follows standard typesetting conventions for tables of contents.
+To this end, if
+<a href="headfootpage.html#headers">HEADERS</a>
+are enabled for the document, the first page of the table of
+contents has no page header, but does have a first page number
+(roman numeral), always &#8220;i&#8221;, in the bottom margin.  If
+<a href="headfootpage.html#footers">FOOTERS</a>
+are enabled for the document, the first page has neither a footer,
+nor a page number in the top margin.  (If you absolutely must have
+a page footer on the first page of the table of contents, simply
+invoke
+<a href="headfootpage.html#footer-on-first-page"><kbd>.FOOTER_ON_FIRST_PAGE</kbd></a>
+immediately before <kbd>.TOC</kbd>.)  Subsequent table of contents
+pages have both page headers or footers and a page number.
+</p>
+
+<p>
+Entries in a table of contents are hierarchically indented, as
+you would expect.  By default, each type of entry (e.g. a head
+or a subhead) is set in a different font as well.  If any of
+heads, subheads or paragraph heads are numbered in the body of the
+document, they are also numbered in the table of contents.  Head,
+subhead and paragraph head numbering in the table of contents is
+<i>not</i> concatenated, as it is in the body of the document,
+because it's visually redundant in a table of contents.
+</p>
+
+<p>
+Tables of contents are never set in columns, regardless of whether
+the rest of the document is.  Lastly, if
+<a href="rectoverso.html#recto-verso">recto/verso</a>
+printing is enabled, the table of contents respects it.  This
+sometimes leads to tables of contents that begin with the wrong
+margins, but the margins can be corrected either by outputting a
+<a href="#blank-page">BLANKPAGE</a>
+or by using the control macro
+<a href="#toc-rv-switch">TOC_RV_SWITCH</a>.
+</p>
+
+<p>
+The overall table of contents 
+<a href="definitions.html#family">family</a>,
+<a href="definitions.html#ps">point size</a>
+and
+<a href="definitions.html#leading">lead</a>
+can be altered with
+<a href="definitions.html#controlmacro">control macros</a>,
+as can the family,
+<a href="definitions.html#font">font</a>,
+point size and indent of each type of entry (i.e. title, head,
+subhead, paragraph head).  Furthermore, the page numbering style
+can be changed, as can the amount of visual space reserved for page
+reference numbers.
+</p>
+
+<h5 id="psselect" class="docs">Using <kbd>psselect</kbd> to put the table of contents where you want it</h5>
+
+<p>
+Mom always outputs the table of contents at the end of a document.
+While this is desirable for some language conventions&mdash;French,
+for example&mdash;it is not desirable for others.
+</p>
+
+<p>
+If you&#8217;d like your tables of contents near the start of
+your document, you have two options: re-arrange the pages by hand
+(okay for one or two hard copies of the document), or use the
+<kbd>psselect</kbd> programme provided by the <b>psutils</b> suite
+of tools (which you may have to install as a package from your
+distribution if it is not already on your system).
+</p>
+
+<p>
+The procedure for using <kbd>psselect</kbd> to put the table of
+contents near the beginning of the document begins by you
+determining how many pages it contains.  You can
+do this by previewing the document with the PostScript viewer of
+your choice (gv, okular, evince, etc).
+</p>
+
+<p>
+Once you know the number of pages in the table of contents, you use
+<kbd>psselect</kbd> to place them where you want.
+</p>
+
+<p>
+Say, for example, the table of contents runs to just one page.  The
+command to place a one-page table of contents at the start of a
+document is:
+<br/>
+<span class="pre-in-pp">
+   psselect -p _1,1-_2 
+</span>
+The <kbd>-p</kbd> option instructs <kbd>psselect</kbd> that what
+follows is a comma-separated list of the order in which you want
+pages of a document re-arranged.  The underscore character means
+"counting backwards from the end of the document".  Thus, the above
+says: "Put the last page first (i.e. the table of contents), followed
+by all pages from the original first page up to the second to last
+(i.e. the last page before the table of contents)."
+</p>
+
+<p>
+If your table of contents runs to two pages, the option to
+<kbd>psselect</kbd> would look like this:
+<br/>
+<span class="pre-in-pp">
+   psselect -p _1-_2,1-_3
+</span>
+If your table of contents runs to two pages and you have a cover
+page, the command would look like this:
+<br/>
+<span class="pre-in-pp">
+   psselect -p 1,_1-_2,2-_3
+</span>
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<kbd>psselect</kbd> outputs to stdout, so you have to redirect the
+output to a new file.
+<br/>
+<span class="pre-in-pp">
+  psselect -p &lt;page list&gt; &lt;file&gt;.ps &gt; &lt;new-file&gt;.ps
+</span>
+</p>
+</div>
+
+
+<!-- -TOC- -->
+
+<div class="macro-id-overline">
+<h3 id="toc" class="macro-id">Instruct mom to output a table of contents</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TOC</b>
+</div>
+
+<p>
+If you want a table of contents, just place <kbd>.TOC</kbd> at the
+very end of your document.  Mom takes care of the rest.
+</p>
+
+<div class="rule-short"><hr/></div>
+
+<h2 id="toc-control-top" class="macro-group">Control macros for tables of contents</h2>
+
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">ERRATUM:</span> In versions of mom prior to
+1.3-e_3, the documentation incorrectly stated that table of contents
+control macros could go anywhere in a mom file prior to invoking
+<kbd>.TOC</kbd>.
+</p>
+
+<p class="tip-bottom">
+In fact, table of contents control macros must come before
+<kbd><a href="docprocessing.html#start">.START</a></kbd>.
+</p>
+</div>
+
+<div class="defaults-container" style="background-color: #ded4bd; border: none;">
+<h3 id="index-toc-control" class="docs defaults">Table of contents control macros and defaults</h3>
+
+<ol style="margin-top: .5em; padding-bottom: .5em;">
+  <li><a href="#toc-general">General table of contents style control</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#toc-family">TOC_FAMILY</a> &ndash; base family for tables of contents</li>
+    <li><a href="#toc-pt-size">TOC_PT_SIZE</a> &ndash; base point size for tables of contents</li>
+    <li><a href="#toc-lead">TOC_LEAD</a> &ndash; leading of tables of contents</li>
+  </ul></li>
+  <li><a href="#toc-pagenumbering">Table of contents page numbering</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#paginate-toc">PAGINATE_TOC</a> &ndash; turn table of contents pagination on or off</li>
+    <li><a href="#toc-pagenum-style">TOC_PAGENUM_STYLE</a> &ndash; table of contents page numbering style</li>
+  </ul></li>
+  <li><a href="#toc-header">Changing the table of contents header (title), string and style</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#toc-header-string">Changing the header (title) string</a>
+    <ul style="margin-left: -.5em;">
+      <li><a href="#toc-header-style">Table of contents header (title) string control macros and defaults</a></li>
+    </ul></li>
+  </ul></li>
+  <li><a href="#toc-style">Changing the style of table of contents entries and page number references</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#toc-indent-note">Note: the table of contents _INDENT control macros</a></li>
+    <li><a href="#toc-title">Changing the style of table of contents title entries</a></li>
+    <li><a href="#toc-head">Changing the style of table of contents head entries</a></li>
+    <li><a href="#toc-subhead">Changing the style of table of contents subhead entries</a></li>
+    <li><a href="#toc-parahead">Changing the style of table of contents paragraph head entries</a></li>
+    <li><a href="#toc-pn">Changing the style of table of contents page number references</a></li>
+  </ul></li>
+  <li><a href="#toc-additional">Additional table of contents control macros</a>
+  <ul style="margin-left: -.5em;">
+    <li><a href="#toc-appends-author">Append author(s) to table of contents title entries</a></li>
+    <li><a href="#toc-title-entry">Alter the wording of a table of contents title entry</a></li>
+    <li><a href="#toc-padding">Establish the number of placeholders to leave for page reference numbers</a></li>
+    <li><a href="#toc-rv-switch">Switch tables of contents page margins</a></li>
+  </ul></li>
+</ol>
+</div>
+
+<h4 id="toc-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. General tables of contents style control</h4>
+
+<div id="toc-family" class="box-macro-args">
+Macro: <b>TOC_FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd>
+</div>
+
+<p>
+TOC_FAMILY establishes the default family for every page element in
+a table of contents, including the table of contents&#8217; header
+(title) string (by default, &#8220;Contents&#8221;) and the page
+number in the top or bottom margin.  The default is the prevailing
+document family.
+</p>
+
+<p>
+All page elements in the table of contents also have their own
+_FAMILY control macros, which can be used on a case-by-case basis to
+override the default family set with TOC_FAMILY.
+</p>
+
+<!-- -TOC_PT_SIZE- -->
+
+<div id="toc-pt-size" class="box-macro-args">
+Macro: <b>TOC_PT_SIZE</b> <kbd class="macro-args">&lt;base type size of the toc&gt;</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>; points is assumed
+</p>
+
+<p>
+Unlike most other control macros that deal with size of document
+elements, TOC_PT_SIZE takes as its argument an absolute value,
+relative to nothing.  (Compare this with the
+<a href="docelement.html#point-size">_SIZE</a>
+control macros.)  The argument represents the base point size
+of tables of contents from which the size of all other table of
+contents elements are calculated.
+</p>
+
+<p>
+The default for
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>
+is 12.5 points (the same default size used in the body of the
+document).
+</p>
+
+<div id="toc-lead" class="box-macro-args">
+Macro: <b>TOC_LEAD</b> <kbd class="macro-args">&lt;leading of the toc&gt; [ ADJUST ]</kbd>
+</div>
+
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>; points is assumed
+</p>
+
+<p>
+Unlike most other control macros that deal with leading of document
+elements, TOC_LEAD takes as its argument an absolute value, relative
+to nothing.  Therefore, the argument represents the
+<a href="definitions.html#leading">leading</a>
+of tables of contents in
+<a href="definitions.html#picaspoints">points</a>
+unless you append an alternative
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
+For example,
+<br/>
+<span class="pre-in-pp">
+  .TOC_LEAD 14
+</span>
+sets the base leading of tables of contents to 14 points, whereas
+<br/>
+<span class="pre-in-pp">
+  .TOC_LEAD .5i
+</span>
+sets the base leading of tables of contents to 1/2 inch.
+</p>
+
+<p>
+If you want the leading of tables of contents adjusted to fill the
+page, pass TOC_LEAD the optional argument <kbd>ADJUST</kbd>.  (See
+<a href="docprocessing.html#doc-lead-adjust">DOC_LEAD_ADJUST</a>
+for an explanation of leading adjustment.)
+</p>
+
+<p>
+The default for
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPESET</a>
+is the prevailing document lead (16 by default), adjusted.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Even if you give mom a <kbd>.DOC_LEAD_ADJUST&nbsp;.OFF</kbd> command,
+she will still, by default, adjust the leading of the table of
+contents.  You <i>must</i> enter
+<kbd>TOC_LEAD&nbsp;&lt;lead&gt;</kbd> with no <kbd>ADJUST</kbd>
+argument to disable this default behaviour.
+</p>
+
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span>
+Tables of contents are always double-spaced in
+<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>,
+regardless of whether the body of the document is single-spaced.
+</p>
+</div>
+
+<h4 id="toc-pagenumbering" class="docs">2. Table of contents page numbering</h4>
+
+<p>
+The pagination style of tables of contents is controlled by the same
+macros that control
+<a href="headfootpage.html#pagination-intro">document page numbering</a>,
+except
+<a href="headfootpage.html#pagenum">PAGENUM</a>
+(tables of contents always start on page 1).  The defaults are the
+same as for the rest of the document, with the exception that tables
+of contents, by default, have roman numeral page numbers.
+</p>
+
+<p>
+Therefore, if you wish to change some aspect of table of contents
+pagination style, use the
+<a href="headfootpage.html#index-pagination-control">document pagination control macros</a>
+immediately prior to <kbd>.TOC</kbd>.
+</p>
+
+<p>
+A special macro,
+<kbd><a href="#toc-pagenum-style">TOC_PAGENUM_STYLE</a></kbd>
+controls the style of table of contents pagination (i.e. the actual
+table of contents pages' numbers, not the page number references of
+entries).
+</p>
+
+<!-- -PAGINATE_TOC- -->
+
+<div id="paginate-toc" class="box-macro-args">
+Macro: <b>PAGINATE_TOC</b> <kbd class="macro-args">&lt;toggle&gt;</kbd>
+</div>
+
+<p>
+By default, mom paginates tables of contents.  If you&#8217;d like
+her not to, do
+<br/>
+<span class="pre-in-pp">
+  .PAGINATE_TOC OFF
+</span>
+(or <kbd>NO, X,</kbd> etc).
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+Simply invoking
+<kbd>.PAGINATION&nbsp;OFF</kbd>
+or
+<kbd>.PAGINATE&nbsp;OFF</kbd>
+disables table of contents pagination <i>for the first
+page of the table of contents only.</i> You must use
+<kbd>.PAGINATE_TOC&nbsp;OFF</kbd> to disable table of contents
+pagination completely, even if pagination is turned off elsewhere in
+your document.
+</p>
+</div>
+
+<!-- -TOC_PAGENUM_STYLE- -->
+
+<div id="toc-pagenum-style" class="box-macro-args">
+Macro: <b>TOC_PAGENUM_STYLE</b> <kbd class="macro-args">&lt;DIGIT | ROMAN | roman | ALPHA | alpha&gt;</kbd>
+</div>
+<p class="requires">
+See
+<a href="headfootpage.html#pagenum-style"><span style="font-style: normal;">PAGENUM_STYLE</span></a>
+for an explanation of the arguments.
+</p>
+
+<p>
+By default, mom uses roman numerals to number table of contents
+pages.  Use TOC_PAGENUM_STYLE if you&#8217;d prefer something else.
+For example, to have standard digits instead of roman numerals, do
+the following:
+<br/>
+<span class="pre-in-pp">
+  .TOC_PAGENUM_STYLE DIGIT
+</span>
+</p>
+
+<h4 id="toc-header" class="docs" style="margin-top: -.5em;">3. Changing the table of contents header (title) string and style</h4>
+
+<p>
+The table of contents header string is the title that appears at to top of the
+table of contents.  By default, it&#8217;s &#8220;Contents&#8221;.</p>
+
+<div id="toc-header-string" class="box-macro-args">
+Macro: <b>TOC_HEADER_STRING</b> <kbd class="macro-args">&lt;string&gt;</kbd>
+</div>
+
+<p>
+If you&#8217;d like the title of the table of contents to read
+something other than &#8220;Contents&#8221;, do, for
+example
+<br/>
+<span class="pre-in-pp">
+  .TOC_HEADER_STRING "Table of Contents"
+</span>
+</p>
+
+<h5 id="toc-header-style" class="docs" style="margin-top: -.5em; text-transform: none;">Table of contents header string (title) control macros and defaults</h5>
+
+<div class="defaults-container" style="margin-top: 1em; padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
+See
+<a href="docelement.html#control-macro-args">Arguments to the control macros</a>.
+</p>
+<span class="pre defaults">
+.TOC_HEADER_FAMILY  default = prevailing doc family 
+.TOC_HEADER_FONT    default = bold
+.TOC_HEADER_SIZE    default = +4
+.TOC_HEADER_QUAD    default = left
+</span>
+</div>
+
+<h4 id="toc-style" class="docs" style="margin-top: -1em;">4. Changing the style of table of contents entries and page number references</h4>
+
+<p>
+&#8220;Entries&#8221; refers to titles in
+<a href="rectoverso.html#collate-intro">collated</a>
+documents
+(<a href="docprocessing.html#title">TITLE</a>)
+, heads
+(<a href="docelement.html#head">HEAD</a>),
+subheads
+(<a href="docelement.html#subhead">SUBHEAD</a>),
+and paragraph heads
+(<a href="docelement.html#parahead">PARAHEAD</a>)
+as they appear in the table of contents.  Their style is managed by
+the usual
+<a href="definitions.html#controlmacro">control macros</a>,
+which take the form <kbd>TOC_&lt;ELEMENT&gt;_&lt;SPEC&gt;</kbd>
+(e.g. <kbd>TOC_HEAD_FAMILY</kbd> or <kbd>TOC_SUBHEAD_INDENT</kbd>).
+</p>
+
+<p>
+&#8220;Page number references&#8221; means the page numbers associated with
+entries.  They take the form <kbd>TOC_PN_&lt;SPEC&gt;</kbd>.
+</p>
+
+<p>
+The following is a list of the control macros for table of contents
+entries, along with their defaults.
+</p>
+
+<div id="toc-indent-note" class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+The table of contents _INDENT
+macros set an absolute indent, relative to nothing, and therefore
+require an appended
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
+</p>
+</div>
+<div id="index-toc-entry-control-macros" class="defaults-container" style="padding-bottom: 8px;">
+<p class="defaults" style="padding-top: 6px;">
+See
+<a href="docelement.html#control-macro-args">Arguments to the control macros</a>.
+</p>
+
+<span class="pre defaults">
+<span id="toc-title">
+.TOC_TITLE_FAMILY  default = prevailing doc family 
+.TOC_TITLE_FONT    default = bold italic
+.TOC_TITLE_SIZE    default = +0
+.TOC_TITLE_INDENT  default = 0 for TYPESET and TYPEWRITE
+</span>
+<span id="toc-head">
+.TOC_HEAD_FAMILY  default = prevailing doc family 
+.TOC_HEAD_FONT    default = bold
+.TOC_HEAD_SIZE    default = +.5
+.TOC_HEAD_INDENT  default = 18p for TYPESET; 2m for TYPEWRITE
+</span>
+<span id="toc-subhead">
+.TOC_SUBHEAD_FAMILY  default = prevailing doc family 
+.TOC_SUBHEAD_FONT    default = roman
+.TOC_SUBHEAD_SIZE    default = +0
+.TOC_SUBHEAD_INDENT  default = 30p for TYPESET; 4m for TYPEWRITE
+</span>
+<span id="toc-parahead">
+.TOC_PARAHEAD_FAMILY  default = prevailing doc family 
+.TOC_PARAHEAD_FONT    default = italic
+.TOC_PARAHEAD_SIZE    default = +0
+.TOC_PARAHEAD_INDENT  default = 42p for TYPESET; 6m for TYPEWRITE
+</span>
+.TOC_PN_FAMILY  default = prevailing doc family 
+.TOC_PN_FONT    default = roman
+.TOC_PN_SIZE    default = +0
+</span>
+</div>
+
+<h4 id="toc-additional" class="docs" style="margin-top: -1em;">5. Additional table of contents control macros</h4>
+
+<p>
+The following four macros allow you to
+</p>
+<ul style="margin-top: -.5em; margin-left: -.5em;">
+  <li>instruct mom to <a href="#toc-appends-author">append author(s) to</a> <a href="docprocessing.html#title">TITLE</a> <a href="toc-appends-author">entries</a></li>
+  <li><a href="#toc-title-entry">alter the wording of</a> <a href="docprocessing.html#title">TITLE</a> <a href="#toc-title-entry">entries</a></li>
+  <li>establish <a href="#toc-padding">how many placeholders to leave for page number references</a></li>
+  <li><a href="#toc-rv-switch">switch table of contents page margins</a> should they be incorrect for recto/verso printing</li>
+</ul>
+
+<!-- -TOC_APPENDS_AUTHOR- -->
+
+<div id="toc-appends-author" class="box-macro-args">
+Macro: <b>TOC_APPENDS_AUTHOR</b> <kbd class="macro-args">&lt;none&gt; | &lt;&quot;name(s) of authors&quot;&gt;</kbd>
+</div>
+
+<p>
+In certain kinds of collated documents, different authors are
+responsible for the articles or stories contained within them.  In
+such documents, you may wish to have the author or authors appended
+to the table of contents&#8217; title entry for each story or
+article.
+</p>
+
+<p>
+If you invoke <kbd>.TOC_APPENDS_AUTHOR</kbd> <i>without</i> an
+argument, mom appends the first argument you passed to
+<a href="docprocessing.html#author">AUTHOR</a>
+to table of contents title entries, separated by a front-slash.
+</p>
+
+<p>
+If you invoke <kbd>.TOC_APPENDS_AUTHOR</kbd> <i>with</i> an argument
+(surrounded by double-quotes), mom will append it to the table of
+contents title entries instead.  This is useful if you have multiple
+authors you wish to identify by last name only.  For example, if
+three authors&mdash;Joe Blough, Jane Doe, and John Deere&mdash;are
+responsible for a single article
+<br/>
+<span class="pre-in-pp">
+  .TOC_APPENDS_AUTHOR "Blough et al."
+</span>
+would be a good way to identify them in the table of contents.
+</p>
+
+<!-- -TOC_TITLE_ENTRY- -->
+
+<div id="toc-title-entry" class="box-macro-args">
+Macro: <b>TOC_TITLE_ENTRY</b> <kbd class="macro-args">&lt;&quot;alternate wording for a title entry in the toc&quot;&gt;</kbd>
+</div>
+
+<p>
+In 
+<a href="rectoverso.html#collate">collated</a>
+documents, the title of each chapter appears in the table of
+contents.  It may sometimes happen that you don&#8217;t want the
+title as it appears in the table of contents to be the same as what
+appears in the
+<a href="definitions.html#docheader">docheader</a>.
+You might, for example, want to shorten it.  Or, in the case of
+chapters where the docheader contains both a chapter number and a
+chapter title, like this
+<br/>
+<span class="pre-in-pp">
+             Chapter 6
+  Burning Bush &mdash; Maybe God Was Right
+</span>
+you might want only the chapter title, not the chapter number, to
+show up in the table of contents.  (By default, <kbd>.TOC</kbd>
+generates both.)
+</p>
+
+<p>
+If you want to change the wording of a title entry in the table of
+contents, simply invoke
+<br/>
+<span class="pre-in-pp">
+  .TOC_TITLE_ENTRY
+</span>
+with the desired wording, enclosed in double-quotes.  Using the
+example, above,
+<br/>
+<span class="pre-in-pp">
+  .CHAPTER 6
+  .CHAPTER_TITLE "Burning Bush &mdash; Maybe God Was Right"
+  .TOC_TITLE_ENTRY "Burning Bush"
+  .DOCTYPE CHAPTER
+</span>
+
+would identify chapter 6 in the table of contents simply as
+&#8220;Burning Bush&#8221;.
+</p>
+
+<!-- -TOC_PADDING- -->
+
+<div id="toc-padding" class="box-macro-args">
+Macro: <b>TOC_PADDING</b> <kbd class="macro-args">&lt;number of placeholders to allow for page number listings&gt;</kbd>
+</div>
+
+<p>
+By default, mom allows room for 3 digits in the page number
+references of table of contents entries.  If you&#8217;d like some
+other number of placeholders, say 2 (if your document runs to less
+than 100 pages), do
+<br/>
+<span class="pre-in-pp">
+  .TOC_PADDING 2
+</span>
+</p>
+
+<!-- -TOC_RV_SWITCH- -->
+
+<div id="toc-rv-switch" class="box-macro-args">
+Macro: <b>TOC_RV_SWITCH</b>
+</div>
+
+<p>
+TOC_RV_SWITCH doesn&#8217;t take an argument.  It simply instructs
+mom to switch the left and right margins of
+<a href="rectoverso.html#recto-verso">recto/verso</a>
+documents should the table of contents happen to begin on an even
+page when you want an odd, or vice versa.
+</p>
+
+<p>
+The same result can be accomplished by outputting a
+<a href="#blank-page">BLANKPAGE</a>.
+</p>
+
+<div class="rule-long"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 24%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 42%; text-align: right;"><a href="refer.html">Next: Bibliographies and references</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
+
+</body>
+</html>
+<!-- vim: fileencoding=utf-8: nomodified: -->
+
diff -ruN groff-1.20.1/contrib/mom/momdoc/toc.html groff-1.21/contrib/mom/momdoc/toc.html
--- groff-1.20.1/contrib/mom/momdoc/toc.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/toc.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation,
-Inc.  Written by Peter Schaffter.
+Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Written by Peter Schaffter (pschaffter@ncf.ca).
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -17,447 +16,378 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom, version 1.5-c -- Table of Contents</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom, version 1.6 -- Table of Contents</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<h1 align="center"><u>Table of Contents for mom, version 1.5-c</u></h1>
+<div class="page">
 
-<p>
-The table of contents has grown quite large.  If you've been using
-<strong>mom</strong> for a while, you might prefer the
-<a href="macrolist.html#TOP"><strong>Quick Reference Guide</strong></a>.
-</p>
-
-<p>
-If you're new to <strong>mom</strong>, click on any link in the
-<a href="#QUICK_TOC"><strong>Quick Table of Contents</strong></a>
-to go to the
-appropriate section of the <strong>Full Table of Contents</strong>.
-</p>
-
-<p>
-Alternatively, go directly to the
-<a href="#TOC_PROP"><strong>Full Table of Contents</strong></a>.
-</p>
+  <div class="version">
+    mom, version 1.6
+  </div>
+
+<h1 class="toc" style="margin-top: 9px;">Table of Contents</h1>
+
+    <p style="margin-left: 2.75em; margin-right: 2.75em;">
+    The table of contents has grown quite large.  To ease navigation,
+    click on any link in the
+    <a href="#quick-toc">Quick Table of Contents</a>
+    to go to the corresponding entry in the the
+    <a href="#full-toc">Full Table of Contents</a>.
+    </p>
+
+    <p style="margin-top: -.5em; margin-left: 2.75em; margin-right: 2.5em;">
+    Alternatively, if you've been using mom for a while, you might
+    prefer the
+    <a href="macrolist.html#top">Quick Reference Guide</a>.
+    </p>
 
-<hr/>
+<div class="rule-medium"><hr/></div>
 
 <!-- -QUICK TABLE OF CONTENTS- -->
 
-<a name="QUICK_TOC"><h2><u>Quick Table of Contents</u></h2></a>
-
-<a href="#WHAT"><strong>INTRODUCTORY STUFF</strong></a>
+  <h2 id="quick-toc" class="toc" style="margin-top: 18px; text-align: center;">Quick Table of Contents</h2>
 
-<ul>
-    <li><a href="#WHAT">What is mom?</a></li>
-    <li><a href="#DEFS">Definitions of terms used in this manual</a></li>
-    <li><a href="#USING">Using mom</a></li>
-</ul>
-
-<a href="#TYPESET"><strong>TYPESETTING WITH MOM</strong></a>
-
-<ul>
-    <li><a href="#TYPE_INTRO">Intro to typesetting macros</a></li>
-    <li><a href="#PAGE">Page setup</a></li>
-    <li><a href="#PARAM">Basic typesetting parameters</a></li>
-    <li><a href="#JUST">Justifying, quadding, etc.</a></li>
-    <li><a href="#REFINE">Refinements</a></li>
-    <li><a href="#MOD">Modifying type</a></li>
-    <li><a href="#VERT">Vertical movements</a></li>
-    <li><a href="#TAB">Tabs</a></li>
-    <li><a href="#COL">Multiple columns</a></li>
-    <li><a href="#IND">Indents</a></li>
-    <li><a href="#GOODIES">Goodies</a></li>
-    <li><a href="#ESCAPES">Inline escapes</a></li>
-    <li><a href="#COLOR">Coloured text</a></li>
-    <li><a href="#GRAPHICAL">Graphical objects</a></li>
-</ul>
-
-<a href="#DOCPROC"><strong>DOCUMENT PROCESSING WITH MOM</strong></a>
-
-<ul>
-    <li><a href="#DOCPROC">Introduction to document processing</a></li>
-    <li><a href="#PRELIM">Preliminary document setup</a></li>
-    <li><a href="#TAGS">The document element tags</a> &mdash; heads, subheads, footnotes, etc.</li>
-    <li><a href="#IMAGES">Inserting images into a document</a></li>
-    <li><a href="#HDRFTR">Page headers and footers</a></li>
-    <li><a href="#PAGINATE">Pagination</a></li>
-    <li><a href="#RV">Recto/verso printing and collating</a></li>
-    <li><a href="#COVER">Cover pages</a></li>
-    <li><a href="#REF">Bibliographies and references</a></li>
-    <li><a href="#LETTER">Writing letters</a></li>
-    <li><a href="#TYPEMACDOC">Using typesetting macros during document processing</a></li>
-    <li><a href="#QUICK">Quick reference guide to mom</a></li>
-    <li><a href="#APP">Appendices</a></li>
-</ul>
+    <div style="width: 50%; margin-top: .75em; margin-left: 12px; float: left;">
+    <h3 id="introductory" class="toc"><a style="color: #6e70cc" href="#what">INTRODUCTORY STUFF</a></h3>
+    <ul class="toc">
+      <li><a href="#what">What is mom?</a></li>
+      <li><a href="#defs">Definitions of terms used in this manual</a></li>
+      <li><a href="#using">Using mom</a></li>
+    </ul>
+
+    <h3 id="typesetting" class="toc"><a style="color: #6e70cc" href="#typeset">TYPESETTING WITH MOM</a></h3>
+
+    <ul class="toc">
+      <li><a href="#type-intro">Introduction to the typesetting macros</a></li>
+      <li><a href="#page">Page setup</a></li>
+      <li><a href="#param">Basic typesetting parameters</a></li>
+      <li><a href="#just">Justifying, quadding, etc.</a></li>
+      <li><a href="#refine">Refinements</a></li>
+      <li><a href="#mod">Modifying type</a></li>
+      <li><a href="#vert">Vertical movements</a></li>
+      <li><a href="#tab">Tabs</a></li>
+      <li><a href="#col">Multiple columns</a></li>
+      <li><a href="#ind">Indents</a></li>
+      <li><a href="#goodies">Goodies</a></li>
+      <li><a href="#escapes">Inline escapes</a></li>
+      <li><a href="#color">Coloured text</a></li>
+      <li><a href="#graphical">Graphical objects</a></li>
+    </ul>
+  </div>
+
+  <div style="margin-left: 332px;">
+    <h3 id="document-processing" class="toc" style="margin-top: 1.25em;"><a style="color: #6e70cc" href="#doc-proc">DOCUMENT PROCESSING WITH MOM</a></h3>
+
+    <ul class="toc" style="margin-left: 3em;">
+      <li><a href="#doc-proc">Introduction to document processing</a></li>
+      <li><a href="#doc-defaults">Document defaults</a></li>
+      <li><a href="#prelim">Preliminary document setup</a></li>
+      <li><a href="#typemacdoc">Behaviour of the typesetting macros during document processing</a></li>
+      <li><a href="#tags">The document element tags</a> &ndash; heads, paragraphs, subheads, footnotes, etc.</li>
+      <li><a href="#images">Inserting images into a document</a></li>
+      <li><a href="#hdrftr">Page headers and footers</a></li>
+      <li><a href="#paginate">Pagination</a></li>
+      <li><a href="#rv">Recto/verso printing and collating</a></li>
+      <li><a href="#cover">Cover pages</a></li>
+      <li><a href="#tocs">Tables of contents</a></li>
+      <li><a href="#ref">Bibliographies and references</a></li>
+      <li><a href="#letter">Writing letters</a>
+      <ul style="list-style-type: none;">
+      <li style="display: inline-block; width: 212px; height: 0; margin-top: .5em; margin-left: -2.5em; border: solid 1px #8d8775;">&nbsp;</li>
+      </ul></li>
+      <li style="margin-top: -1em;"><a href="#quick">Quick reference guide</a></li>
+      <li><a href="#appendices">Appendices</a></li>
+      <li><a href="#reserved">Reserved words (macros, strings, registers)</a></li>
+    </ul>
+  </div>
 
-<hr/>
+  <div class="rule-long" style="clear: both;"><hr/></div>
 
 <!-- -FULL TABLE OF CONTENTS- -->
 
-<a name="TOC_PROP"><h2><u>Full Table of Contents</u></h2></a>
-
-<a name="WHAT"></a>
-<a href="intro.html#INTRO"><strong>1. WHAT IS MOM?</strong></a>
-
-<ul>
-    <li><a href="intro.html#INTRO_INTRO">1.1 Who is mom meant for?</a></li>
-    <li><a href="intro.html#INTRO_TYPESETTING">1.2 Typesetting with mom</a></li>
-    <li><a href="intro.html#INTRO_DOCPROCESSING">1.3 Document processing with mom</a></li>
-    <li><a href="intro.html#INTRO_PHILOSOPHY">1.4 Mom's philosophy</a></li>
-    <li><a href="intro.html#INTRO_DOCUMENTATION">1.5 A note on mom's documentation</a></li>
-
-    <ul>
-        <li><a href="intro.html#MACRO_ARGS">1.5.1 How to read macro arguments</a></li>
-        <li><a href="intro.html#TOGGLE_MACRO">1.5.2 &quot;Toggle&quot; macros</a></li>
-    </ul>
+  <h2 id="full-toc" class="toc" style="margin-top: 24px; text-align: center;">Full Table of Contents</h2>
 
-</ul>
+  <div style="margin-left: 12px;">
+    <h3 id="what" class="toc"><a style="color: #6e70cc" href="intro.html#top">1. WHAT IS MOM?</a></h3>
 
-<a name="DEFS"></a>
-<a href="definitions.html#TERMS"><strong>2. DEFINITIONS OF TERMS USED IN THIS MANUAL</strong></a>
-
-<ul>
-    <li><a href="definitions.html#TERMS_TYPESETTING">2.1 Typesetting terms</a></li>
-    <li><a href="definitions.html#TERMS_GROFF">2.2 Groff terms</a></li>
-    <li><a href="definitions.html#TERMS_MOM">2.3 Mom's document processing terms</a></li>
-</ul>
-
-<a name="USING"></a>
-<a href="using.html#USING"><strong>3. USING MOM</strong></a>
-
-<ul>
-    <li><a href="using.html#USING_INTRO">3.1 Introduction</a></li>
-    <li><a href="using.html#USING_MACROS">3.2 How to input mom's macros</a></li>
-    <li><a href="using.html#USING_INVOKING">3.3 Printing &mdash; invoking groff with mom</a></li>
-    <li><a href="using.html#USING_PREVIEWING">3.4 How to preview documents</a></li>
-</ul>
+    <ul class="toc">
+      <li><a href="intro.html#intro-intro">1.1 Who is mom meant for?</a></li>
+      <li><a href="intro.html#intro-typesetting">1.2 Typesetting with mom</a></li>
+      <li><a href="intro.html#intro-docprocessing">1.3 Document processing with mom</a></li>
+      <li><a href="intro.html#intro-philosophy">1.4 Mom's philosophy</a></li>
+      <li><a href="intro.html#intro-documentation">1.5 A note on mom's documentation</a>
+      <ul>
+        <li><a href="intro.html#macro-args">1.5.1 How to read macro arguments</a></li>
+        <li><a href="intro.html#toggle-macro">1.5.2 &quot;Toggle&quot; macros</a></li>
+        <li><a href="intro.html#examples">1.5.3 Examples</a></li>
+      </ul>
+      </li>
+    </ul>
+
+    <h3 id="defs" class="toc"><a style="color: #6e70cc" href="definitions.html#top">2. DEFINITIONS OF TERMS USED IN THIS MANUAL</a></h3>
+
+    <ul class="toc">
+      <li><a href="definitions.html#typesetting-terms">2.1 Typesetting terms</a></li>
+      <li><a href="definitions.html#groff-terms">2.2 Groff terms</a></li>
+      <li><a href="definitions.html#mom-terms">2.3 Mom's document processing terms</a></li>
+    </ul>
+
+    <h3 id="using" class="toc"><a style="color: #6e70cc" href="using.html#top">3. USING MOM</a></h3>
+
+  <ul class="toc">
+    <li><a href="using.html#using-intro">3.1 Introduction</a></li>
+    <li><a href="using.html#using-macros">3.2 How to input mom&#8217;s macros</a></li>
+    <li><a href="using.html#using-previewing">3.3 How to preview documents</a></li>
+    <li><a href="using.html#using-saving">3.4 Saving documents</a></li>
+    <li><a href="using.html#using-printing">3.3 Printing &mdash; invoking groff with mom</a></li>
+  </ul>
 
 <!-- -TYPESETTING MACROS- -->
 
-<a name="TYPESET"></a>
-<a href="typesetting.html#MACROS_TYPESETTING"><strong>4. THE TYPESETTING MACROS</strong></a>
-
-<ul>
-    <a name="TYPE_INTRO"></a>
-    <li><a href="typesetting.html#INTRO_MACROS_TYPESETTING"><strong>4.1 Introduction to the typesetting macros</strong></a></li>
-
-    <a name="PAGE"></a>
-    <li><a href="typesetting.html#PAGE_MARGINS"><strong>4.2 Page Setup</strong></a> &mdash; paper size and page margins</li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_SETUP">4.2.1 Macro list</a></li>
-    </ul>
+  <h3 id="typeset" class="toc"><a style="color: #6e70cc" href="typesetting.html#top">4. TYPESETTING WITH MOM</a></h3>
 
-    <a name="PARAM"></a>
-    <li><a href="typesetting.html#BASIC_PARAMS"><strong>4.3 Basic Parameters</strong></a> &mdash; family, font, fallback font, point size, line space, line length, autolead</li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_BASIC">4.3.1 Macro list</a></li>
-    </ul>
-
-    <a name="JUST"></a>
-    <li><a href="typesetting.html#JUST_QUAD_FILL"><strong>4.4 Justifying, Quadding, Filling and Breaking Lines</strong></a></li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_JUST">4.4.1 Macro list</a></li>
-    </ul>
-    
-    <a name="REFINE"></a>
-    <li><a href="typesetting.html#REFINEMENTS"><strong>4.5 Refinements</strong></a> &mdash; word space, sentence space, letter spacing (track kerning), hyphenation, kerning, ligatures</li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_REFINEMENTS">4.5.1 Macro list</a></li>
-    </ul>
-
-    <a name="MOD"></a>
-    <li><a href="typesetting.html#MODIFICATIONS"><strong>4.6 Modifying Type</strong></a> &mdash; pseudo-italic, -bold, -condensed, and -extended</li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_MODIFICATIONS">4.6.1 Macro list</a></li>
-    </ul>
-
-    <a name="VERT"></a>
-    <li><a href="typesetting.html#ALDRLD"><strong>4.7 Vertical Movements</strong></a> &mdash; moving up and down on the page</li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_ALDRLD">4.7.1 Macro list</a></li>
-    </ul>
-
-    <a name="TAB"></a>
-    <li><a href="typesetting.html#TABS"><strong>4.8 Tabs</strong></a></li>
-
-    <ul>
-        <li><a href="typesetting.html#TYPESETTING_TABS">4.8.1 Typesetting tabs</a></li>
-
-        <ul>
-            <li><a href="typesetting.html#TYPESETTING_TABS_TUT">4.8.1.1 Quickie tutorial</a></li>
-        </ul>
-
-        <li><a href="typesetting.html#STRING_TABS">4.8.2 String tabs (autotabs)</a></li>
-
-        <ul>
-            <li><a href="typesetting.html#STRING_TABS_TUT">4.8.2.1 Quickie tutorial</a></li>
-        </ul>
-
-        <li><a href="typesetting.html#INDEX_TABS">4.8.3 Macro list</a></li>
-    </ul>
-
-    <a name="COL"></a>
-    <li><a href="typesetting.html#MULTI_COLUMNS"><strong>4.9 Multi-columns</strong></a></li>
-
-    <ul>
-        <li><a href="typesetting.html#INDEX_MULTI_COLUMNS">4.9.1 Macro list</a></li>
-    </ul>
-
-    <a name="IND"></a>
-    <li><a href="typesetting.html#INDENTS"><strong>4.10 Indents</strong></a></li>
-
-    <ul>
-        <li><a href="typesetting.html#INDENTS_TUT">4.10.1 A brief explanation of how mom handles indents</a></li>
-        <li><a href="typesetting.html#INDEX_INDENTS">4.10.2 Macro list</a></li>
-    </ul>
-
-    <a name="GOODIES"></a>
-    <li><a href="goodies.html#GOODIES"><strong>4.11 Goodies</strong></a>
-        &mdash; aliases, transparent lines, smartquotes, caps,
-        underscoring/underlining, padding lines, leaders, drop
-        caps, superscripts, (nested) lists, user-definable strings,
-        changing the escape character</li>
-
-    <ul>
-        <li><a href="goodies.html#INDEX_GOODIES">4.11.1 Macro list</a></li>
-    </ul>
-
-    <a name="ESCAPES"></a>
-    <li><a href="inlines.html#INLINE_ESCAPES"><strong>4.12 Inline Escapes</strong></a></li>
-
-    <ul>
-        <li><a href="inlines.html#INTRO_INLINE_ESCAPES">4.12.1 Introduction to inline escapes</a></li>
-        <li><a href="inlines.html#INLINES_MOM">4.12.2 Mom's personal inlines</a></li>
-        <li><a href="inlines.html#INLINES_GROFF">4.12.3 Groff inlines</a></li>
-        <li><a href="inlines.html#INLINE_CHARACTERS_GROFF">4.12.3.1 Inlines for special characters and symbols</a></li>
-    </ul>
-
-    <a name="COLOR"></a>
-    <li><a href="color.html#TOP"><strong>4.13 Coloured text</strong></a></li>
-
-    <ul>
-        <li><a href="color.html#INTRO_COLOR">4.13.1 Introduction to coloured text</a></li>
-        <li><a href="color.html#MACROS_COLOR">4.13.2 Macro list</a></li>
-    </ul>
-
-    <a name="GRAPHICAL"></a>
-    <li><a href="graphical.html#TOP"><strong>4.14 Graphical objects</strong></a>
-        &mdash; horizontal and vertical rules, boxes, ellipses (circles)</li>
-
-    <ul>
-        <li><a href="graphical.html#INTRO_GRAPHICAL">4.14.1 Introduction to graphical objects</a></li>
-        <li><a href="graphical.html#MACROS_GRAPHICAL">4.13.2 Macro list</a></li>
-    </ul>
-
-</ul>
+  <ul class="toc">
+    <li><a id="type-intro" href="typesetting.html#typesetting-intro">4.1 Introduction to the typesetting macros</a></li>
+    <li><a id="page" href="typesetting.html#page-setup-intro">4.2 Paper and page Setup</a> &ndash; paper size and page margins
+      <ul>
+        <li><a href="typesetting.html#index-page-setup">4.2.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="param" href="typesetting.html#basic-params-intro">4.3 Basic typesetting parameters</a> &ndash; family, font, fallback font, point size, line space, line length, autolead
+      <ul>
+        <li><a href="typesetting.html#index-basic">4.3.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="just" href="typesetting.html#justification-intro">4.4 Justifying, quadding, filling and breaking lines</a>
+      <ul>
+        <li><a href="typesetting.html#index-justification">4.4.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="refine" href="typesetting.html#refinements-intro">4.5 Refinements</a> &ndash; word space, sentence space, letter spacing (track kerning), hyphenation, kerning, ligatures
+      <ul>
+        <li><a href="typesetting.html#index-refinements">4.5.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="mod" href="typesetting.html#modifications-intro">4.6 Modifying Type</a> &ndash; pseudo-italic, -bold, -condensed, and -extended
+      <ul>
+        <li><a href="typesetting.html#index-modifications">4.6.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="vert" href="typesetting.html#aldrld-intro">4.7 Vertical Movements</a> &ndash; moving up and down on the page
+      <ul>
+        <li><a href="typesetting.html#index-aldrld">4.7.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="tab" href="typesetting.html#tabs-intro">4.8 Tabs</a>
+    <ul>
+      <li><a href="typesetting.html#typesetting-tabs">4.8.1 Typesetting tabs</a>
+        <ul>
+          <li><a href="typesetting.html#typesetting-tabs-tut">4.8.1.1 Quickie tutorial</a></li>
+        </ul></li>
+      <li><a href="typesetting.html#string-tabs">4.8.2 String tabs (autotabs)</a>
+        <ul>
+          <li><a href="typesetting.html#string-tabs-tut">4.8.2.1 Quickie tutorial</a></li>
+        </ul></li>
+      <li><a href="typesetting.html#index-tabs">4.8.3 Macro list</a></li>
+    </ul></li>
+    <li><a id="col" href="typesetting.html#multicolumns-intro">4.9 Multiple columns</a>
+      <ul>
+        <li><a href="typesetting.html#index-multicolumns">4.9.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="ind" href="typesetting.html#indents-intro">4.10 Indents</a>
+      <ul>
+        <li><a href="typesetting.html#indents-handling">4.10.1 A brief explanation of how mom handles indents</a></li>
+        <li><a href="typesetting.html#index-indents">4.10.2 Macro list</a></li>
+      </ul></li>
+    <li><a id="goodies" href="goodies.html#top">4.11 Goodies</a>
+         &ndash; aliases, transparent (comment) lines, smartquotes, caps,
+         underscoring/underlining, padding lines, leaders, drop
+         caps, superscripts, user-definable strings, changing the
+         escape character
+      <ul>
+        <li><a href="goodies.html#index-goodies">4.11.1 Macro list</a></li>
+      </ul></li>
+    <li><a id="escapes" href="inlines.html#top">4.12 Inline Escapes</a>
+      <ul>
+        <li><a href="inlines.html#intro-inlines">4.12.1 Introduction to inline escapes</a></li>
+        <li><a href="inlines.html#index-inlines">4.12.2 List of inline escapes</a></li>
+        <li><a href="inlines.html#inlines-mom-top">4.12.3 Mom's personal inline escapes</a></li>
+        <li><a href="inlines.html#inlines-groff-top">4.12.4 Commonly-used groff inline escapes</a>
+        <ul>
+        <li><a href="inlines.html#inline-characters-groff">4.12.4.1 Special characters and symbols</a></li>
+        </ul></li>
+      </ul></li>
+    <li><a id="color" href="color.html#top">4.13 Coloured text</a>
+      <ul>
+        <li><a href="color.html#intro-color">4.13.1 Introduction to coloured text</a></li>
+        <li><a href="color.html#index-color">4.13.2 Macro list</a></li>
+      </ul></li>
+    <li><a id="graphical" href="graphical.html#top">4.14 Graphical objects</a>
+        &ndash; horizontal and vertical rules, boxes, ellipses (circles)
+      <ul>
+        <li><a href="graphical.html#intro-graphical">4.14.1 Introduction to graphical objects</a></li>
+        <li><a href="graphical.html#index-graphical">4.13.2 Macro list</a></li>
+      </ul></li>
+  </ul>
 
 <!-- -DOCUMENT PROCESSING MACORS- -->
 
-<a name="DOCPROC"></a>
-<a href="docprocessing.html#DOCPROCESSING"><strong>5. DOCUMENT PROCESSING WITH MOM</strong></a>
-
-<ul>
-    <li><a href="docprocessing.html#INTRO_MACROS_DOCPROCESSING"><strong>5.1 Introduction to document processing</strong></a></li>
-    <li><a href="docprocessing.html#DEFAULTS"><strong>5.2 Some document defaults</strong></a></li>
-
-    <ul>
-        <li><a href="docprocessing.html#LEADING_NOTE">IMPORTANT NOTE on leading/spacing and bottom margins</a></li>
-        <li><a href="docprocessing.html#SHIM">The SHIM macro</a> &mdash; to get document leading back on track</li>
-    </ul>
-
-    <a name="PRELIM"></a>
-    <li><a href="docprocessing.html#SETUP"><strong>5.3 PRELIMINARY DOCUMENT SETUP</strong></a></li>
-
-    <ul>
-        <li><a href="docprocessing.html#DOCPROCESSING_TUT">5.3.1 Tutorial</a> &mdash; setting up a mom document</li>
-        <li><a href="docprocessing.html#REFERENCE_MACROS"><strong>5.3.2 The Reference Macros</strong></a> &mdash; giving <strong>mom</strong> the information she needs to do her job</li>
-
-        <ul>
-            <li><a href="docprocessing.html#TITLE">5.3.2.1 TITLE</a></li>
-            <li><a href="docprocessing.html#DOC_TITLE">5.3.2.2 DOCTITLE</a></li>
-            <li><a href="docprocessing.html#SUBTITLE">5.3.2.3 SUBTITLE</a></li>
-            <li><a href="docprocessing.html#AUTHOR">5.3.2.4 AUTHOR</a></li>
-            <li><a href="docprocessing.html#CHAPTER">5.3.2.5 CHAPTER</a></li>
-            <li><a href="docprocessing.html#CHAPTER_TITLE">5.3.2.6 CHAPTER_TITLE</a></li>
-            <li><a href="docprocessing.html#DRAFT">5.3.2.7 DRAFT</a></li>
-            <li><a href="docprocessing.html#REVISION">5.3.2.8 REVISION</a></li>
-            <li><a href="docprocessing.html#COPYRIGHT">5.3.2.9 COPYRIGHT</a></li>
-            <li><a href="docprocessing.html#MISC">5.3.2.10 MISC</a></li>
-            <li><a href="docprocessing.html#COVERTITLE">5.3.2.11 COVERTITLE</a></li>
-            <li><a href="docprocessing.html#COVERTITLE">5.3.2.12 DOC_COVERTITLE</a></li>
-        </ul>
-
-        <li><a href="docprocessing.html#DOCSTYLE_MACROS"><strong>5.3.3 The Docstyle Macros</strong></a> &mdash; telling <strong>mom</strong> what kind of document you're creating and how you want it to look overall</li>
-
-        <ul>
-            <li><a href="docprocessing.html#DOCTYPE">5.3.3.1 DOCTYPE</a> &mdash; kind of document</li>
-            <li><a href="docprocessing.html#PRINTSTYLE">5.3.3.2 PRINTSTYLE</a> &mdash; typeset or typewrite</li>
-            <li><a href="docprocessing.html#COPYSTYLE">5.3.3.3 COPYSTYLE</a> &mdash; draft or final</li>
-        </ul>
-
-        <li><a href="docprocessing.html#START_MACRO"><strong>5.3.4 Initiate document processing</strong></a></li>
-
-        <ul>
-            <li><a href="docprocessing.html#START">5.3.4.1 START</a> &mdash; the required macro to initiate document processing</li>
-        </ul>
-
-        <li><a href="docprocessing.html#STYLE_BEFORE_START"><strong>5.3.5 Changing global typesetting and formatting parameters <em>before</em> START</strong></a></li>
-
+  <h3 id="doc-proc" class="toc"><a style="color: #6e70cc" href="docprocessing.html#top">5. DOCUMENT PROCESSING WITH MOM</a></h3>
+  <ul class="toc">
+    <li><a href="docprocessing.html#docprocessing-intro">5.1 Introduction to document processing</a></li>
+    <li><a id="doc-defaults" href="docprocessing.html#defaults">5.2 Document defaults</a>
+      <ul>
+        <li><a href="docprocessing.html#leading-note">5.2.1 Important note on leading/spacing and bottom margins</a>
+        <ul>
+        <li><a href="docprocessing.html#shim">5.2.1.1 The SHIM macro</a> &ndash; to get document leading back on track</li>
+        </ul></li>
+      </ul></li>
+    <li><a id="prelim" class="highlight" href="docprocessing.html#setup">5.3 PRELIMINARY DOCUMENT SETUP</a>
+      <ul>
+        <li><a href="docprocessing.html#docprocessing-tut" class="highlight">5.3.1 Tutorial</a> &ndash; setting up a mom document</li>
+        <li><a href="docprocessing.html#reference-macros" class="highlight">5.3.2 The reference macros</a> &ndash; meta-information mom needs to do her job
+           <ul>
+            <li><a href="docprocessing.html#title">5.3.2.1 TITLE</a></li>
+            <li><a href="docprocessing.html#doc-title">5.3.2.2 DOCTITLE</a></li>
+            <li><a href="docprocessing.html#subtitle">5.3.2.3 SUBTITLE</a></li>
+            <li><a href="docprocessing.html#author">5.3.2.4 AUTHOR</a></li>
+            <li><a href="docprocessing.html#chapter">5.3.2.5 CHAPTER</a></li>
+            <li><a href="docprocessing.html#chapter-title">5.3.2.6 CHAPTER_TITLE</a></li>
+            <li><a href="docprocessing.html#draft">5.3.2.7 DRAFT</a></li>
+            <li><a href="docprocessing.html#revision">5.3.2.8 REVISION</a></li>
+            <li><a href="docprocessing.html#copyright">5.3.2.9 COPYRIGHT</a></li>
+            <li><a href="docprocessing.html#misc">5.3.2.10 MISC</a></li>
+            <li><a href="docprocessing.html#covertitle">5.3.2.11 COVERTITLE</a></li>
+            <li><a href="docprocessing.html#covertitle">5.3.2.12 DOC_COVERTITLE</a></li>
+          </ul></li>
+        <li><a href="docprocessing.html#docstyle-macros" class="highlight">5.3.3 The docstyle macros</a> &ndash; general appearance; what kind of document you're creating, and how you want it to look overall
+          <ul>
+            <li><a href="docprocessing.html#doctype">5.3.3.1 DOCTYPE</a> &ndash; the kind of document</li>
+            <li><a href="docprocessing.html#printstyle">5.3.3.2 PRINTSTYLE</a> &ndash; typeset or &#8220;typewritten, double-spaced&#8221;</li>
+            <li><a href="docprocessing.html#copystyle">5.3.3.3 COPYSTYLE</a> &ndash; draft or final</li>
+          </ul></li>
+        <li><a href="docprocessing.html#start-macro" class="highlight">5.3.4 Initiate document processing</a>
+          <ul>
+            <li><a href="docprocessing.html#start">5.3.4.1 START</a> &ndash; the required macro to initiate document processing</li>
+          </ul></li>
+        <li><a href="docprocessing.html#style-before-start" class="highlight">5.3.5 Establishing type and formatting parameters before START</a>
+          <ul>
+            <li><a href="docprocessing.html#type-before-start">5.3.5.1 Use of the typesetting macros before START</a>
+              <ul class="fourth-level">
+                <li>&ndash; <a href="docprocessing.html#include">5.3.5.1.1 Including (sourcing) style sheets and files</a></li>
+                <li>&ndash; <a href="docprocessing.html#color">5.3.5.1.2 Initializing colours</a></li>
+              </ul></li>
+            <li><a href="docprocessing.html#doc-lead-adjust">5.3.5.2  DOC_LEAD_ADJUST</a> &ndash; adjust document
+                <a href="definitions.html#leading">leading</a>
+                to fill pages
+            <ul class="fourth-level">
+              <li>&ndash; <a href="docprocessing.html#shim">5.3.5.2.1 SHIM</a> &ndash; macro to get document leading back on track</li>
+            </ul></li>
+            <li><a href="docprocessing.html#docheader">5.3.5.3 Managing the document header</a></li>
+            <li><a href="docprocessing.html#columns-intro">5.3.5.4 COLUMNS</a> &ndash; setting documents in columns</li>
+        </ul></li>
+      <li><a href="docprocessing.html#style-after-start" class="highlight">5.3.6 Changing basic type and formatting parameters after START</a>
+        <ul>
+          <li><a id="typemacdoc" href="docprocessing.html#behaviour">5.3.6.1 Behaviour of the typesetting macros during document processing</a></li>
+          <li><a href="docprocessing.html#intro-doc-param">5.3.6.2 Post-START global style change macros</a>
+          <ul class="fourth-level">
+            <li>&ndash; <a href="docprocessing.html#index-doc-param">Macro list</a></li>
+          </ul></li>
+        </ul></li>
+      </ul></li>
+      <li><a id="tags" class="highlight" href="docelement.html#top">5.4 THE DOCUMENT ELEMENT TAGS</a>
         <ul>
-            <li><a href="docprocessing.html#TYPE_BEFORE_START">5.3.5.1 Using the typesetting macros before START</a></li>
-
+          <li><a href="docelement.html#docelement-intro">5.4.1 Introduction to the document element tags</a>
             <ul>
-                <li><a href="docprocessing.html#INCLUDE">Including (sourcing) style sheets and files</a></li>
-                <li><a href="docprocessing.html#COLOR">Initializing colours</a></li>
-            </ul>
-
-            <li><a href="docprocessing.html#DOC_LEAD_ADJUST">5.3.5.2  DOC_LEAD_ADJUST</a> &mdash; adjust a document's
-                <a href="definitions.html#TERMS_LEADING">leading</a>
-                (line spacing) to fill pages</li>
-            <li><a href="docprocessing.html#DOCHEADER">5.3.5.3 DOCHEADER</a> &mdash; managing the
-                <a href="definitions.html#TERMS_DOCHEADER">document header</a></li>
-            <li><a href="docprocessing.html#COLUMNS_INTRO">5.3.5.4 COLUMNS</a> &mdash; setting documents in columns</li>
-        </ul>
-
-        <li><a href="docprocessing.html#DOC_PARAM_MACROS"><strong>5.3.6 Changing global style parameters <em>after</em> START</strong></a></li>
-
-        <ul>
-            <li><a href="docprocessing.html#INDEX_DOC_PARAM">5.3.6.1 Macro list</a></li>
-        </ul>
-
-        <a name="TYPEMACDOC"></a>
-        <li><a href="typemacdoc.html#TYPESETTING"><strong>5.3.7 Using the typesetting macros during document processing</strong></a></li>
-    </ul>
-
-    <a name="TAGS"></a>
-    <li><a href="docelement.html#DOCELEMENT"><strong>5.4 THE DOCUMENT ELEMENT TAGS</strong></a></li>
-
-    <ul>
-        <li><a href="docelement.html#DOCELEMENT_INTRO">5.4.1 Introduction to the document element tags</a></li>
-
-        <ul>
-            <li><a href="docelement.html#DOCELEMENT_CONTROL">Control macros</a> &mdash; changing style defaults for document element tags</li>
-            <li><a href="docelement.html#CONTROL_MACRO_ARGS">Arguments to the control macros</a></li>
-        </ul>
-
-        <li><a href="docelement.html#EPIGRAPH_INTRO">5.4.2 Epigraphs</a></li>
-        <li><a href="docelement.html#PP_INTRO">5.4.3 Paragraphs</a></li>
-        <li><a href="docelement.html#HEAD_INTRO">5.4.4 Main heads</a></li>
-        <li><a href="docelement.html#SUBHEAD_INTRO">5.4.5 Subheads</a></li>
-        <li><a href="docelement.html#PARAHEAD_INTRO">5.4.6 Paragraph heads</a></li>
-        <li><a href="docelement.html#LINEBREAK_INTRO">5.4.7 Linebreaks</a> &mdash; author linebreaks (section breaks)</li>
-        <li><a href="docelement.html#QUOTE_INTRO">5.4.8 Quotes</a> &mdash; line for line poetic quotes or unformatted, verbatim text (e.g. code snippets)</li>
-        <li><a href="docelement.html#BLOCKQUOTE_INTRO">5.4.9 Blockquotes</a> &mdash; cited material</li>
-        <li><a href="docelement.html#CODE">5.4.10 Code</a> &mdash; inserting code snippets into documents</li>
-        <li><a href="docelement.html#LIST_INTRO">5.4.11 Lists</a> &mdash; (nested) lists</li>
-        <li><a href="docelement.html#NUMBER_LINES_INTRO">5.4.12 Line numbering</a></li>
-        <li><a href="docelement.html#FOOTNOTE_INTRO">5.4.13 Footnotes</a></li>
-        <li><a href="docelement.html#ENDNOTE_INTRO">5.4.14 Endnotes</a></li>
-        <li><a href="docelement.html#MARGIN_NOTES_INTRO">5.4.15 Margin notes</a></li>
-        <li><a href="docelement.html#BLANK_PAGE_TITLE">5.4.16 Blank pages</a></li>
-        <li><a href="docelement.html#FINIS_INTRO">5.4.17 Document termination string</a> &mdash; FINIS</li>
-        <li><a href="docelement.html#TOC_INTRO">5.4.18 Tables of contents</a></li>
-    </ul>
-
-    <a name="IMAGES"></a>
-    <li><a href="docelement.html#PSPIC"><strong>5.5 INSERTING IMAGES INTO A DOCUMENT</strong></a></li>
-
-    <a name="HDRFTR"></a>
-    <li><a href="headfootpage.html#HEADFOOTPAGE"><strong>5.6 PAGE HEADERS AND FOOTERS</strong></a></li>
-
-    <ul>
-        <li><a href="headfootpage.html#HEADFOOTPAGE_INTRO">5.6.1 Introduction</a></li>
-        <li><a href="headfootpage.html#DESCRIPTION_GENERAL">5.6.2 General description of headers/footers</a></li>
-        <li><a href="headfootpage.html#HEADER_STYLE">5.6.3 Default specs for headers/footers</a></li>
-        <li><a href="headfootpage.html#VERTICAL_SPACING">5.6.4 Vertical placement and spacing of headers/footers</a></li>
-        <li><a href="headfootpage.html#HEADFOOT_MANAGEMENT">5.6.5 Managing headers/footers</a></li>
-
-        <ul>
-            <li><a href="headfootpage.html#USERDEF_HDRFTR">5.6.5.1 User-defined, single string recto/verso headers/footers</a></li>
-        </ul>
-
-        <li><a href="headfootpage.html#HEADFOOT_CONTROL">5.6.6 Control macros for headers/footers</a></li>
-    </ul>
-
-    <a name="PAGINATE"></a>
-    <li><a href="headfootpage.html#PAGINATION"><strong>5.7 PAGINATION</strong></a></li>
-
-    <ul>
-        <li><a href="headfootpage.html#PAGINATION">Introduction</a></li>
-        <li><a href="headfootpage.html#INDEX_PAGINATION">Pagination macros list</a></li>
-    </ul>
-
-    <a name="RV"></a>
-    <li><a href="rectoverso.html#RECTOVERSO"><strong>5.8 RECTO/VERSO PRINTING, COLLATING</strong></a></li>
-
-    <ul>
-        <li><a href="rectoverso.html#RECTOVERSO_INTRO">5.8.1 Introduction to recto/verso</a></li>
-
-        <ul>
-            <li><a href="rectoverso.html#RECTOVERSO_LIST">5.8.1.1 Macro list</a></li>
-        </ul>
-
-        <li><a href="rectoverso.html#COLLATE_INTRO">5.8.2 Introduction to collating</a></li>
-
-        <ul>
-            <li><a href="rectoverso.html#COLLATE">5.8.2.1 The COLLATE macro</a></li>
-        </ul>
-
-    </ul>
-
-    <a name="COVER"></a>
-    <li><a href="cover.html#COVER_TOP"><strong>5.9 CREATING COVER PAGES</strong></a></li>
-
-    <a name="REF"></a>
-    <li><a href="refer.html#REF_INTRO"><strong>5.10 BIBLIOGRAPHIES AND REFERENCES</strong></a></li>
-
-    <a name="LETTER"></a>
-    <li><a href="letters.html#LETTERS"><strong>5.11 WRITING LETTERS</strong></a></li>
-
-    <ul>
-        <li><a href="letters.html#LETTERS_INTRO">5.11.1 Introduction to writing letters</a></li>
-        <li><a href="letters.html#TUTORIAL">5.11.2 Tutorial on writing letters</a></li>
-        <li><a href="letters.html#LETTERS_DEFAULTS">5.11.3 Default style for letters</a></li>
-        <li><a href="letters.html#LETTERS_MACROS">5.11.4 The letter macros</a></li>
+              <li><a href="docelement.html#docelement-control">5.4.1.1 Control macros</a> &ndash; changing style defaults for document element tags</li>
+              <li><a href="docelement.html#control-macro-args">5.4.1.2 Arguments to the control macros</a></li>
+            </ul></li>
+          <li><a href="docelement.html#epigraph-intro">5.4.2 Epigraphs</a></li>
+          <li><a href="docelement.html#pp-intro">5.4.3 Paragraphs</a></li>
+          <li><a href="docelement.html#head-intro">5.4.4 Main heads</a></li>
+          <li><a href="docelement.html#subhead-intro">5.4.5 Subheads</a></li>
+          <li><a href="docelement.html#parahead-intro">5.4.6 Paragraph heads</a></li>
+          <li><a href="docelement.html#linebreak-intro">5.4.7 Linebreaks</a> &ndash; author linebreaks (section breaks)</li>
+          <li><a href="docelement.html#quote-intro">5.4.8 Quotes</a> &ndash; line for line poetic quotes or unformatted, verbatim text (e.g. blocks of code)</li>
+          <li><a href="docelement.html#blockquote-intro">5.4.9 Blockquotes</a> &ndash; cited material</li>
+          <li><a href="docelement.html#code">5.4.10 Code</a> &ndash; inserting code snippets</li>
+          <li><a href="docelement.html#list-intro">5.4.11 Lists</a> &ndash; nested lists</li>
+          <li><a href="docelement.html#number-lines-intro">5.4.12 Line numbering</a></li>
+          <li><a href="docelement.html#footnote-intro">5.4.13 Footnotes</a></li>
+          <li><a href="docelement.html#endnote-intro">5.4.14 Endnotes</a></li>
+          <li><a href="docelement.html#margin-notes-intro">5.4.15 Margin notes</a></li>
+          <li><a href="docelement.html#finis-intro">5.4.16 Document termination string</a> &ndash; FINIS</li>
+        </ul></li>
+      <li><a id="images" class="highlight" href="images.html#top">5.5 INSERTING IMAGES</a></li>
+      <li><a id="hdrftr" class="highlight" href="headfootpage.html#top">5.6 PAGE HEADERS AND FOOTERS</a>
+        <ul>
+          <li><a href="headfootpage.html#headfootpage-intro">5.6.1 Introduction</a></li>
+          <li><a href="headfootpage.html#description-general">5.6.2 General description of headers/footers</a></li>
+          <li><a href="headfootpage.html#header-style">5.6.3 Default specs for headers/footers</a></li>
+          <li><a href="headfootpage.html#vertical-spacing">5.6.4 Vertical placement and spacing of headers/footers</a></li>
+          <li><a href="headfootpage.html#headfoot-management">5.6.5 Managing page headers and footers</a></li>
+          <li><a href="headfootpage.html#headfoot-control">5.6.6 Control macros for headers/footers</a></li>
+          <li><a href="headfootpage.html#userdef-hdrftr-rv">5.6.7 User-defined, single string recto/verso headers/footers</a>
+          <ul>
+            <li><a href="headfootpage.html#userdef-hdrftr">5.6.7.1 User-defined, single string headers/footers (no recto/verso)</a></li>
+          </ul></li>
+          <li><a href="headfootpage.html#headers-and-footers-intro">5.6.8 Headers and footers on the same page</a></li>
+        </ul></li>
+      <li><a id="paginate" class="highlight" href="headfootpage.html#pagination-intro">5.7 PAGINATION</a>
+        <ul>
+          <li><a href="headfootpage.html#pagination">5.7.1 Introduction</a></li>
+          <li><a href="headfootpage.html#index-pagination">5.7.2 Pagination macros list</a></li>
+          <li><a href="headfootpage.html#blank-pages">5.7.3 Blank pages</a></li>
+        </ul></li>
+      <li><a id="rv" class="highlight" href="rectoverso.html#top">5.8 RECTO/VERSO PRINTING, COLLATING</a>
+        <ul>
+          <li><a href="rectoverso.html#rectoverso-intro">5.8.1 Introduction to recto/verso printing</a>
+          <ul>
+              <li><a href="rectoverso.html#rectoverso-list">5.8.1.1 Macro list</a></li>
+            </ul></li>
+          <li><a href="rectoverso.html#collate-intro">5.8.2 Introduction to collating</a>
+          <ul>
+            <li><a href="rectoverso.html#collate">5.8.2.1 The COLLATE macro</a></li>
+          </ul></li>
+        </ul></li>
+      <li><a id="cover" class="highlight" href="cover.html#top">5.9 COVER PAGES</a></li>
+      <li><a id="tocs" class="highlight" href="tables-of-contents.html#top">5.10 TABLES OF CONTENTS</a>
+        <ul>
+          <li><a href="tables-of-contents.html#toc-behaviour">5.10.1 Table of contents behaviour</a></li>
+          <li><a href="tables-of-contents.html#psselect">5.10.2 Using psselect to put tables of contents where you want them</a></li>
+          <li><a href="tables-of-contents.html#toc-control">5.10.3 Table of contents control macros</a></li>
+        </ul></li>
+      <li><a id="ref" class="highlight" href="refer.html#top">5.11 BIBLIOGRAPHIES AND REFERENCES</a></li>
+      <li><a id="letter" class="highlight" href="letters.html#top">5.12 WRITING LETTERS</a>
+        <ul>
+        <li><a href="letters.html#letters-intro">5.11.1 Introduction to writing letters</a></li>
+          <li><a href="letters.html#tutorial">5.11.2 Tutorial on writing letters</a></li>
+          <li><a href="letters.html#letters-defaults">5.11.3 Default style for letters</a></li>
+          <li><a href="letters.html#index-letters-macros">5.11.4 The letter macros</a></li>
+        </ul></li>
+      </ul>
+      <h3 id="quick" class="toc highlight"><a style="color: #6e70cc" href="macrolist.html#top">6. QUICK REFERENCE GUIDE</a></h3>
+      <h3 id="appendices" class="toc" style="margin-top: .5em;"><a style="color: #6e70cc" href="appendices.html#top">7. APPENDICES</a></h3>
+      <ul class="toc">
+      <li><a href="appendices.html#moredoc">7.1 Notes on the documentation</a></li>
+      <li><a href="appendices.html#fonts">7.2 Adding PostScript fonts to groff</a>
+        <ul>
+          <li><a href="appendices.html#howto">7.2.1 How to create a PostScript font for use with groff</a></li>
+      </ul></li>
+      <li><a href="appendices.html#codenotes">7.3 Some reflections on mom</a></li>
+      <li id="reserved"><a href="reserved.html#top">7.5 List of reserved words</a>
+          &ndash; complete list of macros, registers, strings, aliases and diversions</li>
+      <li><a href="appendices.html#contact">7.5 Contact the author</a></li>
     </ul>
+  </div>
 
-</ul>
-
-<a name="QUICK"></a>
-<a href="macrolist.html#QUICK"><strong>6. QUICK REFERENCE GUIDE TO MOM</strong></a>
-<br/>
-
-<a name="APP"></a>
-<a href="appendices.html#APPENDICES"><strong>7. APPENDICES</strong></a>
-
-<ul>
-    <li><a href="appendices.html#MOREDOC">7.1 Further notes on this documentation</a></li>
-    <li><a href="appendices.html#FONTS">7.2 Adding PostScript fonts to groff</a></li>
+</div>
 
-    <ul>
-        <li><a href="appendices.html#HOWTO">7.2.1 How to create a PostScript font for use with groff</a></li>
-    </ul>
-
-    <li><a href="appendices.html#CODENOTES">7.3 Some reflections on mom</a></li>
-    <li><a href="reserved.html#RESERVED">7.5 List of reserved words</a>
-        &mdash; complete list of macros, registers, strings, aliases and diversions</li>
-    <li><a href="appendices.html#CONTACT">7.5 Contact the author</a></li>
-</ul>
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
 
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/typemacdoc.html groff-1.21/contrib/mom/momdoc/typemacdoc.html
--- groff-1.20.1/contrib/mom/momdoc/typemacdoc.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/typemacdoc.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-This file is part of groff, the GNU roff type-setting system.
-
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
-Written by Peter Schaffter.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being this comment section, with no Front-Cover
-Texts, and with no Back-Cover Texts.
-
-A copy of the Free Documentation License is included as a file called
-FDL in the main directory of the groff source package.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Typesetting macros in document processing</title>
-</head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
-
-<a name="TOP"></a>
-
-<p>
-<a href="docelement.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="docprocessing.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
-
-<a name="TYPESETTING"><h1 align="center"><u>Using the typesetting macros during document processing</u></h1></a>
-
-<p>
-<a href="#BEHAVIOUR">Typesetting macro behaviour</a>
-<br/>
-
-<a href="#TB_MARGINS">Top and bottom margins in document processing</a>
-<br/>
-
-<a href="#SPACE">Inserting space at the top of a page</a>
-<br/>
-
-&nbsp;&nbsp;&nbsp;&nbsp;* <a href="#ADD_SPACE">ADD_SPACE</a>
-</p>
-
-<a name="BEHAVIOUR"><h2><u>Typesetting macro behaviour</u></h2></a>
-
-<p>
-During document processing, most of the
-<a href="typesetting.html#MACROS_TYPESETTING">typesetting macros</a>
-affect type in the document globally.  For example, if you turn
-kerning off, pairwise kerning is disabled not only in paragraphs,
-but also in headers, footers, quotes, and so on.
-</p>
-
-<p>
-Typesetting macros that alter margins and line lengths affect
-<a href="definitions.html#TERMS_RUNNING">running text</a>
-globally (or at least try to), but leave headers/footers and
-footnotes alone.  (To indent footnotes, see the full explanation of
-the
-<a href="docelement.html#FOOTNOTE">FOOTNOTE</a>
-macro.)
-</p>
-
-<p>
-<strong>Mom</strong>'s tabs
-(both
-<a href="typesetting.html#TYPESETTING_TABS">typesetting tabs</a>
-and
-<a href="typesetting.html#STRING_TABS">string tabs</a>)
-behave as expected in running text during document processing.  Tab
-structures that do not exceed the line length of running text are
-preserved sensibly from page to page, and, if
-<a href="docprocessing.html#COLUMNS">COLUMNS</a>
-are enabled, from column to column.
-</p>
-
-<p>
-Some typesetting macros, however, when used during document
-processing, behave in special ways.  These are the macros that deal
-with the basic parameters of type style: horizontal and vertical
-margins, line length,
-<a href="definitions.html#TERMS_FAMILY">family</a>,
-<a href="definitions.html#TERMS_FONT">font</a>,
-<a href="definitions.html#TERMS_PS">point size</a>,
-<a href="definitions.html#TERMS_LEADING">leading</a>,
-and
-<a href="definitions.html#TERMS_QUAD">quad</a>.
-</p>
-
-<p>
-<strong>Mom</strong> assumes that any changes to these parameters
-stem from a temporary need to set type in a style different from
-that provided by <strong>mom</strong>'s
-<a href="docelement.html#INDEX_DOCELEMENT">document element tags</a>.
-In other words, you need to do a bit of creative typesetting in the
-middle of a document.
-</p>
-
-<p>
-The following lists those typesetting macros whose behaviour during
-document processing requires some explanation.
-(Please refer to
-<a href="#TB_MARGINS">Top and bottom margins in document processing</a>
-for information on how <strong>mom</strong> interprets
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>
-and
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>
-in document processing.  Additionally, see
-<a href="#ADD_SPACE">ADD_SPACE</a>
-if you encounter the problem of trying to get <strong>mom</strong>
-to put space at the tops of pages after the first.)
-</p>
-
-<pre>
-MACRO           EFFECT DURING DOCUMENT PROCESSING
------           ---------------------------------
-
-L_MARGIN        *The left margin of all running text
-                 assumes the new value.
-
-                *The line length remains unaltered.
-
-                *The header and footer left margin
-                 remain at the current document default.
-
-                (You won't use this often by itself.  Most
-                 likely, you'll use it in combination with
-                 R_MARGIN or LL.)
-
-R_MARGIN        *The right margin of all running text
-                 assumes the new value.  In other words,
-                 the line length is altered.
-
-                *The header and footer right margin
-                 remain at the current document default.
-
-LL              *The line length of all running text
-                 is set to the new value.
-
-                *The header and footer line length remain
-                 at the current document default.
-
-FAMILY          *Changes family for the duration of the
-                 current tag only.  As soon as another document
-                 element tag is invoked, the family reverts to
-                 the current default for the new tag.
-
-FT              *Changes font for the duration of the
-                 current tag only.  As soon as another document
-                 element tag is entered, the font reverts
-                 to the current default for the new tag.
-
-                 N.B. &mdash; \*[SLANT] and \*[BOLDER] affect
-                 paragraph text, and remain in effect for all
-                 paragraphs until turned off.  If you want to
-                 use them in a macro that takes a string
-                 argument, include the escape in the string.
-                 \*[COND] and \*[EXT] behave similarly.
-
-PT_SIZE         *Changes point size for the duration of the
-                 current tag only.  As soon as another document
-                 element tag is entered, the point size reverts
-                 to the current document default for the new
-                 tag.
-
-LS              *Changes line space for the duration of the
-                 current tag only.  As soon as another document
-                 element tag is entered, the line space reverts to
-                 the current document default for the new
-                 tag.
-
-                 Using LS to temporarily change leading within a
-                 document will almost certainly result in a bottom
-                 margin that doesn't align with the bottom margin
-                 of subsequent pages.  You'll need to use the SHIM
-                 macro to get mom back on track when you're ready
-                 to return to the document's default leading.
-
-QUAD            *Changes quad for the duration of the
-                 current tag only.  As soon as another document
-                 element tag is entered, the quad reverts to
-                 the current document default for the new
-                 tag.
-
-                 N.B. &mdash; Line-for-line quadding macros
-                 (LEFT, CENTER, RIGHT) are also temporary,
-                 overridden by the QUAD value of any subsequent
-                 document element tag.
-</pre>
-
-<hr/>
-
-<!-- ===================================================================== -->
-
-<a name="TB_MARGINS"><h2><u>Top and bottom margins in document processing</u></h2></a>
-
-<p>
-Normally, <strong>mom</strong> establishes the top and bottom
-margins of
-<a href="definitions.html#TERMS_RUNNING">running text</a>
-in documents from the values of <strong>HEADER_MARGIN +
-HEADER_GAP</strong> and <strong>FOOTER_MARGIN + FOOTER_GAP</strong>
-respectively.  However, if you invoke
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>
-or
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>
-either before or after
-<a href="docelement.html#START">START</a>,
-they set the top and bottom margins of running text irrespective of
-<strong>HEADER_GAP</strong> and <strong>FOOTER_GAP</strong>.
-</p>
-
-<p>
-Put another way, in document processing, <strong>T_MARGIN</strong>
-and <strong>B_MARGIN</strong> set the top and bottom margins of
-running text, but have no effect on the placement of
-<a href="definitions.html#TERMS_HEADER">headers</a>,
-<a href="definitions.html#TERMS_FOOTER">footers</a>,
-or page numbers.
-</p>
-
-<hr/>
-
-<!-- ==================================================================== -->
-
-<a name="SPACE"><h2><u>Inserting space at the top of a page</u></h2></a>
-
-<p>
-Occasionally, you may want to insert space before the start of
-<a href="definitions.html#TERMS_RUNNING">running text</a>
-on pages after the first.
-</p>
-
-<p>
-You might have tried using
-<a href="typesetting.html#ALD">ALD</a>
-or
-<a href="typesetting.html#SPACE">SPACE</a>
-and found it did nothing.  This is because <strong>mom</strong>
-normally inhibits any extra space before the start of running text
-on pages after the first.
-</p>
-
-<p>
-If you need the space, you must use the macro,
-<strong>ADD_SPACE</strong>, in conjuction with
-<a href="typesetting.html#NEWPAGE">NEWPAGE</a>.
-</p>
-
-<!-- -ADD_SPACE- -->
-
-<hr width="66%" align="left"/>
-
-<a name="ADD_SPACE"></a>
-
-<p>
-<nobr>Macro: <strong>ADD_SPACE</strong> <kbd>&lt;amount of space&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-<strong>ADD_SPACE</strong> takes as its single argument the distance
-you want <strong>mom</strong> to advance from the normal baseline
-position at the top of the page.  A
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-is required.
-</p>
-
-<p>
-For example, say you wanted to insert 2 inches of space before the
-start of
-<a href="definitions.html#TERMS_RUNNING">running text</a>
-on a page other than the first.  You'd accomplish it with
-
-<pre>
-    .NEWPAGE
-    .ADD_SPACE 2i
-</pre>
-
-which would terminate your current page, break to a new page,
-print the header (assuming headers are on) and insert 2 inches of
-space before the start of running text.
-</p>
-
-<p>
-Since adding space in this way is almost sure to disrupt
-<strong>mom</strong>'s ability to guarantee perfectly flush bottom
-margins, I highly recommend using the
-<a href="docprocessing.html#SHIM">SHIM</a>
-macro immediately after <strong>ADD_SPACE</strong>.
-</p>
-
-<hr/>
-
-<p>
-<a href="docelement.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="docprocessing.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
-
-</body>
-</html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
diff -ruN groff-1.20.1/contrib/mom/momdoc/typesetting.html groff-1.21/contrib/mom/momdoc/typesetting.html
--- groff-1.20.1/contrib/mom/momdoc/typesetting.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/typesetting.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,1013 +16,955 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom -- Typesetting Macros</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Mom -- Typesetting Macros</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
-
-<!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<body style="background-color: #f5faff;">
 
-<p>
-<a href="goodies.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="definitions.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- ==================================================================== -->
 
-<a name="MACROS_TYPESETTING"><h1 align="center"><u>The typesetting macros</u></h1></a>
+<div id="top" class="page">
 
-<ul>
-    <li><a href="#INTRO_MACROS_TYPESETTING"><strong>Introduction to the typesetting macros</strong></a></li>
+<!-- Navigation links -->
+<table style="width: 100%;">
+<tr>
+  <td><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="text-align: right;"><a href="goodies.html#top">Next: Goodies</a></td>
+</tr>
+</table>
+
+<h1 id="typesetting" class="docs">The typesetting macros</h1>
+
+<div id="typesetting-macros-mini-toc" class="mini-toc">
+<div class="mini-toc-col-1">
+<ul class="no-enumerator">
+  <li class="list-head"><a href="#typesetting-macros">Introduction</a></li>
+  <li class="list-head"><a href="#page-setup-intro">Paper and page setup</a>
+  <ul>
+    <li class="item"><a href="#page-setup-note"><i>Important note on page dimensions &amp; papersize</i></a></li>
+    <li class="item"><a href="#index-page-setup">Macro list</a></li>
+  </ul></li>
+  <li class="list-head"><a href="#basic-params-intro">Basic typesetting parameters</a>
+  <ul>
+    <li class="item"><a href="#index-basic">Macro list</a></li>
+  </ul></li>
+  <li class="list-head"><a href="#justification-intro">Justification and quadding/
     <br/>
-
-    <li><strong>PAGE SETUP</strong></li>
-    <ul>
-        <li><a href="#INTRO_SETUP">Introduction to Page Setup</a></li>
-        <li><a href="#INDEX_SETUP">List of macros</a></li>
-    </ul>
-    <li><strong>BASIC TYPESETTING PARAMETERS</strong></li>
-    <ul>
-        <li><a href="#INTRO_BASIC_PARAMS">Introduction to Basic Parameters</a></li>
-        <li><a href="#INDEX_BASIC">List of macros</a></li>
-    </ul>
-    <li><strong>JUSTIFYING, QUADDING, FILLING, BREAKING and JOINING LINES</strong></li>
-    <ul>
-        <li><a href="#JUST_QUAD_FILL">Introduction to justify, quad, fill, break</a></li>
-        <li><a href="#INDEX_JUST">List of macros</a></li>
-    </ul>
-    <li><strong>TYPOGRAPHIC REFINEMENTS</strong></li>
-    <ul>
-        <li><a href="#INTRO_REFINEMENTS">Introduction to typographic refinements</a></li>
-        <li><a href="#INDEX_REFINEMENTS">List of macros</a></li>
-    </ul>
-    <li><strong>TYPE MODIFICATIONS &mdash; pseudo italic, bold, condense, extend</strong></li>
-    <ul>
-        <li><a href="#MODIFICATIONS">Introduction to type modifications</a></li>
-        <li><a href="#INDEX_MODIFICATIONS">List of macros</a></li>
-    </ul>
-    <li><strong>VERTICAL MOVEMENTS</strong></li>
-    <ul>
-        <li><a href="#ALDRLD">Introduction to vertical movements</a></li>
-        <li><a href="#INDEX_ALDRLD">List of macros</a></li>
-    </ul>
-    <li><strong>TABS</strong></li>
-    <ul>
-        <li><a href="#TABS">Introduction to tabs</a></li>
-        <li><a href="#TYPESETTING_TABS">Typesetting tabs</a></li>
-        <ul>
-            <li><a href="#TYPESETTING_TABS_TUT">Quickie tutorial</a></li>
-        </ul>
-        <li><a href="#STRING_TABS">String tabs</a></li>
-        <ul>
-            <li><a href="#STRING_TABS_TUT">Quickie tutorial</a></li>
-        </ul>
-        <li><a href="#INDEX_TABS">List of macros</a></li>
-    </ul>
-    <li><strong>MULTI-COLUMNS</strong></li>
-    <ul>
-        <li><a href="#MULTI_COLUMNS">Introduction to multi-columns</a></li>
-        <li><a href="#INDEX_MULTI_COLUMNS">List of macros</a></li>
-    </ul>
-    <li><strong>INDENTS</strong></li>
-    <ul>
-        <li><a href="#INDENTS">Introduction to indents</a></li>
-        <li><a href="#INDEX_INDENTS">List of macros</a></li>
-    </ul>
-    <li><strong>GOODIES</strong></li>
-    <ul>
-        <li><a href="goodies.html#GOODIES">Introduction to goodies</a></li>
-        <li><a href="goodies.html#INDEX_GOODIES">List of macros</a></li>
-    </ul>
-    <li><strong>INLINE ESCAPES</strong></li>
-    <ul>
-        <li><a href="inlines.html#INTRO_INLINE_ESCAPES">Introduction to inline escapes</a></li>
-        <li><a href="inlines.html#INDEX_INLINES">List of inline escapes</a></li>
-    </ul>
-    <li><strong>COLOURED TEXT</strong></li>
-    <ul>
-        <li><a href="color.html#INTRO_COLOR">Introduction to coloured text</a></li>
-        <li><a href="color.html#MACROS_COLOR">Macro list</a></li>
-    </ul>
+    <span style="margin-left: 1em;">breaking and joining lines</span></a>
+  <ul>
+    <li class="item"><a href="#index-justification">Macro list</a></li>
+  </ul></li>
+  <li class="list-head"><a href="#refinements-intro">Typographic refinements</a>
+  <ul>
+    <li class="item"><a href="#index-refinements">Macro list</a></li>
+  </ul></li>
+  <li class="list-head"><a href="#modifications-intro">Type modifications (pseudo font styles)</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="#index-modifications">Macro list</a></li>
+  </ul></li>
+  <li class="list-head"><a href="#aldrld-intro">Vertical movements</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="#index-aldrld">Macro list</a>
+    </li>
+  </ul></li>
 </ul>
+</div>
+<div class="mini-toc-col-2">
+  <ul class="no-enumerator">
+  <li class="list-head"><a href="#tabs-intro">Tabs</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="#typesetting-tabs">Typesetting tabs</a>
+    <ul style="margin-left: -.5em;">
+      <li class="item" style="margin-left: -.5em; list-style-type: circle;"><a href="#typesetting-tabs-tut">Quickie tutorial on typesetting tabs</a></li>
+    </ul></li>
+    <li class="item"><a href="#string-tabs">String tabs</a>
+    <ul style="margin-left: -.5em;">
+      <li class="item" style="margin-left: -.5em; list-style-type: circle;"><a href="#string-tabs-tut">Quickie tutorial on string tabs</a></li>
+    </ul></li>
+    <li class="item"><a href="#index-tabs">Macro list</a></li>
+  </ul></li>
+  <li class="list-head"><a href="#multicolumns-intro">Multiple columns</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="#index-multicolumns">Macro list</a>
+    </li>
+  </ul></li>
+  <li class="list-head"><a href="#indents-intro">Indents</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="#indents-handling">How mom handles indents</a></li>
+    <li class="item"><a href="#index-indents">Macro list</a>
+    </li>
+  </ul></li>
+  <li class="list-head"><a href="goodies.html#goodies">Goodies</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="goodies.html#goodies-macros">Macro list</a>
+    </li>
+  </ul></li>
+  <li class="list-head"><a href="inlines.html#top">Inline escapes</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="inlines.html#index-inlines">List of inline escapes</a>
+    </li>
+  </ul></li>
+  <li class="list-head"><a href="color.html#colored-text-intro">Coloured text</a>
+  <ul class="no-enumerator">
+    <li class="item"><a href="color.html#colored-text-macros">Macro list</a></li>
+  </ul></li>
+</ul>
+</div>
+</div>
 
-<hr/>
+<div class="rule-medium"><hr/></div>
 
-<h2><a name="INTRO_MACROS_TYPESETTING"><u>Introduction to the typesetting macros</u></a></h2>
+<h2 id="typesetting-intro" class="docs">Introduction</h2>
 
 <p>
-<strong>Mom</strong>'s typesetting macros provide access to groff's
+Mom&#8217;s typesetting macros provide access to groff&#8217;s
 typesetting capabilities.  Aside from controlling basic type
 parameters (family, font, line length, point size, leading),
-<strong>mom</strong>'s macros fine-tune wordspacing, letterspacing,
-kerning, hyphenation, and so on.  In addition, <strong>mom</strong>
-has true typesetting tabs, string tabs, multiple indent styles, line
-padding, and a batch of other goodies.
+mom&#8217;s macros fine-tune wordspacing, letterspacing, kerning,
+hyphenation, and so on.  In addition, mom has true typesetting tabs,
+string tabs, multiple indent styles, line padding, and a batch of
+other goodies.
 </p>
 
 <p>
-In some cases, <strong>mom</strong>'s typesetting macros merely
-imitate groff primitives.  In others, they approach typesetting
-concerns in conceptually new ways (for groff, at least).  This
-should present no problem for newcomers to groff who are learning
-<strong>mom</strong>.  Old groff hands should be careful.  Just
-because it looks like a duck and walks like a duck does not, in this
-instance, mean that it is a duck.  When using <strong>mom</strong>,
-stay away from groff primitives if <strong>mom</strong> provides a
-macro that accomplishes the same thing.
+In some cases, mom&#8217;s typesetting macros merely imitate groff
+primitives.  In others, they approach typesetting concerns in
+conceptually new ways (for groff, at least).  This should present
+no problem for newcomers to groff who are learning mom.  Old groff
+hands should be careful.  Just because it looks like a duck and
+walks like a duck does not, in this instance, mean that it is a
+duck.  When using mom, stay away from groff primitives if mom
+provides a macro that accomplishes the same thing.
 </p>
 
 <p>
-<strong>Mom</strong>'s typesetting macros can be used as a
-standalone package, independent of the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+Mom&#8217;s typesetting macros can be used as a standalone package,
+independent of the
+<a href="docprocessing.html#top">document processing macros</a>.
 With them, you can typeset on-the-fly.  Book covers, your best
-friend's résumé, a poster for a lost dog &mdash; none of these requires
-structured document processing (page headers, paragraphs, heads,
-footnotes, etc).  What they do demand is precise control over every
-element on the page.  The typesetting macros give you that control.
+friend&#8217;s résumé, a poster for a lost dog&mdash;none of these
+requires structured document processing (page headers, paragraphs,
+heads, footnotes, etc).  What they do demand is precise control over
+every element on the page.  The typesetting macros give you that
+control.
 </p>
 
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="INTRO_SETUP"></a>
-
-<a name="PAGE_MARGINS"><h2><u>Page setup: paper size and page margins</u></h2></a>
+<h2 id="page-setup-intro" class="macro-group">Paper and page setup: paper size &amp; page margins</h2>
 
 <p>
 The page setup macros establish the physical dimensions of your page
-and the margins you want it to have. <strong>Groff</strong> has
-defaults for these, but I recommend setting them at the top of your
-files anyway unless you're using <strong>mom</strong>'s
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+and the margins you want it to have. Groff has defaults for these,
+but I recommend setting them at the top of your files anyway unless
+you&#8217;re using mom&#8217;s
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 and are content with her defaults.
 </p>
 
 <p>
 The
-<a href="#PAPER">PAPER</a>
+<a href="#paper">PAPER</a>
 macro provides a shortcut for setting the page to the correct
-dimensions for a number of well-known, established paper sizes.  The
-<a href="#PAGE">PAGE</a>
+dimensions for a number of common paper sizes.  The
+<a href="#page">PAGE</a>
 macro provides a convenient way of setting the page dimensions and
 some or all of the page margins with a single macro.
 </p>
 
-<a name="DIMENSIONS_NOTE"><h3><u>Important note on page dimensions and papersize</u></h3></a>
+<div class="box-notes">
+<h3 id="page-setup-note" class="docs notes">Important note on page dimensions and papersize</h3>
 
-<p>
-<strong>Mom</strong>'s macros for setting up the desired size of
-printer sheets (the &quot;papersize&quot;) tell <strong>mom</strong>
-and <strong>groff</strong> about the page dimensions, but not the
-driver responsible for generating the final PostScript file.  You
-<em><strong>must</strong></em> take care of this yourself.
+<p style="margin-top: .5em;">
+Mom&#8217;s macros for setting up the desired size of printer sheets
+tell mom and groff about the page dimensions, but not the driver
+responsible for generating the final PostScript file.  You must take
+care of this yourself.
 </p>
 
 <p>
 If you routinely print documents on the same size paper (you
 probably do), the easiest way to make sure the PostScript driver
 knows about your papersize is to edit the file
-
-<pre>
-    &lt;path to groff&gt;/font/devps/DESC
-</pre>
-
-In it, you will see a line that reads
-
-<pre>
-    papersize &lt;papersize&gt;
-</pre>
-
-Change <kbd>&lt;papersize&gt;</kbd> to either the name of your
-papersize (e.g. a4, letter, legal, etc.; a full list of valid named
-papersizes that can be used in DESC is found in
-<nobr><kbd>man papersize</kbd>).</nobr>  If your routine papersize is
-non-standard (i.e. doesn't have a &quot;name&quot;) you can give
-the dimensions for your papersize, separated by a comma.  The
-dimensions <em><strong>must</strong></em> have a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+<br/>
+<span class="pre-in-pp">
+  &lt;path to groff&gt;/font/devps/DESC
+</span>
+In it, you will see a line that reads:
+<span class="pre-in-pp">
+  papersize &lt;papersize&gt;
+</span>
+Change <kbd>&lt;papersize&gt;</kbd> to the name of your papersize
+(e.g. a4, letter, legal, etc.; a full list of valid named papersizes
+that can be used in DESC is found in <kbd>man papersize</kbd>).  If
+your routine papersize is non-standard (i.e. doesn&#8217;t have a
+&#8220;name&#8221;) you can give the dimensions for your papersize,
+separated by a comma.  The dimensions must have a
+<a href="definitions.html#unitofmeasure">unit of measure</a>
 appended.  Valid units of measure for papersize are
-inches <nobr>(<kbd>i</kbd>),</nobr>
-centimeters <nobr>(<kbd>c</kbd>),</nobr>
-picas <nobr>(<kbd>P</kbd>)</nobr> and
-points <nobr>(<kbd>p</kbd>).</nobr>
-</p>
-
-<p>
+inches (<kbd>i</kbd>),
+centimeters (<kbd>c</kbd>),
+picas (<kbd>P</kbd>) and
+points (<kbd>p</kbd>).
 For example, to set up a routine papersize of 8 inches by 10 inches,
 the line would look like this:
-
-<pre>
-    papersize 8i,10i
-</pre>
-</p>
-
-<p>
-Having set up your routine papersize, if you occasionally need
-to print on sheets that do not conform to its dimensions,
-you <em><strong>must</strong></em>, in addition to setting
-the page dimensions in your <strong>mom</strong> file,
-invoke <strong>groff</strong> on the command line with the
-<kbd>-P-p&lt;papersize&gt;</kbd> option.
+<br/>
+<span class="pre-in-pp">
+  papersize 8i,10i
+</span>
+Having set up your routine papersize, if you occasionally need to
+print on sheets that do not conform to its dimensions, you must, in
+addition to setting the page dimensions in your mom file, invoke
+groff on the command line with the <kbd>-P-p&lt;papersize&gt;</kbd>
+option.
 </p>
 
 <p>
-For example, suppose your routine papersize is &quot;letter&quot;,
-and you need to print something on a &quot;legal&quot;-sized sheet.
-After telling <strong>mom</strong> about the legal-size sheet (with
-either
-<a href="#PAGELENGTH">PAGELENGTH</a>
+For example, suppose your routine papersize is &#8220;letter&#8221;,
+and you need to print something on a legal-sized sheet.  After
+telling mom about the legal-size sheet (with either
+<a href="#pagelength">PAGELENGTH</a>
 and
-<a href="#PAGEWIDTH">PAGEWIDTH</a>,
+<a href="#pagewidth">PAGEWIDTH</a>
 or
-<a href="#PAPER">PAPER</a>,
+<a href="#paper">PAPER</a>,
 or
-<a href="#PAGE">PAGE</a>,
-in your <strong>mom</strong> file, when you invoke
-<strong>groff</strong> to process the file, the command would look
-like this:
-
-<pre>
-    groff -mom -P-plegal
-</pre>
-</p>
-
-<p>
-Consult <nobr><kbd>man groff</kbd></nobr>,
-<nobr><kbd>man grops</kbd></nobr> and
-<nobr><kbd>man groff_font</kbd></nobr> for additional information
-concerning papersizes, as well as information on printing in
-&quot;landscape&quot; orientation.
-</p>
-
-<a name="INDEX_SETUP"><h3><u>Page setup macros list</u></h3></a>
-
-<ul>
-    <li><a href="#PAGEWIDTH">PAGEWIDTH</a> (page width)</li>
-    <li><a href="#PAGELENGTH">PAGELENGTH</a> (page length)</li>
-    <li><a href="#PAPER">PAPER</a> (common paper sizes)</li>
-    <li><a href="#L_MARGIN">L_MARGIN</a> (left margin)</li>
-    <li><a href="#R_MARGIN">R_MARGIN</a> (right margin)</li>
-    <li><a href="#T_MARGIN">T_MARGIN</a> (top margin)</li>
-    <li><a href="#B_MARGIN">B_MARGIN</a> (bottom margin)</li>
-    <li><a href="#PAGE">PAGE</a> (page dimensions and margins all in one fell swoop)</li>
-    <li><a href="#NEWPAGE">NEWPAGE</a> (start a new page)</li>
+<a href="#page">PAGE</a>)
+in your mom file, when you invoke groff to process the file, the
+command would look like this:
+<br/>
+<span class="pre-in-pp">
+  groff -mom -P-plegal
+</span>
+</p>
+
+<p class="tip-bottom" style="margin-top: -1em;">
+Consult <kbd>man groff</kbd>, <kbd>man grops</kbd> and <kbd>man
+groff-font</kbd> for additional information concerning papersizes,
+as well as information on printing in &#8220;landscape&#8221;
+orientation.
+</p>
+</div>
+
+<div class="macro-list-container">
+<h3 id="index-page-setup" class="macro-list">Paper and page setup macros</h3>
+
+<ul class="macro-list">
+  <li><a href="#pagewidth">PAGEWIDTH</a> &ndash; page width</li>
+  <li><a href="#pagelength">PAGELENGTH</a> &ndash; page length</li>
+  <li><a href="#paper">PAPER</a> &ndash; common paper sizes</li>
+  <li><a href="#l-margin">L_MARGIN</a> &ndash; left margin</li>
+  <li><a href="#r-margin">R_MARGIN</a> &ndash; right margin</li>
+  <li><a href="#t-margin">T_MARGIN</a> &ndash; top margin</li>
+  <li><a href="#b-margin">B_MARGIN</a> &ndash; bottom margin</li>
+  <li><a href="#page">PAGE</a> &ndash; page dimensions and margins all in one fell swoop</li>
+  <li><a href="#newpage">NEWPAGE</a> &ndash; start a new page</li>
 </ul>
+</div>
 
 <!-- -PAGEWIDTH- -->
 
-<hr width="66%" align="left"/>
-
-<a name="PAGEWIDTH"><h3><u>Page width</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>PAGEWIDTH</strong> <kbd>&lt;width of printer sheet&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-The argument to <strong>PAGEWIDTH</strong> is the width of your
-printer sheet.  <strong>PAGEWIDTH</strong> requires a unit of measure.
-Decimal fractions are allowed.  Hence, to tell <strong>mom</strong>
-the width of your printer sheet is 8-1/2 inches, you enter
-
-<pre>
-    .PAGEWIDTH 8.5i
-</pre>
+<div class="macro-id-overline">
+<h3 id="pagewidth" class="macro-id">Page width</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>PAGEWIDTH</b> <kbd class="macro-args">&lt;width of printer sheet&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
+The argument to PAGEWIDTH is the width of your printer sheet.
+PAGEWIDTH requires a unit of measure.  Decimal fractions are
+allowed.  Hence, to tell mom that the width of your printer sheet is
+8-1/2 inches, you enter
+<br/>
+<span class="pre-in-pp">
+  .PAGEWIDTH 8.5i
+</span>
 Please read the
-<a href="#DIMENSIONS_NOTE">Important note on page dimensions and papersize</a>
-for information on ensuring <strong>groff</strong> respects your
-<strong>PAGEWIDTH</strong>.
+<a href="#page-setup-note">Important note on page dimensions and papersize</a>
+for information on ensuring groff respects your
+PAGEWIDTH.
 </p>
 
 <!-- -PAGELENGTH- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAGELENGTH"><h3><u>Page length</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>PAGELENGTH</strong> <kbd>&lt;length of printer sheet&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-<strong>PAGELENGTH</strong> tells <strong>mom</strong> how long your
-printer sheet is.  It works just like
-<strong>PAGEWIDTH</strong>.  Therefore, to tell
-<strong>mom</strong> your printer sheet is 11 inches long, you
-enter
+<div class="macro-id-overline">
+<h3 id="pagelength" class="macro-id">Page length</h3>
+</div>
 
-<pre>
-    .PAGELENGTH 11i
-</pre>
+<div class="box-macro-args">
+Macro: <b>PAGELENGTH</b> <kbd class="macro-args">&lt;length of printer sheet&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
+PAGELENGTH tells mom how long your printer sheet is.  It works just
+like PAGEWIDTH.  Therefore, to tell mom your printer sheet is 11
+inches long, you enter
+<br/>
+<span class="pre-in-pp">
+  .PAGELENGTH 11i
+</span>
 Please read the
-<a href="#DIMENSIONS_NOTE">Important note on page dimensions and papersize</a>
-for information on ensuring <strong>groff</strong> respects your
-<strong>PAGELENGTH</strong>.
+<a href="#page-setup-note">Important note on page dimensions and papersize</a>
+for information on ensuring groff respects your PAGELENGTH.
 </p>
 
 <!-- -PAPER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAPER"><h3><u>Paper</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>PAPER</strong> <kbd>&lt;paper type&gt;</kbd></nobr>
-</p>
-
-<p>
-<strong>PAPER</strong> provides a convenient way to set the page
-dimensions for some common printer sheet sizes.  <nobr>&lt;paper
-type&gt; can be one of:</nobr>
-
-<pre>
-    LETTER
-    LEGAL
-    STATEMENT
-    TABLOID
-    LEDGER
-    FOLIO
-    QUARTO
-    10x14
-    EXECUTIVE
-    A3
-    A4
-    A5
-    B4
-    B5 
-</pre>
-</p>
-
-<p>
-Say, for example, you have A4-sized sheets in your printer.  It's
+<div class="macro-id-overline">
+<h3 id="paper" class="macro-id">Paper</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>PAPER</b> <kbd class="macro-args">&lt;paper type&gt;</kbd>
+</div>
+
+<p>
+PAPER provides a convenient way to set the page dimensions for some
+common printer sheet sizes. <kbd>&lt;paper&nbsp;type&gt;</kbd> can
+be one of:
+<br/>
+<span class="pre-in-pp">
+  LETTER       EXECUTIVE
+  LEGAL        10x14
+  STATEMENT    A3
+  TABLOID      A4
+  LEDGER       A5
+  FOLIO        B4 
+  QUARTO       B5
+</span>
+Say, for example, you have A4-sized sheets in your printer.  It&#8217;s
 shorter (and easier) to enter
-
-<pre>
-    .PAPER A4
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .PAPER A4
+</span>
 than to remember the correct dimensions and enter
-
-<pre>
-    .PAGEWIDTH  595p
-    .PAGELENGTH 842p
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .PAGEWIDTH  595p
+  .PAGELENGTH 842p
+</span>
 Please read the
-<a href="#DIMENSIONS_NOTE">Important note on page dimensions and papersize</a>
-for information on ensuring <strong>groff</strong> respects your
-<strong>PAPER</strong> size.
+<a href="#page-setup-note">Important note on page dimensions and papersize</a>
+for information on ensuring groff respects your PAPER size.
 </p>
 
 <!-- -L_MARGIN- -->
 
-<hr width="33%" align="left"/>
-
-<a name="L_MARGIN"><h3><u>Left margin</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>L_MARGIN</strong> <kbd>&lt;left margin&gt;</kbd></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="l-margin" class="macro-id">Left margin</h3>
+</div>
 
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>L_MARGIN</b> <kbd class="macro-args">&lt;left margin&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>L_MARGIN</strong> establishes the distance from the left edge
-of the printer sheet at which you want your type to start.  It may
-be used any time, and remains in effect until you enter a new value.
+L_MARGIN establishes the distance from the left edge of the printer
+sheet at which you want your type to start.  It may be used any
+time, and remains in effect until you enter a new value.
 </p>
 
 <p>
-<a href="#IL">Left indents</a>
+<a href="#il">Left indents</a>
 and
-<a href="#TABS">tabs</a>
-are calculated from the value you pass to <strong>L_MARGIN</strong>,
-hence it's always a good idea to invoke it before starting any
-serious typesetting.  A unit of measure is required.  Decimal
-fractions are allowed.  Therefore, to set the left margin at 3 picas
-(1/2 inch), you'd enter either
-
-<pre>
-    .L_MARGIN 3P
-    &nbsp;&nbsp;or
-    .L_MARGIN .5i
-</pre>
-</p>
-
-<p>
+<a href="#tabs">tabs</a>
+are calculated from the value you pass to L_MARGIN, hence it&#8217;s
+always a good idea to invoke it before starting any serious
+typesetting.  A unit of measure is required.  Decimal fractions are
+allowed.  Therefore, to set the left margin at 3 picas (1/2 inch),
+you&#8217;d enter either
+<br/>
+<span class="pre-in-pp">
+  .L_MARGIN 3P
+</span>
+or
+<span class="pre-in-pp">
+  .L_MARGIN .5i
+</span>
 If you use the macros
-<a href="#PAGE">PAGE</a>,
-<a href="#PAGEWIDTH">PAGEWIDTH</a>
+<a href="#page">PAGE</a>,
+<a href="#pagewidth">PAGEWIDTH</a>
 or
-<a href="#PAPER">PAPER</a>
-without invoking <strong>L_MARGIN</strong> (either before
-or afterwards), <strong>mom</strong> automatically sets
-<strong>L_MARGIN</strong> to 1 inch.
+<a href="#paper">PAPER</a>
+without invoking L_MARGIN (either before or afterwards), mom
+automatically sets L_MARGIN to 1 inch.
 </p>
 
-<p>
-<strong>NOTE: L_MARGIN</strong> behaves in a special way when you're
-using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> L_MARGIN behaves in a special way
+when you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>.
 See
-<a href="typemacdoc.html#TYPESETTING">Typesetting Macros in Document Processing</a>
+<a href="docprocessing.html#behaviour">Typesetting macros during document processing</a>
 for an explanation.
 </p>
+</div>
 
 <!-- -R_MARGIN- -->
 
-<hr width="33%" align="left"/>
-
-<a name="R_MARGIN"><h3><u>Right margin</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>R_MARGIN</strong> <kbd>&lt;right margin&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-<strong>R_MARGIN</strong> establishes the amount of space you
-want between the end of typeset lines and the right hand edge
-of the printer sheet.  In other words, it sets the line length.
-<strong>R_MARGIN</strong> requires a unit of measure.  Decimal
-fractions are allowed.
+<div class="macro-id-overline">
+<h3 id="r-margin" class="macro-id">Right margin</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>R_MARGIN</b> <kbd class="macro-args">&lt;right margin&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> R_MARGIN, if used, must
+come after
+<a href="#paper">PAPER</a>,
+<a href="#pagewidth">PAGEWIDTH</a>,
+<a href="#l-margin">L_MARGIN</a>
+and/or
+<a href="#page">PAGE</a>
+(if a right margin isn&#8217;t given to PAGE).  The reason is that
+R_MARGIN calculates line length from the overall page dimensions and
+the left margin.  Obviously, it can&#8217;t make the calculation if
+it doesn&#8217;t know the page width and the left margin.
 </p>
+</div>
 
 <p>
-The
-<a href="#LINELENGTH">line length macro</a>,
-(<strong>LL</strong>), can be used in place of
-<strong>R_MARGIN</strong>.  In either case, the last one invoked
-sets the line length.  The choice of which to use is up to you.  In
-some instances, you may find it easier to think of a section of type
-as having a right margin.  In others, giving a line length may make
-more sense.
+R_MARGIN establishes the amount of space you want between the end
+of typeset lines and the right hand edge of the printer sheet.  In
+other words, it sets the line length.  R_MARGIN requires a unit of
+measure.  Decimal fractions are allowed.
 </p>
 
 <p>
-For example, if you're setting a page of type you know should have
-6-pica margins left and right, it makes sense to enter a left and
-right margin, like this:
-
-<pre>
-    .L_MARGIN 6P
-    .R_MARGIN 6P
-</pre>
-
-That way, you don't have to worry about calculating the line
-length.  On the other hand, if you know the line length for a
-patch of type should be 17 picas and 3 points, entering the line
-length with <strong>LL</strong> is much easier than calculating the
-right margin, e.g.
-
-<pre>
-    .LL 17P+3p
-</pre>
+The line length macro
+(<a href="#linelength">LL</a>)
+can be used in place of R_MARGIN.  In either case, the last one
+invoked sets the line length.  The choice of which to use is up
+to you.  In some instances, you may find it easier to think of a
+section of type as having a right margin.  In others, giving a line
+length may make more sense.
 </p>
 
 <p>
+For example, if you&#8217;re setting a page of type you know should
+have 6-pica margins left and right, it makes sense to enter a left
+and right margin, like this:
+<br/>
+<span class="pre-in-pp">
+  .L_MARGIN 6P
+  .R_MARGIN 6P
+</span>
+That way, you don&#8217;t have to worry about calculating the line
+length.  On the other hand, if you know the line length for a patch
+of type should be 17 picas and 3 points, entering the line length
+with LL is much easier than calculating the right margin, e.g.
+<br/>
+<span class="pre-in-pp">
+  .LL 17P+3p
+</span>
 If you use the macros
-<a href="#PAGE">PAGE</a>,
-<a href="#PAGEWIDTH">PAGEWIDTH</a>
+<a href="#page">PAGE</a>,
+<a href="#pagewidth">PAGEWIDTH</a>
 or
-<a href="#PAPER">PAPER</a>
-without invoking <kbd>.R_MARGIN</kbd> afterwards,
-<strong>mom</strong> automatically sets <strong>R_MARGIN</strong> to
-1 inch.  If you set a line length after these macros (with
-<a href="#LINELENGTH">LL</a>),
-the line length calculated by <strong>R_MARGIN</strong> is, of course,
-overridden.
+<a href="#paper">PAPER</a>
+without invoking <kbd>.R_MARGIN</kbd> afterwards, mom automatically
+sets R_MARGIN to 1 inch.  If you set a line length after these
+macros (with
+<a href="#linelength">LL</a>),
+the line length calculated by R_MARGIN is, of course, overridden.
 </p>
 
-<p>
-<strong>IMPORTANT: R_MARGIN</strong>, if used, MUST come after
-<a href="#PAPER">PAPER</a>,
-<a href="#PAGEWIDTH">PAGEWIDTH</a>,
-<a href="#L_MARGIN">L_MARGIN</a>
-and/or
-<a href="#PAGE">PAGE</a>
-(if a right margin isn't given to <strong>PAGE</strong>).  The
-reason is that <strong>R_MARGIN</strong> calculates line length from
-the overall page dimensions and the left margin.  Obviously, it
-can't make the calculation if it doesn't know the page width and the
-left margin.
-</p>
-
-<p>
-<strong>NOTE: R_MARGIN</strong> behaves in a special way when you're
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> R_MARGIN behaves in a special way when you&#8217;re
 using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+<a href="docprocessing.html#docprocessing">document processing macros</a>.
 See
-<a href="typemacdoc.html#TYPESETTING">Typesetting Macros in Document Processing</a>
+<a href="docprocessing.html#behaviour">Typesetting macros during document processing</a>
 for an explanation.
 </p>
+</div>
 
 <!-- -T_MARGIN- -->
 
-<hr width="33%" align="left"/>
-
-<a name="T_MARGIN"><h3><u>Top margin</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>T_MARGIN</strong> <kbd>&lt;top margin&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-<strong>T_MARGIN</strong> establishes the distance from the top of
-the printer sheet at which you want your type to start.  It requires
-a unit of measure, and decimal fractions are allowed.  To set a top
-margin of 2-1/2 centimetres, you'd enter
-
-<pre>
-    .T_MARGIN 2.5c
-</pre>
-</p>
-
-<p>
-<strong>T_MARGIN</strong> calculates the vertical position of the
-first line of type on a page by treating the top edge of the printer
-sheet as a <a href="definitions.html#TERMS_BASELINE">baseline</a>.  Therefore,
-
-<pre>
-    .T_MARGIN 1.5i
-</pre>
-
-puts the baseline of the first line of type 1-1/2 inches beneath
-the top of the page.
-</p>
-
-<p>
-<strong>IMPORTANT:</strong> <strong>T_MARGIN</strong> does two
-things: it establishes the top margin for pages that come after
-it AND it moves to that position on the current page.  Therefore,
-<strong>T_MARGIN</strong> should only be used at the top of a file
-(prior to entering text) or after
-<a href="#NEWPAGE">NEWPAGE</a>,
-like this:
-
-<pre>
-    .NEWPAGE
-    .T_MARGIN 6P
-    &lt;text&gt;
-</pre>
+<div class="macro-id-overline">
+<h3 id="t-margin" class="macro-id">Top margin</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>T_MARGIN</b> <kbd class="macro-args">&lt;top margin&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>NOTE:</strong> <strong>T_MARGIN</strong> means something
-slightly different when you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+T_MARGIN establishes the distance from the top of the printer
+sheet at which you want your type to start.  It requires a unit of
+measure, and decimal fractions are allowed.  To set a top margin of
+2-1/2 centimetres, you&#8217;d enter
+<br/>
+<span class="pre-in-pp">
+   .T_MARGIN 2.5c
+</span>
+T_MARGIN calculates the vertical position of the first line of type
+on a page by treating the top edge of the printer sheet as a
+<a href="definitions.html#baseline">baseline</a>.  Therefore,
+<br/>
+<span class="pre-in-pp">
+  .T_MARGIN 1.5i
+</span>
+puts the baseline of the first line of type 1-1/2 inches beneath the
+top of the page.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> T_MARGIN means something slightly
+different when you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>.
 See
-<a href="typemacdoc.html#TB_MARGINS">Top and bottom margins in document processing</a>
+<a href="docprocessing.html#tb-margins">Top and bottom margins in document processing</a>
 for an explanation.
 </p>
+</div>
 
-<!-- -B_MARGIN- -->
-
-<hr width="33%" align="left"/>
-
-<a name="B_MARGIN"><h3><u>Bottom margin</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>B_MARGIN</strong> <kbd>&lt;bottom margin&gt;</kbd></nobr>
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> T_MARGIN does two
+things: it establishes the top margin for pages that come after
+it <i>and</i> it moves to that position on the current page.
+Therefore, T_MARGIN should only be used at the top of a file (prior
+to entering text) or after
+<a href="#newpage">NEWPAGE</a>,
+like this:
 <br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .NEWPAGE
+  .T_MARGIN 6P
+  &lt;text&gt;
+</span>
 </p>
+</div>
 
-<p>
-<strong>B_MARGIN</strong> sets a nominal position at the bottom
-of the page beyond which you don't want your type to go.  When the
-bottom margin is reached, <strong>mom</strong> starts a new page.
-<strong>B_MARGIN</strong> requires a unit of measure.  Decimal
-fractions are allowed.  To set a nominal bottom margin of 3/4 inch,
-enter
+<!-- -B_MARGIN- -->
 
-<pre>
-    .B_MARGIN .75i
-</pre>
+<div class="macro-id-overline">
+<h3 id="b-margin" class="macro-id">Bottom margin</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>B_MARGIN</b> <kbd class="macro-args">&lt;bottom margin&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-Obviously, if you haven't spaced the type on your pages so that
-the last lines fall perfectly at the bottom margin, the margin will
-vary from page to page.  Usually, but not always, the last line of
-type that fits on a page <em>before</em> the bottom margin causes
-<strong>mom</strong> to start a new page.
+B_MARGIN sets a nominal position at the bottom of the page beyond
+which you don&#8217;t want your type to go.  When the bottom margin
+is reached, mom starts a new page.  B_MARGIN requires a unit of
+measure.  Decimal fractions are allowed.  To set a nominal bottom
+margin of 3/4 inch, enter
+<br/>
+<span class="pre-in-pp">
+  .B_MARGIN .75i
+</span>
+Obviously, if you haven&#8217;t spaced the type on your pages so
+that the last lines fall perfectly at the bottom margin, the margin
+will vary from page to page.  Usually, but not always, the last line
+of type that fits on a page before the bottom margin causes mom to
+start a new page.
 </p>
 
 <p>
-Occasionally, owing to a peculiarity in <strong>groff</strong>,
-an extra line will fall below the nominal bottom margin.  If you're
-using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>,
+Occasionally, owing to a peculiarity in groff, an extra line will
+fall below the nominal bottom margin.  If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>,
 this is unlikely to happen; the document processing macros are very
 hard-nosed about aligning bottom margins.
 </p>
 
-<p>
-<strong>NOTE:</strong> The meaning of <strong>B_MARGIN</strong> is
-slightly different when you're using the document processing macros.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> The meaning of B_MARGIN is slightly
+different when you&#8217;re using the document processing macros.
 See
-<a href="typemacdoc.html#TB_MARGINS">Top and bottom margins in document processing</a>
+<a href="docprocessing.html#tb-margins">Top and bottom margins in document processing</a>
 for an explanation.
 </p>
+</div>
 
 <!-- -PAGE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PAGE"><h3><u>Page</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>PAGE</strong> <kbd>&lt;width&gt;&nbsp;[ &lt;length&gt; [ &lt;lm&gt; [ &lt;rm&gt; [ &lt;tm&gt; [ &lt;bm&gt; ] ] ] ] ]</kbd></nobr>
-<br/>
-
-<em>*All arguments require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-<strong>PAGE</strong> lets you establish paper dimensions
-and page margins with a single macro.  The only required
-argument is page width.  The rest are optional, <strong>but
-they must appear in order and you can't skip over any.</strong>
-<nobr><kbd>&lt;lm&gt;, &lt;rm&gt;, &lt;tm&gt;</kbd></nobr> and
-<nobr><kbd>&lt;bm&gt;</kbd></nobr> refer to the left, right, top and
-bottom margins respectively.
-</p>
-
-<p>
-Assuming your page dimensions are 11 inches by 17 inches, and that's
-all you want to set, enter
-
-<pre>
-    .PAGE 11i 17i
-</pre>
+<div class="macro-id-overline">
+<h3 id="page" class="macro-id">Page</h3>
+</div>
+
+<div class="box-macro-args" style="overflow: auto;">
+Macro: <b>PAGE</b> <kbd class="macro-args">&lt;width&gt;&nbsp;[ &lt;length&gt; [ &lt;lm&gt; [ &lt;rm&gt; [ &lt;tm&gt; [ &lt;bm&gt; ] ] ] ] ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;All arguments require a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>,
+PAGE must come after
+<a href="docprocessing.html#start">START</a>.
+Otherwise, it should go at the top of a document, prior to any
+text.  And remember, when you&#8217;re using the document processing
+macros, top margin and bottom margin mean something slightly
+different than when you&#8217;re using just the typesetting macros
+(see
+<a href="docprocessing.html#tb-margins">Top and bottom margins in document processing</a>).
 </p>
+</div>
 
 <p>
-If you want to set the left margin as well, say, at 1 inch,
-<strong>PAGE</strong> would look like this:
-
-<pre>
-    .PAGE 11i 17i 1i
-</pre>
+PAGE lets you establish paper dimensions and page margins with a
+single macro.  The only required argument is page width.  The rest
+are optional, but they must appear in order and you can&#8217;t
+skip over any. <kbd>&lt;lm&gt;, &lt;rm&gt;, &lt;tm&gt;</kbd> and
+<kbd>&lt;bm&gt;</kbd> refer to the left, right, top and bottom
+margins respectively.
 </p>
 
 <p>
+Assuming your page dimensions are 11 inches by 17 inches, and
+that&#8217;s all you want to set, enter
+<br/>
+<span class="pre-in-pp">
+  .PAGE 11i 17i
+</span>
+If you want to set the left margin as well, say, at 1 inch, PAGE
+would look like this:
+<br/>
+<span class="pre-in-pp">
+  .PAGE 11i 17i 1i
+</span>
 Now suppose you also want to set the top margin, say, at 1-1/2
-inches. <nobr>&lt;tm&gt;</nobr> comes after <nobr>&lt;rm&gt;</nobr>
-in the optional arguments, but you can't skip over any arguments,
-therefore to set the top margin, you must also give a right margin.
-The <strong>PAGE</strong> macro would look like this:
-
-<pre>
-    .PAGE 11i 17i 1i 1i 1.5i
-                     |   |
-    required right___|   |___top margin
-            margin
-</pre>
-</p>
-
-<p>
-Clearly, <strong>PAGE</strong> is best used when you want a
-convenient way to tell <strong>mom</strong> just the dimensions of
-your printer sheet (width and length), or when you want to tell her
-everything about the page (dimensions and all the margins), for
-example
-</p>
-
-<pre>
-    .PAGE 8.5i 11i 45p 45p 45p 45p
-</pre>
-
-<p>
+inches. &lt;tm&gt; comes after &lt;rm&gt; in the optional arguments,
+but you can&#8217;t skip over any arguments, therefore to set the
+top margin, you must also give a right margin.  The PAGE macro would
+look like this:
+<br/>
+<span class="pre-in-pp">
+  .PAGE 11i 17i 1i 1i 1.5i
+                   |   |
+  required right---+   +---top margin
+      margin
+</span>
+Clearly, PAGE is best used when you want a convenient way to tell
+mom just the dimensions of your printer sheet (width and length), or
+when you want to tell her everything about the page (dimensions and
+all the margins), for example
+<br/>
+<span class="pre-in-pp">
+  .PAGE 8.5i 11i 45p 45p 45p 45p
+</span>
 This sets up an 8-1/2 by 11 inch page with margins of 45 points
 (5/8-inch) all around.
 </p>
 
 <p>
-<strong>NOTE:</strong> Only use <strong>PAGE</strong> at the start
-of a document, before entering any text.  And remember, when you're
-using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>,
-top margin and bottom margin mean something slightly different than
-when you're  using just the typesetting macros (see
-<a href="typemacdoc.html#TB_MARGINS">Top and bottom margins in document processing</a>).
-</p>
-
-<p>
 Additionally, if you invoke <kbd>.PAGE</kbd> with a top margin
 argument, any macros you invoke after <kbd>.PAGE</kbd> will almost
 certainly move the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+<a href="definitions.html#baseline">baseline</a>
 of the first line of text down by one linespace.  To compensate, do
-
-<pre>
-    .RLD 1v
-</pre>
-
-immediately before entering any text, or, if it's feasible, make
-<strong>PAGE</strong> the last macro you invoke prior to entering text.
+<br/>
+<span class="pre-in-pp">
+  .RLD 1v
+</span>
+immediately before entering any text, or, if it&#8217;s feasible,
+make PAGE the last macro you invoke prior to entering text.
 </p>
 
 <p>
 Please read the
-<a href="#DIMENSIONS_NOTE">Important note on page dimensions and papersize</a>
-for information on ensuring <strong>groff</strong> respects your
-<strong>PAGE</strong> dimensions and margins.
+<a href="#page-setup-note">Important note on page dimensions and papersize</a>
+for information on ensuring groff respects your PAGE dimensions and
+margins.
 </p>
 
 <!-- -NEWPAGE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="NEWPAGE"><h3><u>Start a new page</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>NEWPAGE</strong></nobr>
+<div class="macro-id-overline">
+<h3 id="newpage" class="macro-id">Start a new page</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>NEWPAGE</b>
+</div>
+
+<p>
+Whenever you want to start a new page, use NEWPAGE, by itself with
+no argument. Mom will finish up processing the current page and move
+you to the top of a new one (subject to the top margin set with
+<a href="#t-margin">T_MARGIN</a>).
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span>
+Prior to version 1.1.9, NEWPAGE was simply an alias of
+<kbd>.bp</kbd>.  As of 1.1.9, NEWPAGE, is its own mom macro.  While
+the new macro should be backwardly compatible with documents created
+using pre-1.1.9 moms, I suggest that from this version onward, if
+you were in the habit of using <kbd>.bp</kbd> whenever you wanted to
+break to a new page, you now begin to use NEWPAGE instead.
 </p>
+</div>
 
-<p>
-Whenever you want to start a new page, use <strong>NEWPAGE</strong>,
-by itself with no argument. <strong>Mom</strong> will finish up
-processing the current page and move you to the top of a new one
-(subject to the top margin set with
-<a href="#T_MARGIN">T_MARGIN</a>.
-</p>
-
-<p>
-<strong>Experts:</strong> Prior to version 1.1.9,
-<strong>NEWPAGE</strong> was simply an alias of <kbd>.bp</kbd>.  As
-of 1.1.9, <strong>NEWPAGE</strong>, is its own <strong>mom</strong>
-macro.  While the new macro should be backwardly compatible with
-documents created using pre-1.1.9 <strong>mom</strong>s, I suggest
-that from this version onward, if you were in the habit of using
-<kbd>.bp</kbd> whenever you wanted to break to a new page, you now
-begin to use <strong>NEWPAGE</strong> instead.
-</p>
-
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="INTRO_BASIC_PARAMS"></a>
-
-<a name="BASIC_PARAMS"><h2><u>Basic typesetting parameters</u></h2></a>
+<h2 id="basic-params-intro" class="macro-group">Basic typesetting parameters</h2>
 
 <p>
-Basic parameter macros deal with the fundamental requirements
-for setting type: family, font, point size, leading and line length.
+The basic typesetting parameter macros deal with fundamental
+requirements for setting type: family, font, point size, leading and
+line length.
 </p>
 
 <p>
-If you're using the typesetting macros only, the arguments passed to
-the basic parameter macros remain in effect until you change them.
-The document processing macros handle things differently.  See
-<a href="typemacdoc.html#TYPESETTING">Typesetting Macros in Document Processing</a>
+If you&#8217;re using the typesetting macros only, the arguments
+passed to the basic parameter macros remain in effect until
+you change them.  The document processing macros handle things
+differently.  See
+<a href="docprocessing.html#behaviour">Typesetting macros during document processing</a>
 for an explanation.
 </p>
 
-<a name="INDEX_BASIC"><h3><u>Basic parameter macros list</u></h3></a>
-
-<ul>
-    <li><a href="#FAMILY">FAMILY</a> (type family)</li>
-    <li><a href="#FONT">FONT</a> (font)</li>
-    <li><a href="#FALLBACK_FONT">FALLBACK_FONT</a> (for invalid fonts)</li>
-    <li><a href="#PS">PT_SIZE</a> (point size of type)</li>
-    <li><a href="#LEADING">LS</a> (line spacing/leading)</li>
-    <li><a href="#AUTOLEAD">AUTOLEAD</a> (automatic line spacing)</li>
-    <li><a href="#LINELENGTH">LL</a> (line length)</li>
+<div id="index-basic" class="macro-list-container">
+<h3 class="macro-list">Basic parameter macros</h3>
+<ul class="macro-list">
+  <li><a href="#family">FAMILY</a> &ndash; type family</li>
+  <li><a href="#font">FT</a> &ndash; font</li>
+  <li><a href="#fallback-font">FALLBACK_FONT</a> &ndash; for invalid fonts</li>
+  <li><a href="#ps">PT_SIZE</a> &ndash; point size of type</li>
+  <li><a href="#leading">LS</a> &ndash; line spacing/leading</li>
+  <li><a href="#autolead">AUTOLEAD</a> &ndash; automatic line spacing</li>
+  <li><a href="#linelength">LL</a> &ndash; line length</li>
 </ul>
+</div>
 
 <!-- -FAMILY- -->
 
-<hr width="66%" align="left"/>
-
-<a name="FAMILY"><h3><u>Type family</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>FAMILY</strong> <kbd>&lt;family&gt;</kbd></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="family" class="macro-id">Type family</h3>
+</div>
 
-Alias: <strong>FAM</strong>
+<div class="box-macro-args">
+Macro: <b>FAMILY</b> <kbd class="macro-args">&lt;family&gt;</kbd>
+</div>
+<p class="alias">
+<i>Alias:</i> <b>FAM</b>
 </p>
 
 <p>
-<strong>FAMILY</strong> takes one argument: the name of the
-<a href="definitions.html#TERMS_FAMILY">family</a>
+FAMILY takes one argument: the name of the
+<a href="definitions.html#family">family</a>
 you want.  Groff comes with a number of PostScript families, each
 identified by a 1-, 2-or 3-letter mnemonic.  The standard families
 are:
-
-<pre>
-    A   = Avant Garde
-    BM  = Bookman
-    H   = Helvetica
-    HN  = Helvetica Narrow
-    N   = New Century Schoolbook
-    P   = Palatino
-    T   = Times Roman
-    ZCM = Zapf Chancery
-</pre>
-</p>
-
-<p>
-The argument you pass to <strong>FAMILY</strong> is the identifier at
-left, above.  For example, if you want Helvetica, enter
-
-<pre>
-    .FAMILY H
-</pre>
-</p>
-
-<p>
-<strong>NOTE:</strong> The
-<a href="#FONT">font macro</a>
-(<strong>FT</strong>) lets you specify both the type family
-and the desired font with a single macro.  While this saves a few
-keystrokes, I recommend using <strong>FAMILY</strong> for family,
-and <strong>FT</strong> for font, except where doing so is genuinely
-inconvenient. <strong>ZCM</strong>, for example, only exists in one
-style: Italic (<strong>I</strong>).  Therefore, <kbd>.FT ZCMI</kbd>
-makes more sense than setting the family to &quot;ZCM&quot;, then
-setting the font to &quot;I&quot;.
-</p>
-
-<a name="FAM_ADD_NOTE"></a>
-
-<p>
-<strong>ADDITIONAL NOTE:</strong> As of <strong>mom, version
-1.1.9-a</strong>, if you are running a version of groff lower
-than 1.19.2, you <em>MUST</em> follow all <strong>FAMILY</strong>
-requests with a <strong>FT</strong> request, otherwise
-<strong>mom</strong> will set all type up to the next
-<strong>FT</strong> request in the
-<a href="#FALLBACK_FONT">fallback font</a>.
-</p>
-
-<p>
-If you are running a version of groff greater than or equal
-to 1.19.2, when you invoke the <strong>FAMILY</strong> macro,
-<strong>mom</strong> &quot;remembers&quot; the font style (Roman,
-Italic, etc) currently in use (if the font style exists in the new
-family) and will continue to use the same font style in the new
-family.  For example:
-
-<pre>
-    .FAMILY BM   \" Bookman family
-    .FT     I    \" Medium Italic
-    &lt;some text&gt;  \" Bookman Medium Italic
-    .FAMILY H    \" Helvetica family
-    &lt;more text&gt;  \" Helvetica Medium Italic
-</pre>
-</p>
-
-<p>
-However, if the font style does not exist in the new family,
-<strong>mom</strong> will set all subsequent type in the
-<a href="#FALLBACK_FONT">fallback font</a>
+<br/>
+<span class="pre-in-pp">
+  A   = Avant Garde
+  BM  = Bookman
+  H   = Helvetica
+  HN  = Helvetica Narrow
+  N   = New Century Schoolbook
+  P   = Palatino
+  T   = Times Roman
+  ZCM = Zapf Chancery
+</span>
+The argument you pass to FAMILY is the identifier at left, above.
+For example, if you want Helvetica, enter
+<br/>
+<span class="pre-in-pp">
+  .FAMILY H
+</span>
+</p>
+
+<div class="box-tip" style="margin-top: -1em;">
+<p class="tip-top">
+<span class="note">Note:</span> The font macro
+(<a href="#font">FT</a>)
+lets you specify both the type family and the desired font with
+a single macro.  While this saves a few keystrokes, I recommend
+using FAMILY for family, and FT for font, except where doing
+so is genuinely inconvenient. <kbd>ZCM</kbd>, for example,
+only exists in one style: Italic (<kbd>I</kbd>).  Therefore,
+<kbd>.FT&nbsp;ZCMI</kbd> makes more sense than setting the family to
+<kbd>ZCM</kbd>, then setting the font to <kbd>I</kbd>.
+</p>
+
+<p id="fam-add-note" class="tip-bottom">
+<span class="additional-note">Additional note:</span> As of mom,
+version 1.1.9-a, if you are running a version of groff lower than
+1.19.2, you must follow all FAMILY requests with a FT request,
+otherwise mom will set all type up to the next FT request in the
+<a href="#fallback-font">fallback font</a>.
+</p>
+</div>
+
+<p style="margin-top: -.5em;">
+If you are running a version of groff greater than or
+equal to 1.19.2, when you invoke the FAMILY macro, mom
+&#8220;remembers&#8221; the font style (Roman, Italic, etc)
+currently in use (if the font style exists in the new family) and
+will continue to use the same font style in the new family.  For
+example:
+<br/>
+<span class="pre-in-pp">
+  .FAMILY BM   \" Bookman family
+  .FT     I    \" Medium Italic
+  &lt;some text&gt;  \" Bookman Medium Italic
+  .FAMILY H    \" Helvetica family
+  &lt;more text&gt;  \" Helvetica Medium Italic
+</span>
+However, if the font style does not exist in the new family, mom
+will set all subsequent type in the
+<a href="#fallback-font">fallback font</a>
 (by default, Courier Medium Roman) until she encounters a
-<a href="#FONT">.FT</a>
-request that's valid for the family.  For example, assuming
-you don't have the font &quot;Medium Condensed Roman&quot;
-(<strong>mom</strong> extension &quot;<strong>CD</strong>&quot;)
-in the Helvetica family:
-
-<pre>
-    .FAMILY UN    \" Univers family
-    .FT     CD    \" Medium Condensed
-    &lt;some text&gt;   \" Univers Medium Condensed
-    .FAMILY H     \" Helvetica family
-    &lt;more text&gt;   \" Courier Medium Roman!
-</pre>
-</p>
-
-<p>
-In the above example, you must follow <kbd>.FAMILY H</kbd> with a
-<strong>FT</strong> request that's valid for Helvetica.
-</p>
-
-<p>
-<strong>Experts:</strong> If you add other PostScript families to
-groff's /font/devps directory, I recommend following the groff
-standard for naming families and fonts.  For example, if you add the
-Garamond family, name the font files
-
-<pre>
-    GARAMONDR
-    GARAMONDI
-    GARAMONDB
-    GARAMONDBI
-</pre>
-
-GARAMOND then becomes a valid family name you can pass to
-<strong>FAMILY</strong>.  (You could, of course, shorten GARAMOND to just
-G, or GD.)  R, I, B, and BI after GARAMOND are the roman, italic,
-bold and bold-italic fonts respectively.
+<a href="#font">.FT</a>
+request that&#8217;s valid for the family.  For example, assuming
+you don&#8217;t have the font &#8220;Medium Condensed Roman&#8221;
+(mom extension &#8220;CD&#8221;) in the Helvetica family:
+<br/>
+<span class="pre-in-pp">
+  .FAMILY UN    \" Univers family
+  .FT     CD    \" Medium Condensed
+  &lt;some text&gt;   \" Univers Medium Condensed
+  .FAMILY H     \" Helvetica family
+  &lt;more text&gt;   \" Courier Medium Roman!
+</span>
+In the above example, you must follow
+<kbd>.FAMILY&nbsp;H</kbd> with a FT request
+that&#8217;s valid for Helvetica.
 </p>
 
 <p>
 Please see the Appendices,
-<a href="appendices.html#FONTS">Adding PostScript fonts to groff</a>,
+<a href="appendices.html#fonts">Adding PostScript fonts to groff</a>,
 for information on adding fonts and families to groff, as well as
-to see a list of the extensions <strong>mom</strong> provides to
-groff's basic <strong>R, I, B, BI</strong> styles.
+to see a list of the extensions mom provides to groff&#8217;s basic
+<b>R</b>, <b>I</b>, <b>B</b>, <b>BI</b> styles.
 </p>
 
-<!-- -FT- -->
-
-<hr width="33%" align="left"/>
-
-<a name="FONT"><h3><u>Font</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>FT</strong> <kbd>R | I | B | BI | &lt;any other valid font style&gt;</kbd></nobr>
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span> If you add other PostScript
+families to groff&#8217;s /font/devps directory, I recommend
+following the groff standard for naming families and fonts.  For
+example, if you add the Garamond family, name the font files
+<br/>
+<span class="pre-in-pp">
+  GARAMONDR
+  GARAMONDI
+  GARAMONDB
+  GARAMONDBI
+</span>
+GARAMOND then becomes a valid family name you can pass to FAMILY.
+(You could, of course, shorten GARAMOND to just G, or GD.) <b>R</b>,
+<b>I</b>, <b>B</b>, and <b>BI</b> after GARAMOND are the roman,
+italic, bold and bold-italic fonts respectively.
 </p>
+</div>
 
-<p>
-By default, groff permits <strong>FT</strong> to take one of four
-possible arguments specifying the desired font:
+<!-- -FT- -->
 
-<pre>
-    R  = (Medium) Roman
-    I  = (Medium) Italic
-    B  = Bold (Roman)
-    BI = Bold Italic
-</pre>
+<div class="macro-id-overline">
+<h3 id="font" class="macro-id">FT</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>FT</b> <kbd class="macro-args">R | I | B | BI | &lt;any other valid font style&gt;</kbd>
+</div>
+<p class="alias">
+<i>Alias:</i> <b>FONT</b>
 </p>
 
 <p>
+By default, groff permits FT to take one of four possible arguments
+specifying the desired font:
+<br/>
+<span class="pre-in-pp">
+  R  = (Medium) Roman
+  I  = (Medium) Italic
+  B  = Bold (Roman)
+  BI = Bold Italic
+</span>
 For example, if your
-<a href="definitions.html#TERMS_FAMILY">family</a>
+<a href="definitions.html#family">family</a>
 is Helvetica, entering
-
-<pre>
-    .FT B
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .FT B
+</span>
 will give you the Helvetica bold
-<a href="definitions.html#TERMS_FONT">font</a>.
-If your family were Palatino, you'd get the Palatino bold font.
+<a href="definitions.html#font">font</a>.
+If your family were Palatino, you&#8217;d get the Palatino bold
+font.
 </p>
 
 <p>
-(As of <strong>mom, version 1.1.9-a,</strong> the range of arguments
-that can be passed to <strong>FT</strong> has been considerably
-extended, allowing access to a greater variety of font
-<a href="definitions.html#TERMS_WEIGHT">weights</a>
+(As of mom, version 1.1.9-a, the range of arguments that can be
+passed to FT has been considerably extended, allowing access to a
+greater variety of font
+<a href="definitions.html#weight">weights</a>
 and
-<a href="definitions.html#TERMS_SHAPE">shapes</a>.
+<a href="definitions.html#shape">shapes</a>.
 Please see the
-<a href="#FONT_NOTE">NOTE</a>,
+<kbd><a href="#font-note">NOTE</a></kbd>,
 below.)
 </p>
 
 <p>
-How <strong>mom</strong> reacts to an invalid argument to
-<strong>FT</strong> depends on which version of groff you're
-using.  If your groff version is greater than or equal to 1.19.2,
-<strong>mom</strong> will issue a warning and, depending on how
-you've set up the
-<a href="#FALLBACK_FONT">fallback font</a>,
+How mom reacts to an invalid argument to FT depends on which version
+of groff you&#8217;re using.  If your groff version is greater than
+or equal to 1.19.2, mom will issue a warning and, depending on how
+you&#8217;ve set up the
+<a href="#fallback-font">fallback font</a>,
 either continue processing using the fallback font, or abort
 (allowing you to correct the problem).  If your groff version is
-less than 1.19.2, <strong>mom</strong> will silently continue
-processing, using either the fallback font or the font that was in
-effect prior to the invalid <strong>FT</strong> call.
+less than 1.19.2, mom will silently continue processing, using
+either the fallback font or the font that was in effect prior to the
+invalid FT call.
 </p>
 
 <p>
-<strong>FT</strong> will also accept, as an argument, a full
-family+font name.  For example,
-
-<pre>
-    .FT HB
-</pre>
-
+FT will also accept, as an argument, a full family+font name.  For
+example,
+<br/>
+<span class="pre-in-pp">
+  .FT HB
+</span>
 will set subsequent type in Helvetica Bold.  However, I strongly
 recommend keeping family and font separate except where doing so is
 genuinely inconvenient.
@@ -1030,294 +972,277 @@
 
 <p>
 For inline control of fonts, see
-<a href="inlines.html#INLINE_FONTS_MOM">Inline Escapes, font control</a>.
+<a href="inlines.html#inline-fonts-mom">Inline Escapes, font control</a>.
 </p>
 
-<a name="FONT_NOTE"></a>
-
-<p>
-<strong>NOTE: mom, versions 1.1.9-a</strong> and higher,
-considerably extends the range of arguments you can pass to
-<strong>FT</strong>, making it more convenient to add and access
-fonts of differing
-<a href="definitions.html#TERMS_WEIGHT">weights</a>
+<div id="font-note" class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> mom, versions 1.1.9-a and higher,
+considerably extends the range of arguments you can pass to FT,
+making it more convenient to add and access fonts of differing
+<a href="definitions.html#weight">weights</a>
 and
-<a href="definitions.html#TERMS_SHAPE">shapes</a>
+<a href="definitions.html#shape">shapes</a>
 within the same family.  Have a look
-<a href="appendices.html#STYLE_EXTENSIONS">here</a>
-for a list of the weight/style arguments <strong>mom</strong>
+<a href="appendices.html#style-extensions">here</a>
+for a list of the weight/style arguments mom
 allows.
 </p>
+</div>
 
 <p>
-Be aware, though, that you must have the fonts, correctly
-installed and named, in order to use the arguments.  (See
-<a href="appendices.html#HOWTO">How to create a PostScript font for use with groff</a>
+Be aware, though, that you must have the fonts, correctly installed
+and named, in order to use the arguments.  (See
+<a href="appendices.html#howto">How to create a PostScript font for use with groff</a>
 for how to add fonts to groff.)  Please also read the
-<a href="#FAM_ADD_NOTE">ADDITIONAL NOTE</a>
-found in the description of the <strong>FAMILY</strong> macro.
+<a href="#fam-add-note">ADDITIONAL NOTE</a>
+found in the description of the FAMILY macro.
 </p>
 
 <!-- -FALLBACK_FONT- -->
 
-<hr width="33%" align="left"/>
-
-<a name="FALLBACK_FONT"><h3><u>Fallback font</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>FALLBACK_FONT</strong> <kbd>&lt;fallback font&gt; [ ABORT | WARN ] | ABORT | WARN</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="fallback-font" class="macro-id">Fallback font</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>FALLBACK_FONT</b> <kbd class="macro-args">&lt;fallback font&gt; [ ABORT | WARN ]</kbd>
+</div>
 
 <p>
 In the event that you pass an invalid argument to
-<a href="#FONT">.FAMILY</a>
-(i.e. a non-existent family), <strong>mom</strong>, by default, uses
-the fallback font, Courier Medium Roman (CR), in order to continue
-processing your file.
+<a href="#font">.FAMILY</a>
+(i.e. a non-existent family), mom, by default, uses the fallback
+font, Courier Medium Roman (CR), in order to continue processing
+your file.
 </p>
 
 <p>
-If you'd prefer another fallback font, pass
-<strong>FALLBACK_FONT</strong> the <strong>full family+font
-name</strong> of the font you'd like.  For example, if you'd rather
-the fallback font were Times Roman Medium Roman,
-
-<pre>
-    .FALLBACK_FONT TR
-</pre>
-
+If you&#8217;d prefer another fallback font, pass FALLBACK_FONT the
+full family+font name of the font you&#8217;d like.  For example, if
+you&#8217;d rather the fallback font were Times Roman Medium Roman,
+<br/>
+<span class="pre-in-pp">
+  .FALLBACK_FONT TR
+</span>
 would do the trick.
 </p>
 
 <p>
-Additionally, if your version of groff accepts accepts &quot;<kbd>.if
-F</kbd>&quot; and &quot;<kbd>.if S</kbd>&quot; (see
-<a href="#FAM_ADD_NOTE">above</a>),
-<strong>mom</strong> issues a warning whenever a
-<strong>font style</strong> set with
-<a href="#FONT">FT</a>
-does not exist, either because you haven't registered the style
-(see
-<a href="appendices.html#REGISTER_STYLE">here</a>
+Additionally, if your version of groff accepts accepts &#8221;<kbd>.if
+F</kbd>&#8221; and &#8221;<kbd>.if S</kbd>&#8221; (see
+<a href="#fam-add-note">above</a>),
+mom issues a warning whenever a font style set with
+<a href="#font">FT</a>
+does not exist, either because you haven&#8217;t registered the
+style (see
+<a href="appendices.html#register-style">here</a>
 for instructions on registering styles), or because the font style
 does not exist in the current family set with
-<a href="#FAMILY">FAMILY</a>.
-By default, <strong>mom</strong> then aborts, which allows you to
-correct the problem.
+<a href="#family">FAMILY</a>.
+By default, mom then aborts, which allows you to correct the
+problem.
 </p>
 
 <p>
-If you'd prefer that <strong>mom</strong> not abort on non-existent
-fonts, but rather continue processing using a fallback font, you can
-pass <strong>FALLBACK_FONT</strong> the argument <kbd>WARN</kbd>,
-either by itself, or in conjunction with your chosen fallback font.
+If you&#8217;d prefer that mom not abort on non-existent fonts,
+but rather continue processing using a fallback font, you can pass
+FALLBACK_FONT the argument <kbd>WARN</kbd>, either by itself, or in
+conjunction with your chosen fallback font.
 </p>
 
 <p>
-<strong>Some examples of invoking FALLBACK_FONT:</strong>
+Some examples of invoking FALLBACK_FONT:
 </p>
 
-<ul>
-    <li><kbd>.FALLBACK_FONT WARN</kbd>
-        <br/>
-
-        <strong>mom</strong> will issue a warning whenever you try
-        to access a non-existent font but will continue processing
-        your file with the default fallback font, Courier Medium Roman.
-    </li>
-    <li><kbd>.FALLBACK_FONT TR WARN</kbd>
-        <br/>
-
-        <strong>mom</strong> will issue a warning whenever you try
-        to access a non-existent font but will continue processing
-        your file with a fallback font of Times Roman Medium Roman;
-        additionally, &quot;TR&quot; will be the fallback font whenever
-        you try to access a <strong>family</strong> that does not exist.
-    </li>
-    <li><kbd>.FALLBACK_FONT TR ABORT</kbd>
-        <br/>
-
-        <strong>mom</strong> will abort whenever you try to access a
-        non-existent font, and will use the fallback font
-        &quot;TR&quot; whenever you try to access a <strong>family</strong>
-        that does not exist.
-    </li>
+<ul class="no-enumerator" style="margin-left: -1em;">
+<li style="margin-top: -.5em;">
+<kbd>.FALLBACK_FONT WARN</kbd>
+<br/>
+mom will issue a warning whenever you try to access a non-existent
+font but will continue processing your file with the default
+fallback font, Courier Medium Roman.
+<br/>
+</li>
+<li style="margin-top: .5em;">
+<kbd>.FALLBACK_FONT TR WARN</kbd>
+<br/>
+mom will issue a warning whenever you try to access a non-existent
+font but will continue processing your file with a fallback font of
+Times Roman Medium Roman; additionally, &#8220;TR&#8221; will be
+the fallback font whenever you try to access a family that does not
+exist.
+</li>
+<li style="margin-top: .5em;">
+<kbd>.FALLBACK_FONT TR ABORT</kbd>
+<br/>
+mom will abort whenever you try to access a non-existent font, and
+will use the fallback font &#8220;TR&#8221; whenever you try to
+access a family that does not exist.
+</li>
 </ul>
 
 <p>
 If, for some reason, you want to revert to ABORT, just enter
-<kbd>.FALLBACK_FONT ABORT</kbd> and <strong>mom</strong> will once
-again abort on font errors.
+<kbd>.FALLBACK_FONT&nbsp;ABORT</kbd> and mom will once again abort
+on font errors.
 </p>
 
 <!-- -PT_SIZE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="PS"><h3><u>Point size of type</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>PT_SIZE</strong> <kbd>&lt;size of type in points&gt;</kbd></nobr>
-<br/>
-
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
-</p>
-
-<p>
-<strong>PT_SIZE</strong> (Point Size) takes one argument: the size
-of type in points.  Unlike most other macros that establish the size
-or measure of something, <strong>PT_SIZE</strong> does not require
-that you supply a unit of measure since it's a near universal
-convention that type size is measured in points.  Therefore, to
-change the type size to, say, 11 points, enter
-
-<pre>
-    .PT_SIZE 11
-</pre>
+<div class="macro-id-overline">
+<h3 id="ps" class="macro-id">Point size of type</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>PT_SIZE</b> <kbd class="macro-args">&lt;size of type in points&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
+PT_SIZE (Point Size) takes one argument: the size of type in points.
+Unlike most other macros that establish the size or measure of
+something, PT_SIZE does not require that you supply a unit of
+measure since it&#8217;s a near universal convention that type size
+is measured in points.  Therefore, to change the type size to, say,
+11 points, enter
+<br/>
+<span class="pre-in-pp">
+  .PT_SIZE 11
+</span>
 Point sizes may be fractional (e.g.  10.25 or 12.5).
 </p>
 
 <p>
-You can prepend a plus or a minus sign to the argument to
-<strong>PT_SIZE</strong>, in which case the point size will be changed by +
-or - the original value.  For example, if the point size is 12,
-and you want 14, you can do
-
-<pre>
-    .PT_SIZE +2
-</pre>
-
+You can prepend a plus or a minus sign to the argument to PT_SIZE,
+in which case the point size will be changed by + or - the original
+value.  For example, if the point size is 12, and you want 14, you
+can do
+<br/>
+<span class="pre-in-pp">
+  .PT_SIZE +2
+</span>
 then later reset it to 12 with
-
-<pre>
-    .PT_SIZE -2
-</pre>
-</p>
-
-<p>
+<span class="pre-in-pp">
+  .PT_SIZE -2
+</span>
 The size of type can also be changed inline.  See
-<a href="inlines.html#INLINE_SIZE_MOM">Inline Escapes, changing point size</a>.
+<a href="inlines.html#inline-size-mom">Inline Escapes, changing point size</a>.
 </p>
 
-<p>
-<strong>NOTE:</strong> It is unfortunate that the <kbd>pic</kbd>
-pre-processor uses <strong>PS</strong>, and thus
-<strong>mom</strong>'s macro for setting point sizes can't use it.
-However, if you aren't using <kbd>pic</kbd>, you might want to
-<a href="goodies.html#ALIAS">alias</a>
-<strong>PT_SIZE</strong> as <strong>PS</strong>, since there'd be no
-conflict.  For example
-
-<pre>
-    .ALIAS PS PT_SIZE
-</pre>
-
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> It is unfortunate that the
+<kbd>pic</kbd> preprocessor has already taken the name,
+<kbd>PS</kbd>, and thus mom&#8217;s macro for setting point
+sizes can&#8217;t use it.  However, if you aren&#8217;t using
+<kbd>pic</kbd>, you might want to
+<a href="goodies.html#alias">alias</a>
+PT_SIZE as PS, since there&#8217;d be no conflict.  For example
+<br/>
+<span class="pre-in-pp">
+  .ALIAS PS PT_SIZE
+</span>
 would allow you to set point sizes with <kbd>.PS</kbd>.
 </p>
+</div>
 
 <!-- -LS- -->
 
-<hr width="33%" align="left"/>
-
-<a name="LEADING"><h3><u>Line spacing/leading</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>LS</strong> <kbd>&lt;distance between lines&gt;</kbd></nobr>
-<br/>
-
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="macro-id-overline">
+<h3 id="leading" class="macro-id">Line spacing/leading</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>LS</b> <kbd class="macro-args">&lt;distance between lines&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>LS</strong> (Line Space) takes one argument: the distance you want, typically
-in points, from baseline to baseline of type.  The argument may
-be fractional (e.g. 12.25 or 14.5).  Like <strong>PT_SIZE</strong>,
-<strong>LS</strong> does not require a unit of measure, since
-<a href="definitions.html#TERMS_LEADING">leading</a>
+LS (Line Space) takes one argument: the distance you want, typically
+in points, from baseline to baseline of type.  The argument may be
+fractional (e.g. 12.25 or 14.5).  Like PT_SIZE, LS does not require
+a unit of measure, since
+<a href="definitions.html#leading">leading</a>
 is most often given in points.  Therefore, to set the linespace to
 14 points, you would enter
-
-<pre>
-    .LS 14
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .LS 14
+</span>
 However, if you wish, you may specify a unit of measure by appending
-it directly to the argument passed to <strong>LS</strong>.  For
-example, if you want a linespace of 1/4 of an inch, enter
-
-<pre>
-    .LS .25i
-</pre>
-</p>
-
-<p>
-You can prepend a plus or a minus sign to the argument to
-<strong>LS</strong>, in which case the line spacing will be changed
-by + or - the original value.  For example, if the line spacing is
-14 points, and you want 17 points, you can do
-
-<pre>
-    .LS +3
-</pre>
-
+it directly to the argument passed to LS.  For example, if you want
+a linespace of 1/4 of an inch, enter
+<br/>
+<span class="pre-in-pp">
+  .LS .25i
+</span>
+You can prepend a plus or a minus sign to the argument to LS, in
+which case the line spacing will be changed by + or - the original
+value.  For example, if the line spacing is 14 points, and you want
+17 points, you can do
+<br/>
+<span class="pre-in-pp">
+  .LS +3
+</span>
 then later reset it to 14 points with
-
-<pre>
-    .LS -3
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .LS -3
+</span>
 </p>
 
-<p>
-<strong>Experts: LS</strong> should not be confused with
-the groff primitive <kbd>.ls</kbd>. <strong>LS</strong> acts
-like <kbd>.vs</kbd>.  <strong>mom</strong> does not provide a
-macro analogous to <kbd>.ls</kbd>.
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span> LS should not be confused with
+the groff primitive <kbd>.ls</kbd>. LS acts like
+<kbd>.vs</kbd>. mom does not provide a macro analogous to
+<kbd>.ls</kbd>.
 </p>
+</div>
 
 <!-- -AUTOLEAD- -->
 
-<hr width="33%" align="left"/>
-
-<a name="AUTOLEAD"><h3><u>Automatic line spacing</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>AUTOLEAD</strong> <kbd>&lt;amount of automatic leading&gt; [FACTOR]</kbd></nobr>
-<br/>
-
-<em>*Does not require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="macro-id-overline">
+<h3 id="autolead" class="macro-id">Automatic line spacing</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>AUTOLEAD</b> <kbd class="macro-args">&lt;amount of automatic leading&gt; [FACTOR]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Does not require a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-Without the <kbd>FACTOR</kbd> argument, <strong>AUTOLEAD</strong>
-calculates the linespace for you by adding its argument to the
-current point size of type. All subsequent
-<a href="#PS">PT_SIZE</a>
+Without the <kbd>FACTOR</kbd> argument, AUTOLEAD calculates the
+linespace for you by adding its argument to the current point size
+of type. All subsequent
+<a href="#ps">PT_SIZE</a>
 requests automatically update the linespacing by the autolead amount.
 </p>
 
 <p>
-Used in this way, <strong>AUTOLEAD</strong> does not require a unit
-of measure; points is assumed.  However, you may use an alternate
-unit of measure by appending it to the argument.  The argument may
-be a decimal fraction (e.g. .5 or 2.75).
+Used in this way, AUTOLEAD does not require a unit of measure;
+points is assumed.  However, you may use an alternate unit of
+measure by appending it to the argument.  The argument may be a
+decimal fraction (e.g. .5 or 2.75).
 </p>
 
 <p>
 As an example, if your current point size of type is 12, entering
-
-<pre>
-    .AUTOLEAD 2
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .AUTOLEAD 2
+</span>
 changes the linespace to 14 points, regardless any linespacing
 already in effect.  From here on, every change to the size of type
-(with <strong>PT_SIZE</strong>, not
-<a href="definitions.html#TERMS_INLINES">inline</a>)
+(with PT_SIZE, not
+<a href="definitions.html#inlines">inline</a>)
 changes the linespace as well.  If you decrease the type size to 9
 points, the leading decreases to 11 points.  If you increase the
 type size to 16 points, the leading increases to 18 points.
@@ -1325,70 +1250,65 @@
 
 <p>
 Automatic updating of the linespacing continues until you enter a
-&quot;manual&quot; line space value with
-<a href="#LEADING">LS</a>.
+&#8220;manual&#8221; line space value with
+<a href="#leading">LS</a>.
 </p>
 
 <p>
-If you give <strong>AUTOLEAD</strong> the optional
-<strong>FACTOR</strong> argument, <strong>AUTOLEAD</strong>
+If you give AUTOLEAD the optional FACTOR argument, AUTOLEAD
 calculates the line space as a factor of the
-<a href="definitions.html#TERMS_NUMERICARGUMENT">numeric argument</a>
-you gave <strong>AUTOLEAD</strong>.  For example, if your point size
-is 12,
-
-<pre>
-    .AUTOLEAD 1.125 FACTOR
-</pre>
-
-sets the leading at 13.5 points.  If you change the point size
-to 14, the leading automatically changes to 15.75 (14 x 1.125).
+<a href="definitions.html#numericargument">numeric argument</a>
+you gave AUTOLEAD.  For example, if your point size is 12,
+<br/>
+<span class="pre-in-pp">
+  .AUTOLEAD 1.125 FACTOR
+</span>
+sets the leading at 13.5 points.  If you change the point size to
+14, the leading automatically changes to 15.75 (14 x 1.125).
 </p>
 
-<p>
-<strong>NOTE:</strong> There's no need to prepend a plus sign
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> There&#8217;s no need to prepend a
+plus sign
 (<kbd>+</kbd>)
-to <strong>AUTOLEAD</strong>'s argument, although you may do so if you
-wish.
+to AUTOLEAD&#8217;s argument, although you may do so if you wish.
 </p>
+</div>
 
 <!-- -LL- -->
 
-<hr width="33%" align="left"/>
-
-<a name="LINELENGTH"><h3><u>Line length</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="linelength" class="macro-id">Line length</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>LL</strong> <kbd>&lt;line length&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>LL</b> <kbd class="macro-args">&lt;line length&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>LL</strong> (Line Length) takes one argument: the distance from the
-left margin of the page to the maximum allowable point on the
-right at which groff should place type.  The line length, in
-other words, as the macro suggests.
-</p>
-
-<p>
-<strong>LL</strong> requires a unit of measure.  Therefore, to set the line
-length to 39 picas, you would enter
-
-<pre>
-    .LL 39P
-</pre>
+LL (Line Length) takes one argument: the distance from the left
+margin of the page to the maximum allowable point on the right at
+which groff should place type.  The line length, in other words, as
+the macro suggests.
 </p>
 
 <p>
+LL requires a unit of measure.  Therefore, to set the line length to
+39 picas, you would enter
+<br/>
+<span class="pre-in-pp">
+  .LL 39P
+</span>
 As with other macros that require a unit of measure, the argument to
-<strong>LL</strong> may be fractional.  For example,
-
-<pre>
-    .LL 4.5i
-</pre>
-
+LL may be fractional.  For example,
+<br/>
+<span class="pre-in-pp">
+  .LL 4.5i
+</span>
 sets the line length to 4-1/2 inches.
 </p>
 
@@ -1396,42 +1316,40 @@
 Additionally, you may express a new line length relative to the
 current line length by prepending a plus or minus sign to the
 argument.  Thus, if you wanted to increase the line length by 3
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>, you could
+<a href="definitions.html#picaspoints">points</a>, you could
 do
-
-<pre>
-    .LL +3p
-</pre>
-
-This is especially handy when you want to &quot;hang&quot;
-punctuation outside the right margin since you can pass groff's
-<a href="inlines.html#INLINE_STRINGWIDTH_GROFF"><kbd>\w</kbd></a>
-escape as the argument to <strong>LL</strong>, like this:
-
-<pre>
-    .LL +\w'.'u
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .LL +3p
+</span>
+This is especially handy when you want to &#8220;hang&#8221;
+punctuation outside the right margin since you can pass
+groff&#8217;s
+<a href="inlines.html#inline-stringwidth-groff"><kbd>\w</kbd></a>
+escape as the argument to LL, like this:
+<br/>
+<span class="pre=in-pp">
+  .LL +\w'.'u
+</span>
 The above example increases the current line length by the width of
 a period.  Notice that you must append the
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
-<strong>u</strong>, to the escape since <strong>LL</strong> requires
-a unit of measure.
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
+<b>u</b>, to the escape since LL requires a unit of measure.
 </p>
 
-<p>
-<strong>NOTE:</strong> The
-<a href="#R_MARGIN">right margin macro</a>,
-(<strong>R_MARGIN</strong>), can also be used to set line length.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> The right margin macro,
+<a href="#r-margin">(R_MARGIN)</a>,
+can also be used to set line length.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="JUST_QUAD_FILL"><h2><u>Justifying, quadding, filling and breaking lines</u></h2></a>
+<h2 id="justification-intro" class="macro-group">Justification and quadding/breaking and joining lines</h2>
 
 <p>
 The justification and quadding macros deal with how type aligns
@@ -1442,114 +1360,116 @@
 
 <p>
 These macros also determine whether or not
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
+<a href="definitions.html#inputline">input lines</a>
 are joined and
-<a href="definitions.html#TERMS_FILLED">filled</a>
+<a href="definitions.html#filled">filled</a>
 during output.
 </p>
 
 <p>
 Additionally, macros that deal with how to break
-<a href="definitions.html#TERMS_OUTPUTLINE">output lines</a>
+<a href="definitions.html#outputline">output lines</a>
 are covered in this section, as is the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+<a href="definitions.html#inlines">inline escape</a>
 for joining input lines.
 </p>
 
 <p>
 You may encounter some words here that are unfamiliar.  Refer to
-<a href="definitions.html#TERMS_TYPESETTING">Typesetting terms</a>
+<a href="definitions.html#typesetting">Typesetting terms</a>
 and
-<a href="definitions.html#TERMS_GROFF">Groff terms</a>
+<a href="definitions.html#groff">Groff terms</a>
 for an explanation.
 </p>
 
-<a name="INDEX_JUST"><h3><u>Justification, quad, fill, and break macro list</u></h3></a>
-
-<ul>
-    <li><strong>Fill modes</strong></li>
-    <ul>
-        <li><a href="#JUSTIFY">JUSTIFY</a> (set lines justified)</li>
-        <li><a href="#QUAD">QUAD</a> (set filled lines flush left, right or centred)</li>
-    </ul>
-    <li><strong>Nofill modes</strong></li>
-    <ul>
-        <li><a href="#LRC">LEFT</a> (set non-filled lines flush left)</li>
-        <li><a href="#LRC">RIGHT</a> (set non-filled lines flush right)</li>
-        <li><a href="#LRC">CENTER</a> (set non-filled lines centred)</li>
-    </ul>
-    <li><strong>Breaking lines</strong></li>
-    <ul>
-        <li><a href="#BR">BR</a> (manually break an output line)</li>
-        <li><a href="#EL">EL</a> (break a line without advancing to the next output line)</li>
-        <li><a href="#SPACE">SPACE</a> (break a line and add space before the next output line)</li>
-        <li><a href="#SPREAD">SPREAD</a> (break and force-justify an output line)</li>
-    </ul>
-    <li><strong>Joining input lines in <a href="definitions.html#TERMS_NOFILL">nofill mode</a></strong></li>
-    <ul>
-        <li><a href="#JOIN">\c</a> inline escape</li>
-    </ul>
+<div id="index-justification" class="macro-list-container">
+<h3 class="macro-list">Justification and quadding/breaking and joining lines macros</h3>
+<ul class="macro-list">
+  <li>Fill modes
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#justify">JUSTIFY</a> &ndash; set lines justified</li>
+    <li><a href="#quad">QUAD</a> &ndash; set filled lines flush left, right or centred</li>
+  </ul></li>
+  <li>Nofill modes
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#lrc">LEFT</a> &ndash; set non-filled lines flush left</li>
+    <li><a href="#lrc">RIGHT</a> &ndash; set non-filled lines flush right</li>
+    <li><a href="#lrc">CENTER</a> &ndash; set non-filled lines centred</li>
+  </ul></li>
+  <li>Breaking lines
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#br">BR</a> &ndash; manually break an output line</li>
+    <li><a href="#el">EL</a> &ndash; break a line without advancing to the next output line</li>
+    <li><a href="#space">SPACE</a> &ndash; break a line and add space before the next output line</li>
+    <li><a href="#spread">SPREAD</a> &ndash; break and force-justify an output line</li>
+  </ul></li>
+  <li>Joining input lines in <a href="definitions.html#filled">nofill mode</a>
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#join">\c</a> inline escape</li>
+  </ul></li>
 </ul>
+</div>
 
 <!-- -JUSTIFY- -->
 
-<hr width="66%" align="left"/>
-
-<a name="JUSTIFY"><h3><u>Justify lines</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>JUSTIFY</strong></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="justify" class="macro-id">Justify lines</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>JUSTIFY</b>
+</div>
 
+<p class="requires">
 (See
-<a href="definitions.html#TERMS_FILLED">fill mode</a>
-for a definition of the difference between &quot;fill&quot; and
-&quot;no-fill&quot; modes.)
+<a href="definitions.html#filled">fill mode</a>
+for a definition of the difference between &#8220;fill&#8221; and
+&#8220;no-fill&#8221; modes.)
 </p>
 
 <p>
-<strong>JUSTIFY</strong> doesn't take an argument. 
-<a href="definitions.html#TERMS_INPUTLINE">Input lines</a>
-after <strong>JUSTIFY</strong> are
-<a href="definitions.html#TERMS_FILLED">filled</a>
+JUSTIFY doesn&#8217;t take an argument. 
+<a href="definitions.html#inputline">Input lines</a>
+after JUSTIFY are
+<a href="definitions.html#filled">filled</a>
 and
-<a href="definitions.html#TERMS_JUST">justified</a>
+<a href="definitions.html#just">justified</a>
 upon output.
 </p>
 
 <p>
-To break lines and prevent them from being filled and justified,
-use the
-<a href="#BR">BR</a>
+To break lines and prevent them from being filled and justified, use
+the
+<a href="#br">BR</a>
 macro.
 </p>
 
 <!-- -QUAD- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="quad" class="macro-id">Quad lines left, right, or centre</h3>
+</div>
 
-<a name="QUAD"><h3><u>Quad lines left, right, or centre</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>QUAD</strong> <kbd>L | LEFT | R | RIGHT | C | CENTER | J | JUSTIFY</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>QUAD</b> <kbd class="macro-args">L | LEFT | R | RIGHT | C | CENTER | J | JUSTIFY</kbd>
+</div>
 
-Alias: <strong>FILL</strong>
-<br/>
+<p class="alias" style="margin-bottom: 0;">
+<i>Alias:</i> <b>FILL</b>
+</p>
 
-(See
-<a href="definitions.html#TERMS_FILLED">fill mode</a>
-for a definition of the difference between &quot;fill&quot; and
-&quot;no-fill&quot; modes.)
+<p class="requires">(See
+<a href="definitions.html#filled">fill mode</a>
+for a definition of the difference between &#8220;fill&#8221; and
+&#8220;no-fill&#8221; modes.)
 </p>
 
 <p>
-<strong>QUAD</strong> takes one argument: the direction in which lines
-should be
-<a href="definitions.html#TERMS_QUAD">quadded</a>.
-<a href="definitions.html#TERMS_INPUTLINE">Input lines</a>
-after <strong>QUAD</strong> are 
-<a href="definitions.html#TERMS_FILLED">filled</a>
+QUAD takes one argument: the direction in which lines should be
+<a href="definitions.html#quad">quadded</a>.
+<a href="definitions.html#inputline">Input lines</a>
+after QUAD are 
+<a href="definitions.html#filled">filled</a>
 upon output.
 </p>
 
@@ -1569,1920 +1489,1881 @@
 </p>
 
 <p>
-<kbd>J</kbd> and <kbd>JUSTIFY</kbd> justify text, and are included
-as a convenience only.  Obviously, if text is justified, it isn't
-quadded. <kbd>.QUAD J</kbd> and <kbd>.QUAD JUSTIFY</kbd> have
-exactly the same effect as
-<a href="#JUSTIFY">JUSTIFY</a>.
+<kbd>J</kbd> and <kbd>JUSTIFY</kbd> justify text, and are
+included as a convenience only.  Obviously, if text is
+justified, it isn&#8217;t quadded. <kbd>.QUAD&nbsp;J</kbd> and
+<kbd>.QUAD&nbsp;JUSTIFY</kbd> have exactly the same effect as
+<a href="#justify">JUSTIFY</a>.
 </p>
 
 <p>
 To break lines and prevent them from being filled, use the
-<a href="#BR">BR</a>
+<a href="#br">BR</a>
 macro.
 </p>
 
 <!-- -LEFT, RIGHT, CENTER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="LRC"><h3><u>Set lines flush left, right, or centred in no-fill mode</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="lrc" class="macro-id">Set lines flush left, right or centered in no-fill mode</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>LEFT</strong></nobr>
-<br/>
-<nobr>Macro: <strong>RIGHT</strong></nobr>
+<div class="box-macro-args">
+Macro: <b>LEFT</b>
 <br/>
-<nobr>Macro: <strong>CENTER</strong> &nbsp;(alias <strong>CENTRE</strong>)</nobr>
+Macro: <b>RIGHT</b>
 <br/>
+Macro: <b>CENTER</b> &nbsp;(alias CENTRE)
+</div>
 
+<p class="requires">
 (See
-<a href="definitions.html#TERMS_NOFILL">no-fill mode</a>
-for a definition of the difference between &quot;fill&quot; and
-&quot;no-fill&quot; modes.)
+<a href="definitions.html#filled">no-fill mode</a>
+for a definition of the difference between &#8220;fill&#8221; and
+&#8220;no-fill&#8221; modes.)
 </p>
 
 <p>
-<strong>LEFT</strong>, <strong>RIGHT</strong> and
-<strong>CENTER</strong> let you enter text on a line for line basis
+LEFT, RIGHT and CENTER let you enter text on a line for line basis
 without having to use the
-<a href="#BR">BR</a>
+<a href="#br">BR</a>
 macro after each line.  Consider the following:
-
-<pre>
-    .QUAD LEFT
-    So runs my dream, but what am I?
-    .BR
-    An infant crying in the night
-    .BR
-    An infant crying for the light
-    .BR
-    And with no language but a cry.
-    .BR
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .QUAD LEFT
+  So runs my dream, but what am I?
+  .BR
+  An infant crying in the night
+  .BR
+  An infant crying for the light
+  .BR
+  And with no language but a cry.
+  .BR
+</span>
 Because text after <kbd>.QUAD LEFT</kbd> is
-<a href="definitions.html#TERMS_FILLED">filled</a>,
+<a href="definitions.html#filled">filled</a>,
 you have to use the
-<a href="#BR">BR</a>
+<a href="#br">BR</a>
 macro to prevent the lines from running together.  Not only is this
-annoying to type, it's awkward to read in a text editor.  Much better
-to do
-
-<pre>
-    .LEFT
-    So runs my dream, but what am I?
-    An infant crying in the night
-    An infant crying for the light
-    And with no language but a cry.
-</pre>
-</p>
-
-<p>
-<strong>IMPORTANT:</strong> Because <strong>LEFT</strong>,
-<strong>RIGHT</strong> and <strong>CENTER</strong> are nofill
-modes, groff does not always respect the current line length.
-<a href="definitions.html#TERMS_INPUTLINE">Input lines</a>
+annoying to type, it&#8217;s awkward to read in a text editor.  Much
+better to do
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  So runs my dream, but what am I?
+  An infant crying in the night
+  An infant crying for the light
+  And with no language but a cry.
+</span>
+</p>
+
+<div class="box-important" style="margin-top: -.5em;">
+<p class="tip">
+<span class="important">IMPORTANT:</span> Because LEFT,
+RIGHT and CENTER are nofill modes, groff does not always respect the
+current line length.
+<a href="definitions.html#inputline">Input lines</a>
 that run long may exceed it, or get broken in undesirable ways.
 Therefore, when using these three macros, you should preview your
 work to ensure that all lines fit as expected.
 </p>
+</div>
 
 <!-- -BR- -->
 
-<hr width="33%" align="left"/>
-
-<a name="BR"><h3><u>Manually break lines</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>BR</strong></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="br" class="macro-id">Manually break lines</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>BR</b>
+</div>
 
 <p>
 When using
-<a href="#JUSTIFY">JUSTIFY</a>
+<a href="#justify">JUSTIFY</a>
 or
-<a href="#QUAD">QUAD</a>,
-<strong>BR</strong> tells <strong>mom</strong> about partial lines
-that you want broken (as opposed to
-<a href="definitions.html#TERMS_FILLED">filled</a>).
+<a href="#quad">QUAD</a>,
+BR tells mom about partial lines that you want broken (as opposed to
+<a href="definitions.html#filled">filled</a>).
 Any partial
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>
-that immediately precedes <strong>BR</strong> will be
-<a href="definitions.html#TERMS_QUAD">quadded</a>
+<a href="definitions.html#outputline">output line</a>
+that immediately precedes BR will be
+<a href="definitions.html#quad">quadded</a>
 in the direction of the current quad, or set flush left if text is
-<a href="definitions.html#TERMS_JUST">justified</a>.
+<a href="definitions.html#just">justified</a>.
 </p>
 
 <p>
-Most of the time, you won't need the <strong>BR</strong> macro.
-In fill modes, <strong>mom</strong> tries to be sensible about
-where breaks are needed.  If the nature of a macro is such that under
-most circumstances you'd expect a break, <strong>mom</strong> puts
-it in herself.  Equally, in macros where a break isn't normally
-desirable, no break occurs.  This means text files don't get cluttered
-with annoying <strong>BR</strong>'s.
+Most of the time, you won&#8217;t need the BR macro.  In fill modes,
+mom tries to be sensible about where breaks are needed.  If the
+nature of a macro is such that under most circumstances you&#8217;d
+expect a break, mom puts it in herself.  Equally, in macros where a
+break isn&#8217;t normally desirable, no break occurs.  This means
+text files don&#8217;t get cluttered with annoying BR&#8217;s.
 </p>
 
-<p>
-<strong>NOTE:</strong> Lines of text in
-<a href="definitions.html#TERMS_NOFILL">nofill mode</a>
-never require a <strong>BR</strong>.  Furthermore, in nofill mode,
-ALL macros cause a break.  If a break is not desired, use the
-<a href="#JOIN"><kbd>\c</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>.
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> Lines of text in
+<a href="definitions.html#filled">nofill mode</a>
+never require a BR.  Furthermore, in nofill mode, ALL macros cause a
+break.  If a break is not desired, use the
+<a href="#join"><kbd>\c</kbd></a>
+<a href="definitions.html#inlines">inline escape</a>.
 </p>
 
-<p>
-<strong>Experts: BR</strong> is an alias for <kbd>.br</kbd>.
-You can use either, or mix 'n' match with impunity.
+<p class="tip-bottom" style="margin-top: -1em">
+<span class="experts">Experts:</span> BR is an alias for
+<kbd>.br</kbd>.  You can use either, or mix
+&#8217;n&#8217; match with impunity.
 </p>
+</div>
 
 <!-- -EL- -->
 
-<hr width="33%" align="left"/>
-
-<a name="EL"><h3><u>Manually break a line without advancing on the page</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>EL</strong></nobr>
-<br/>
-
-<em>*In nofill modes
-(</em><a href="#LEFT">LEFT</a>,
-<a href="#RIGHT">RIGHT</a>,
-<a href="#CENTER">CENTER</a>><em>),
-you must terminate the line input preceding</em> <strong>EL</strong>
-<em>with the </em><kbd>\c</kbd> <em>inline escape.  See</em>
-<a href="#EL_NOTES">NOTES</a>,
-<em>below.
-<br/>
-
-&nbsp;&nbsp;If you find remembering whether to put in the
-</em><kbd>\c</kbd> <em>bothersome, you may prefer to use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-alternative to </em><strong>EL</strong>,
-<a href="inlines.html#B"><kbd>\*[B]</kbd></a>,
-<em>which works consistently regardless of the fill mode.</em>
-<strong>EL</strong> <em>does not work after the</em>
-<a href="goodies.html#PAD">PAD</a>
-<em>macro.  See</em>
-<a href="goodies.html#NOBREAK"><kbd>.PAD NOBREAK</kbd></a>
-<em>for the way around this</em>.
+<div class="macro-id-overline">
+<h3 id="el" class="macro-id">Manually break a line without advancing on the page</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>EL</b>
+</div>
+
+<p class="requires">
+In nofill modes
+<span style="font-style: normal;">
+(<a href="#left">LEFT</a>,
+<a href="#right">RIGHT</a>,
+<a href="#center">CENTER</a>)
+</span>
+you must terminate the line input preceding
+<span style="font-style: normal;">EL</span>
+with the
+<span style="font-style: normal;">
+<kbd>\c</kbd> inline escape.
+</span>
+See
+<span style="font-style: normal;">
+<a href="#el-notes">NOTES</a>,
+</span>
+below.
+</p>
+
+<p style="margin-top: -.5em">
+<i><b>Suggestion:</b> If you find remembering whether to put in the</i>
+<kbd>\c</kbd>
+<i>bothersome, you may prefer to use the</i>
+<a href="definitions.html#inlines">inline escape</a>
+<i>alternative to</i> EL,
+<a href="inlines.html#b"><kbd>\*[B]</kbd></a>,
+<i>which works consistently regardless of the fill mode.
+</i>EL <i>does not work after the</i>
+<a href="goodies.html#pad">PAD</a>
+<i>macro.  See</i>
+<a href="goodies.html#nobreak"><kbd>.PAD&nbsp;NOBREAK</kbd></a>
+<i>for the way around this.</i>
 </p>
 
 <p>
-The mnemonic &quot;EL&quot; is borrowed from old Compugraphic
-typesetting systems, where it stood for "End Line."  Conceptually,
-<strong>EL</strong> is equivalent to the notion of a carriage return
+The mnemonic &#8220;EL&#8221; is borrowed from old Compugraphic
+typesetting systems, where it stood for
+"<span style="text-decoration: underline;">E</span>nd <span style="text-decoration: underline;">L</span>ine."
+Conceptually, EL is equivalent to the notion of a carriage return
 with no linefeed.
 </p>
 
-<p>
-<em>Note to groff jocks:</em> <strong>EL</strong> is unrelated to
-groff's <kbd>.el</kbd>.  If you find the similarity confusing,
-you may want to alias <strong>EL</strong> as something else (but
-don't use <strong>EOL</strong>; <strong>mom</strong> uses it
-internally.)
-</p>
-
-<p>
-<strong>EL</strong>'s function is simple: it breaks a line without
-advancing on the page.
-
-<a name="EL_EXAMPLE"></a>
-
-As an example of where you might use it, imagine that you're working
-from marked-up copy.  The markup indicates 24 points of space
-between two given lines, but the prevailing line spacing is 12.5
-points.  You may find it more convenient to break the first line
-with <strong>EL</strong> and instruct <strong>mom</strong> to
-advance 24 points to the next line instead of calculating the lead
-that needs to be added to 12.5 to get 24.  To demonstrate:
-
-<pre>
-    .LEFT
-    .LS 12.5
-    A line of text.\c
-    .EL
-    .ALD 24p
-    The next line of text.
-</pre>
-
+<p id="el-example">
+EL&#8217;s function is simple: it breaks a line without advancing
+on the page.  As an example of where you might use it, imagine that
+you&#8217;re working from marked-up copy.  The markup indicates 24
+points of space between two given lines, but the prevailing line
+spacing is 12.5 points.  You may find it more convenient to break
+the first line with EL and instruct mom to advance 24 points to the
+next line instead of calculating the lead that needs to be added to
+12.5 to get 24.  To demonstrate:
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  .LS 12.5
+  A line of text.\c
+  .EL
+  .ALD 24p
+  The next line of text.
+</span>
 may be more intuitive than
-
-<pre>
-    .LEFT
-    .LS 12.5
-    A line of text.
-    .ALD 11.5p
-    The next line of text.
-</pre>
-</p>
-
-<p>
-The first example has the further advantage that should you wish
-to change the prevailing line space but keep the 24 points lead,
-you don't have to recalculate the extra space.
-</p>
-
-<p>
-"ALD" in the above examples stands for "<strong>A</strong>dvance
-<strong>L</strong>ea<strong>D</strong>" (another mnemonic borrowed
-from Compugraphic), which is covered in the section
-<a href="#ALDRLD">Vertical movement</a>.
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  .LS 12.5
+  A line of text.
+  .ALD 11.5p
+  The next line of text.
+</span>
+The first example has the further advantage that should you wish to
+change the prevailing line space but keep the 24 points lead, you
+don&#8217;t have to recalculate the extra space.
 </p>
 
-<a name="EL_NOTES"><h4><u>NOTES:</u></h4></a>
-
 <p>
-In versions of mom prior to 1.1.9, <strong>EL</strong> did not
-always work as advertised on the last
-<a name="TERMS_OUTPUTLINE">output line</a>
+ALD in the above examples stands for
+&#8220;<span style="text-decoration: underline;">A</span>dvance
+<span style="text-decoration: underline;">L</span>ea<span style="text-decoration: underline;">D</span>&#8221;
+(another mnemonic borrowed from Compugraphic), which is covered in
+the section
+<a href="#vertical-movements-intro">Vertical movements</a>.
+</p>
+
+<div class="box-notes">
+<h3 id="el-notes" class="docs notes">Notes</h3>
+
+<p style="margin-top: .5em;">
+In versions of mom prior to 1.1.9, EL did not always work as
+advertised on the last
+<a href="definitions.html#outputline">output line</a>
 of pages that contained a footer trap (e.g. one set with
-<a href="#B_MARGIN">B_MARGIN</a>
+<a href="#b-margin">B_MARGIN</a>
 or in  documents formatted using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>).
+<a href="docprocessing.html#docprocessing">document processing macros</a>).
 </p>
 
 <p>
-<strong>EL</strong> has been re-written so that this should no longer be the
-case.  However, in order for it to work in the
-<a href="definitions.html#TERMS_NOFILL">nofill</a>
+EL has been re-written so that this should no longer be the case.
+However, in order for it to work in the
+<a href="definitions.html#filled">nofill</a>
 modes
-(<a href="#LRC">LEFT</a>,
-<a href="#LRC">RIGHT</a>
+(<a href="#lrc">LEFT</a>,
+<a href="#lrc">RIGHT</a>
 or
-<a href="#LRC">CENTER</a>),
-you must always &quot;join&quot; <kbd>.EL</kbd> to the line before
-it using the
-<a href="#JOIN"><kbd>\c</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
+<a href="#lrc">CENTER</a>),
+you must always &#8220;join&#8221; <kbd>.EL</kbd> to
+the line before it using the
+<kbd><a href="#join">\c</a></kbd>
+<a href="definitions.html#inlines">inline escape</a>,
 like this:
-
-<pre>
-    .LEFT
-    A line I don't want to advance\c
-    .EL
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  A line I don&#8217;t want to advance\c
+  .EL
+</span>
 Conversely, in
-<a href="definitions.html#TERMS_FILLED">fill modes</a>
-(<a href="#QUAD">QUAD LEFT</a>,
-<a href="#QUAD">QUAD RIGHT</a>,
-<a href="#QUAD">QUAD CENTER</a>
+<a href="definitions.html#filled">fill modes</a>
+(<a href="#quad">QUAD LEFT</a>,
+<a href="#quad">QUAD RIGHT</a>,
+<a href="#quad">QUAD CENTER</a>
 or
-<a href="#JUSTIFY">JUSTIFY</a>),
+<a href="#justify">JUSTIFY</a>),
 the <kbd>\c</kbd> must not be used.
 </p>
 
 <p>
-If <strong>EL</strong> is used after most macros or groff
-<a href="definitions.html#TERMS_PRIMITIVES">primitives</a>
-(see the exception, below), you don't have to worry about this,
-regardless of the fill mode.  Just type <kbd>.EL</kbd>
+If EL is used after most macros or groff
+<a href="definitions.html#primitives">primitives</a>
+(see the exception, below), you don&#8217;t have to worry about
+this, regardless of the fill mode.  Just type
+<kbd>.EL</kbd>
 </p>
 
-<!-- -SP- -->
-
-<hr width="33%" align="left"/>
+<p class="tip-bottom">
+<span class="experts">Experts:</span> EL is unrelated to
+groff&#8217;s <kbd>.el</kbd>.  If you find the similarity confusing,
+you may want to alias EL as something else (but don&#8217;t use EOL;
+mom uses it internally.)
+</p>
+</div>
 
-<a name="SPACE"><h3><u>Break lines and add space between</u></h3></a>
+<!-- -SP- -->
 
-<p>
-<nobr>Macro: <strong>SPACE</strong> <kbd>&lt;space to add between lines&gt;</kbd></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="space" class="macro-id">Break lines and add space between</h3>
+</div>
 
-Alias: <strong>SP</strong>
+<div class="box-macro-args">
+Macro: <b>SPACE</b> <kbd class="macro-args">&lt;space to add between lines&gt;</kbd>
+</div>
+<p class="alias">
+<i>Alias:</i> <b>SP</b>
 </p>
 
 <p>
-<strong>SPACE</strong> breaks a line, just like
-<a href="#BR">BR</a>,
+SPACE breaks a line, just like
+<a href="#br">BR</a>,
 then adds space after the line.  With no argument, it adds an extra
 line space of a value equal to the current
-<a href="definitions.html#TERMS_LEADING">leading</a>.
+<a href="definitions.html#leading">leading</a>.
 If you pass it a numeric argument without supplying a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>,
+<a href="definitions.html#unitofmeasure">unit of measure</a>,
 it advances that number of extra line spaces.  For example:
-
-<pre>
-    .SPACE
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SPACE
+</span>
 breaks the line then adds an extra linespace, whereas
-
-<pre>
-    .SPACE 2
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SPACE 2
+</span>
 breaks the line and adds two extra linespaces.
 </p>
 
 <p>
-If you supply a unit of measure, <strong>SPACE</strong> breaks the
-line then advances one linespace (at the current
-<a href="definitions.html#TERMS_LEADING">leading</a>)
-PLUS the specified amount of extra space given to
-<strong>SPACE</strong>, as in
-
-<pre>
-    .SPACE 6p
-</pre>
-
+If you supply a unit of measure, SPACE breaks the line then advances
+one linespace (at the current
+<a href="definitions.html#leading">leading</a>)
+PLUS the specified amount of extra space given to SPACE, as in
+<br/>
+<span class="pre-in-pp">
+  .SPACE 6p
+</span>
 which breaks the line and advances one full linespace plus six
 points.
 </p>
 
-<p>
-<strong>SUGGESTION: SPACE</strong> and
-<a href="#ALD">ALD</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="tip">Tip:</span> SPACE and
+<a href="#ald">ALD</a>
 can be used interchangeably (<kbd>.SPACE&nbsp;6p</kbd> and
-<kbd>.ALD&nbsp;6p</kbd> are equivalent).  However,
-<strong>ALD</strong> without an argument does nothing, whereas
-<strong>SPACE</strong> without an argument adds an extra line
-space.  I recommend using <strong>SPACE</strong> when you
-want an extra line space (or multiple thereof), and
-<strong>ALD</strong> whenever you want some other value of space
-after a line.
+<kbd>.ALD&nbsp;6p</kbd> are equivalent).  However, ALD without an
+argument does nothing, whereas SPACE without an argument adds an
+extra line space.  I recommend using SPACE when you want an extra
+line space (or multiple thereof), and ALD whenever you want some
+other value of space after a line.
 </p>
 
-<p>
-<strong>Experts: SPACE</strong> is an alias of <kbd>.sp</kbd>.  You
-can use either, or mix 'n' match with impunity.
+<p class="tip-bottom">
+<span class="experts">Experts:</span> SPACE is an alias of
+<kbd>.sp</kbd>.  You can use either, or mix &#8217;n&#8217; match
+with impunity.
 </p>
+</div>
 
 <!-- -SPREAD- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SPREAD"><h3><u>Break and force justify (spread) lines</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>SPREAD</strong></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="spread" class="macro-id">Break and force justify (spread) lines</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SPREAD</b>
+</div>
 
 <p>
 Sometimes, you need to break a line of
-<a href="definitions.html#TERMS_JUST">justified</a>
+<a href="definitions.html#just">justified</a>
 text and have it come out fully justified, not
-<a href="definitions.html#TERMS_QUAD">quadded</a>
+<a href="definitions.html#quad">quadded</a>
 left the way it would be with the
-<a href="#BR">BR</a>
-macro.  An example of where you'd do this would be when you want
-to prevent a word at the end of a line from being hyphenated (say,
-a proper name). <strong>SPREAD</strong> is the macro that lets you
-break the line and have it came out fully justified.
+<a href="#br">BR</a>
+macro.  An example of where you&#8217;d do this would be when you
+want to prevent a word at the end of a line from being hyphenated
+(say, a proper name). SPREAD is the macro that lets you break the
+line and have it came out fully justified.
 </p>
 
-<p>
-<strong>Experts: SPREAD</strong> is an alias for <kbd>.brp</kbd>
-You can use either, or mix 'n' match with impunity.
+<div class="box-tip">
+<p class="tip">
+<span class="experts">Experts:</span> SPREAD is an alias for
+<kbd>.brp</kbd> You can use either, or mix
+&#8217;n&#8217; match with impunity.
 </p>
+</div>
 
 <!-- -JOIN- -->
 
-<hr width="33%" align="left"/>
-
-<a name="JOIN"><h3><u>Join input lines</u></h3></a>
-
-<p>
-Inline: <kbd>\c</kbd>
-</p>
+<div class="macro-id-overline">
+<h3 id="join" class="macro-id">Join input lines</h3>
+</div>
+
+<div class="box-macro-args">
+Inline: <kbd class="macro-args">\c</kbd>
+</div>
 
 <p>
 Sometimes, especially when in one of the
-<a href="definitions.html#TERMS_NOFILL">nofill modes</a>,
-a macro will cause a break where you don't want one.  In order to
-prevent this from happening (in other words, to join
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
+<a href="definitions.html#filled">nofill modes</a>,
+a macro will cause a break where you don&#8217;t want one.  In order
+to prevent this from happening (in other words, to join
+<a href="definitions.html#inputline">input lines</a>
 together, forming one
-<a href="definitions.html#TERMS_OUTPUTLINE">output line</a>),
+<a href="definitions.html#outputline">output line</a>),
 use the groff
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<kbd>\c</kbd> at the end of each input line to be joined to another,
-like this:
-
-<pre>
-    .LEFT
-    .FAMILY T
-    .FT R
-    Some lines of text to be \c
-    .FAMILY H
-    .FT B
-    joined \c
-    .FAMILY T
-    .FT R
-    together.
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#inlines">inline escape</a>
+<kbd>\c</kbd> at the end of each input line to be
+joined to another, like this:
+<br/>
+<span class="pre-in-pp">
+  .LEFT
+  .FAMILY T
+  .FT R
+  Some lines of text to be \c
+  .FAMILY H
+  .FT B
+  joined \c
+  .FAMILY T
+  .FT R
+  together.
+</span>
 Upon output, the lines will be joined together to read
-
-<pre>
-    Some lines of text to be joined together.
-</pre>
-
-with the word &quot;joined&quot; in Helvetica bold.  Note the space
-before <kbd>\c</kbd>.  Without it, the last three words of the
-output line would read
-
-<pre>
-    bejoinedtogether
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  Some lines of text to be joined together.
+</span>
+with the word &#8220;joined&#8221; in Helvetica bold.  Note the
+spaces before <kbd>\c</kbd>.  Without them, the last three words of
+the output line would read
+<br/>
+<span class="pre-in-pp">
+  bejoinedtogether
+</span>
 Please also note that had the example been in one of the
-<a href="definitions.html#TERMS_FILLED">fill modes</a>,
-there'd have been no need for the <kbd>\c</kbd>.  
+<a href="definitions.html#filled">fill modes</a>,
+there&#8217;d have been no need for the <kbd>\c</kbd>.  
 </p>
 
-<p>
-<strong>Addendum:</strong> The example, above, is designed to
-demonstrate the use of <kbd>\c</kbd>.  However, an easier and more
-intuitive way to accomplish the family/font change in the example
-would be with the groff
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
-<a href="inlines.html#INLINE_FONTS_GROFF">\f</a>,
+<div class="box-tip">
+<p class="tip">
+<b>Addendum:</b> The example, above, is designed to demonstrate the
+use of <kbd>\c</kbd>.  An easier and more intuitive way
+to accomplish the family/font change in the example would be with
+the groff
+<a href="definitions.html#inlines">inline escape</a>,
+<kbd><a href="inlines.html#inline-fonts-groff">\f</a></kbd>,
 like this:
-
-<pre>
-    Some lines of text to be \f[HB]joined\*[PREV] together.
-</pre>
+<br/>
+<span class="pre-in-pp" style="padding-bottom: 0px;">
+  Some lines of text to be \f[HB]joined\*[PREV] together.
+</span>
 </p>
+</div>
 
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="INTRO_REFINEMENTS"></a>
-
-<a name="REFINEMENTS"><h2><u>Typographic refinements</u></h2></a>
+<h2 id="refinements-intro" class="macro-group">Typographic refinements</h2>
 
 <p>
-The macros in this section help you tweak groff's behaviour,
+The macros in this section help you tweak groff&#8217;s behaviour,
 ensuring that your documents look typographically professional.
 </p>
 
-<a name="INDEX_REFINEMENTS"><h3><u>Typographic refinements macro list</u></h3></a>
+<div id="index-refinements" class="macro-list-container">
+<h3 class="macro-list">Typographic refinements macros</h3>
 
-<ul>
-    <li><strong>Word and sentence spacing</strong></li>
-    <ul>
-        <li><a href="#WS">WS</a> (word spacing)</li>
-        <li><a href="#SS">SS</a> (sentence space)</li>
-    </ul>
-    <li><strong>Letter spacing (track kerning)</strong></li>
-    <ul>
-        <li><a href="#RW">RW</a> (reduce whitespace)</li>
-        <li><a href="#EW">EW</a> (expand whitespace)</li>
-        <li><a href="#BR_AT_LINE_KERN">BR_AT_LINE_KERN</a></li>
-    </ul>
-    <li><strong>Hyphenation</strong></li>
-    <ul>
-        <li><a href="#HY">HY</a> (turn auto hyphenation on/off, or set specific hyphenation parameters)</li>
-        <li><a href="#HY_SET">HY_SET</a> (set all hyphenation parameters)</li>
-    </ul>
-    <li><strong>Automatic kerning and ligatures</strong></li>
-    <ul>
-        <li><a href="#KERN">KERN</a> (turn automatic pairwise kerning on or off)</li>
-        <li><a href="#LIGATURES">LIGATURES</a> (turn automatic generation of ligatures on or off)</li>
-    </ul>
+<ul class="macro-list">
+  <li>Word and sentence spacing
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#ws">WS</a> &ndash; word spacing</li>
+    <li><a href="#ss">SS</a> &ndash; sentence space</li>
+  </ul></li>
+  <li>Letter spacing (track kerning)
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#rw">RW</a> &ndash; reduce whitespace</li>
+    <li><a href="#ew">EW</a> &ndash; expand whitespace</li>
+    <li><a href="#br-at-line-kern">BR_AT_LINE_KERN</a></li>
+  </ul></li>
+  <li>Hyphenation
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#hy">HY</a> &ndash; turn auto hyphenation on/off, or set specific hyphenation parameters</li>
+    <li><a href="#hy-set">HY_SET</a> &ndash; set all hyphenation parameters</li>
+  </ul></li>
+  <li>Automatic kerning and ligatures
+  <ul style="list-style-type: none; margin-left: -1em;">
+    <li><a href="#kern">KERN</a> &ndash; turn automatic pairwise kerning on or off</li>
+    <li><a href="#ligatures">LIGATURES</a> &ndash; turn automatic generation of ligatures on or off</li>
+  </ul></li>
 </ul>
+</div>
 
 <!-- -WS- -->
 
-<hr width="66%" align="left"/>
-
-<a name="WS"><h3><u>Word spacing</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="ws" class="macro-id">Word spacing</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>WS</b> <kbd class="macro-args">&lt;+|-wordspace&gt; | DEFAULT</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>WS</strong> <kbd>&lt;+|-wordspace&gt; | DEFAULT</kbd></nobr>
-</p>
-
-<p>
-<strong>WS</strong> (Word Space) increases or decreases the amount
-of space between words.  In
-<a href="definitions.html#TERMS_NOFILL">nofill modes</a>,
+WS (Word Space) increases or decreases the amount of space between
+words.  In
+<a href="definitions.html#filled">nofill modes</a>,
 or if
-<a href="#QUAD">QUAD</a>
+<a href="#quad">QUAD</a>
 is in effect, the space between words is fixed.  Therefore, if you
-change the word spacing with <strong>WS</strong>, the change applies
-uniformly to the space between every word on every line.  However,
-when text is
-<a href="definitions.html#TERMS_JUST">justified</a>,
+change the word spacing with WS, the change applies uniformly to the
+space between every word on every line.  However, when text is
+<a href="definitions.html#just">justified</a>,
 the space between words varies from line to line (in order to
-justify the text).  Consequently, the change you make with
-<strong>WS</strong> represents the minimum (and ideal) space groff
-will try to put between words before deciding whether to hyphenate a
-final word or to stretch the word spacing.
-</p>
-
-<p>
-Word space is relative to type size.  Knowing how it's calculated is
-unimportant. What matters is having a sense of how the value passed
-to <strong>WS</strong> affects the look of your type.  Generally,
-in/decreasing the word space by a value of 1 or 2 produces a difference
-that in many cases is scarcely visible; in/decreasing by a value of 5
-or so produces a subtle but noticeable difference; and in/decreasing
-by a value greater than 10 is always apparent.  You should preview
-your work to assess the effect of <strong>WS</strong>.
-</p>
-
-<a name="WS_USAGE"></a>
-
-<p>
-<strong>WS</strong> takes as its argument a whole number preceded
-by a plus or minus sign.  Therefore, to decrease the word space
-slightly, you might enter
-
-<pre>
-    .WS -4
-</pre>
+justify the text).  Consequently, the change you make with WS
+represents the minimum (and ideal) space groff will try to put
+between words before deciding whether to hyphenate a final word or
+to stretch the word spacing.
 </p>
 
 <p>
+Word space is relative to type size.  Knowing how it&#8217;s
+calculated is unimportant. What matters is having a sense of how
+the value passed to WS affects the look of your type.  Generally,
+in/decreasing the word space by a value of 1 or 2 produces a
+difference that in many cases is scarcely visible; in/decreasing by
+a value of 5 or so produces a subtle but noticeable difference; and
+in/decreasing by a value greater than 10 is always apparent.  You
+should preview your work to assess the effect of WS.
+</p>
+
+<p id="ws-usage">
+WS takes as its argument a number (decimal fractions are allowed)
+preceded by a plus or minus sign.  Therefore, to decrease the word
+space slightly, you might enter <br/>
+<span class="pre-in-pp">
+  .WS -4
+</span>
 To increase it by a noticeable amount, you might enter
-
-<pre>
-    .WS +12
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .WS +12
+</span>
 You can reset the word spacing to its previous value by switching
 the plus or minus sign, like this:
-
-<pre>
-    .WS +4
-    A line of text
-    .WS -4
-</pre>
-</p>
-
-<p>
-The <kbd>.WS -4</kbd> undoes the effect of <kbd>.WS +4</kbd>.  You
-can also reset <strong>WS</strong> to its groff default by entering
-
-<pre>
-    .WS DEFAULT
-</pre>
-</p>
-
-<p>
-This can be particularly useful if you've been playing around
-with plus and minus values, and can't remember by how much you
+<br/>
+<span class="pre-in-pp">
+  .WS +4
+  A line of text
+  .WS -4
+</span>
+The <kbd>.WS&nbsp;-4</kbd> undoes the effect of
+<kbd>.WS&nbsp;+4</kbd>.  You can also reset WS to its groff default
+by entering
+<br/>
+<span class="pre-in-pp">
+  .WS DEFAULT
+</span>
+This can be particularly useful if you&#8217;ve been playing around
+with plus and minus values, and can&#8217;t remember by how much you
 have to in/decrease the word space to get it back to normal.
 </p>
 
 <!-- -SS- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SS"><h3><u>Sentence space</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>SS</strong> <kbd>&lt;+sentence space&gt; | 0 | DEFAULT</kbd></nobr>
-</p>
-
-<p>
-<strong>SS</strong> (Sentence Space) tells groff how to treat double
-spaces it encounters between sentences in
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>.
-If you use <strong>SS</strong>, input sentences with two spaces
-after them AND input sentences that fall at the end of input lines
-all receive a normal word space plus an additional amount of space
-whose size is determined by the + value passed as an argument to
-<strong>SS</strong>.  Thus,
-
-<pre>
-    .SS +2
-</pre>
-
-means that input sentences with two spaces after them receive a normal
-word space PLUS the +2 value passed to <strong>SS</strong>.
+<div class="macro-id-overline">
+<h3 id="ss" class="macro-id">Sentence space</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SS</b> <kbd class="macro-args">&lt;+sentence space&gt; | 0 | DEFAULT</kbd>
+</div>
+
+<p>
+SS (Sentence Space) tells groff how to treat double spaces it
+encounters between sentences in
+<a href="definitions.html#inputline">input lines</a>.
+If you use SS, input sentences with two spaces after them <i>and</i>
+input sentences that fall at the end of input lines all receive a
+normal word space plus an additional amount of space whose size is
+determined by the + value passed as an argument to SS.  Thus,
+<br/>
+<span class="pre-in-pp">
+  .SS +2
+</span>
+means that input sentences with two spaces after them receive a
+normal word space PLUS the +2 value passed to SS.
 </p>
 
 <p>
 Like
-<a href="#WS">WS</a>,
+<a href="#ws">WS</a>,
 increasing the sentence space by a value of 1 or 2 produces a
 difference that in many cases is scarcely visible; increasing by a
 value of 5 or so produces a subtle but noticeable difference (i.e.
 the space between double-spaced input sentences will be slightly but
 visibly greater than the space between words); and increasing by a
 value greater than 10 is always apparent.  You should preview your
-work to assess the effect of <strong>SS</strong>.
+work to assess the effect of SS.
 </p>
 
 <p>
-There's an additional argument you can pass <strong>SS</strong>:
-the number zero (without the + sign).  It's the argument you'll
+There&#8217;s an additional argument you can pass SS: the number
+zero (without the + sign).  It&#8217;s the argument you&#8217;ll
 use most often.  Typeset copy should never have two spaces between
 sentences, and the "zero" argument tells groff to give the extra
-spaces no space at all (effectively removing them).  Therefore,
-if you double-space your sentences (as you should when writing in a
+spaces no space at all (effectively removing them).  Therefore, if
+you double-space your sentences (as you should when writing in a
 text editor), get in the habit of putting
-
-<pre>
-    .SS 0
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .SS 0
+</span>
 at the top of your files.
 </p>
 
 <p>
-If you do use <strong>SS</strong> for something other than ensuring
-that you don't get unwanted sentence spaces in output copy, you can
-set or reset the sentence space to the groff default (the same width
+If you do use SS for something other than ensuring that you
+don&#8217;t get unwanted sentence spaces in output copy, you can set
+or reset the sentence space to the groff default (the same width
 as a word space, i.e. double-spaced input sentences will appear
 double-spaced on output as well) with
-
-<pre>
-    .SS DEFAULT
-</pre>
-</p>
-
-<p>
-If you're using the
+<br/>
+<span class="pre-in-pp">
+  .SS DEFAULT
+</span>
+If you&#8217;re using the
 <a href="docprocessing.html">document processing macros</a>
 and your
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a>
-is <strong>TYPEWRITE</strong>, <kbd>.SS DEFAULT</kbd> is
-the default, because you <em>do</em> want double spaces between
-sentences in copy that imitates the look of a typewritten document.
+<a href="docprocessing.html#printstyle">PRINTSTYLE</a>
+is <kbd>TYPEWRITE</kbd>, <kbd>.SS&nbsp;DEFAULT</kbd> is the
+default, because you do want double spaces between sentences in copy
+that imitates the look of a typewritten document.
 </p>
 
-<p>
-<strong>IMPORTANT: SS</strong> with an argument other than
-&quot;0&quot; should only be used if you're of the old (and wise)
-school of typists that puts two spaces between sentences.  If you
-ignore this advice and use <strong>SS</strong> when you habitually
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> SS with an argument other
+than <kbd>0</kbd> (zero) should only be used if you&#8217;re of
+the old (and wise) school of typists that puts two spaces between
+sentences.  If you ignore this advice and use SS when you habitually
 put only one space between sentences, you risk producing output
 where the space between sentences is not equal.
 </p>
+</div>
 
 <!-- -HY- -->
 
-<hr width="66%" align="left"/>
-
-<a name="HY"><h3><u>Automatic hyphenation control</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>HY</strong> <kbd>toggle</kbd></nobr>
-<br/>
-<nobr>Macro: <strong>HY</strong> <kbd>LINES &lt;max. number of consecutive hyphenated lines&gt;</kbd></nobr>
-<br/>
-<nobr>Macro: <strong>HY</strong> <kbd>MARGIN &lt;size of hyphenation margin&gt;</kbd></nobr>
-<br/>
-<nobr>Macro: <strong>HY</strong> <kbd>SPACE &lt;extra interword spacing to prevent hyphenation&gt;</kbd></nobr>
-<br/>
-<nobr>Macro: <strong>HY</strong> <kbd>DEFAULT</kbd></nobr>
-<br/>
-Aliases: <strong>HYPHENATE, HYPHENATION</strong>
-</p>
-
-<p>
-<strong>HY</strong>, as you can see, can be invoked with a number of
-arguments.  In all cases, the aliases <strong>HYPHENATE</strong>
-or <strong>HYPHENATION</strong> can be used in place of
-<strong>HY</strong>.  To aid in understanding the various arguments
-you can pass to <strong>HY</strong>, I've broken them down into
-separate sections.
-</p>
-
-<h4><u>1. HY</u></h4>
-
-<p>
-<strong>HY</strong> by itself (i.e. with no argument) simply turns
-automatic hyphenation on.  Any argument other than <strong>LINES,
-MARGIN, SPACE</strong> or <strong>DEFAULT</strong>, turns
-automatic hyphenation off.  For example, as explained in <a
-href="intro.html#MACRO_ARGS">How to read macro arguments</a>, you
-could turn <strong>HY</strong> off by entering
-
-<pre>
-    .HY OFF
-       or
-    .HY X
-       or
-    .HY END
-</pre>
-</p>
-
-<p>
-<strong>HY</strong> observes the following default hyphenation rules:
-
-<ol>
-    <li>Last lines (i.e. ones that will spring a trap &mdash; typically
-        the last line on a page) will not be hyphenated.
-    </li>
-    <li>The first and last two characters of a word are never
-        split off.
-    </li>
-</ol>
+<div class="macro-id-overline">
+<h3 id="hy" class="macro-id">Automatic hyphenation control</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>HY</b> <kbd class="macro-args">LINES &lt;max. number of consecutive hyphenated lines&gt;</kbd>
+  <br/>
+Macro: <b>HY</b> <kbd class="macro-args">MARGIN &lt;size of hyphenation margin&gt;</kbd>
+  <br/>
+Macro: <b>HY</b> <kbd class="macro-args">SPACE &lt;extra interword spacing to prevent hyphenation&gt;</kbd>
+  <br/>
+Macro: <b>HY</b> <kbd class="macro-args">DEFAULT</kbd>
+  <br/>
+Macro: <b>HY</b> <kbd class="macro-args">toggle</kbd>
+</div>
+<p class="alias">
+<i>Aliases:</i> <b>HYPHENATE, HYPHENATION</b>
 </p>
 
-<h4><u>2. HY LINES</u></h4>
-
 <p>
-<strong>HY LINES</strong> sets the maximum number of consecutive
-hyphenated lines that will appear in output copy.  2 is a very
-good choice, and you'd set it with
+HY, as you can see, can be invoked with a number of arguments.  In
+all cases, the aliases HYPHENATE or HYPHENATION can be used in place
+of HY.  To aid in understanding the various arguments you can pass
+to HY, I&#8217;ve broken them down into separate sections.
+</p>
+
+<h3 class="docs">1.&nbsp;&nbsp;HY</h3>
+
+<p>
+HY by itself (i.e. with no argument) simply turns automatic
+hyphenation on.  Any argument other than LINES, MARGIN, SPACE or
+DEFAULT, turns automatic hyphenation off.  For example, as explained
+in
+<a href="intro.html#macro-args">How to read macro arguments</a>,
+you could turn HY off by entering
+<br/>
+<span class="pre-in-pp">
+  .HY OFF
+</span>
+or
+<span class="pre-in-pp">
+  .HY X
+</span>
+or
+<span class="pre-in-pp">
+  .HY END
+</span>
+HY observes the following default hyphenation rules:
+</p>
+<ul style="margin-top: -.5em; margin-left: 18px;">
+  <li>Last lines (i.e. ones that will spring a trap&mdash;typically
+      the last line on a page) will not be hyphenated.
+  </li>
+  <li>The first and last two characters of a word are never
+      split off.
+  </li>
+</ul>
 
-<pre>
-    .HY LINES 2
-</pre>
-</p>
+<h3 class="docs numbered">2.&nbsp;&nbsp;HY LINES</h3>
 
 <p>
+HY LINES sets the maximum number of consecutive hyphenated lines
+that will appear in output copy.  2 is a very good choice, and
+you&#8217;d set it with
+<br/>
+<span class="pre-in-pp">
+  .HY LINES 2
+</span>
 By default, when you turn automatic hyphenation on, there is no
 limit to the number of consecutive hyphenated lines.
 </p>
 
-<p>
-<strong>NOTE:</strong>
-<a href="definitions.html#TERMS_DISCRETIONARYHYPHEN">Discretionary hyphens</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+<a href="definitions.html#discretionaryhyphen">Discretionary hyphens</a>
 count when groff is figuring out how many lines to hyphenate;
 explicit hyphens do not.
 </p>
+</div>
 
-<h4><u>3. HY MARGIN</u></h4>
+<h3 class="docs numbered">3.&nbsp;&nbsp;HY MARGIN</h3>
 
 <p>
-<strong>HY MARGIN</strong> sets the amount of room allowed at
-the end of a line before hyphenation is tripped (e.g. if there's
-only 6 points left at the end of a line, groff won't try to hyphenate
-the next word).  <strong>HY MARGIN</strong> only applies if you're
-using
-<a href="#QUAD">QUAD</a>, and is really only useful if you're
-using <strong>QUAD LEFT</strong>.
+HY MARGIN sets the amount of room allowed at the end of a line
+before hyphenation is tripped (e.g. if there&#8217;s only 6 points
+left at the end of a line, groff won&#8217;t try to hyphenate the
+next word).  HY MARGIN only applies if you&#8217;re using
+<a href="#quad">QUAD</a>,
+and is really only useful if you&#8217;re using QUAD LEFT.
 </p>
 
 <p>
-As an example, if you don't want groff to hyphenate words when there's
-only 18 points of space left at the end of a left-quadded line,
-you'd enter
-
-<pre>
-    .HY MARGIN 18p
-</pre>
+As an example, if you don&#8217;t want groff to hyphenate words
+when there&#8217;s only 18 points of space left at the end of a
+left-quadded line, you&#8217;d enter
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em">
+  .HY MARGIN 18p
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> The numeric argument after <strong>HY
-MARGIN</strong> requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> The numeric argument after HY
+MARGIN requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 </p>
+</div>
 
-<h4><u>4. HY SPACE</u></h4>
+<h3 class="docs numbered">4.&nbsp;&nbsp;HY SPACE</h3>
 
 <p>
-<strong>HY SPACE</strong> sets an amount of extra interword
-space that groff will <em>try</em> to put between words on a
-line in order to PREVENT hyphenation.  <strong>HY SPACE</strong>
-applies only to
-<a href="definitions.html#TERMS_JUST">justified lines</a>.
-Generally speaking, you'll want this value to be quite small, since
-too big a value will result in lines with gaping holes between the
-words.  A reasonable value might be half a point, or one point,
-which you'd set with
-
-<pre>
-    .HY SPACE .5p
-        or
-    .HY SPACE 1p
-</pre>
+HY SPACE sets an amount of extra interword space that groff will try
+to put between words on a line in order to PREVENT hyphenation.  HY
+SPACE applies only to
+<a href="definitions.html#just">justified lines</a>.
+Generally speaking, you&#8217;ll want this value to be quite small,
+since too big a value will result in lines with gaping holes between
+the words.  A reasonable value might be half a point, or one point,
+which you&#8217;d set with
+<br/>
+<span class="pre-in-pp">
+  .HY SPACE .5p
+</span>
+or
+<span class="pre-in-pp" style="margin-bottom: -1em">
+  .HY SPACE 1p
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> The numeric argument after <strong>HY
-SPACE</strong> requires a
-<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> The numeric argument after HY SPACE
+requires a
+<a href="definitions.html#unitofmeasure">unit of measure</a>.
 </p>
+</div>
 
-<h4><u>5. HY DEFAULT</u></h4>
+<h3 class="docs numbered">5.&nbsp;&nbsp;HY DEFAULT</h3>
 
 <p>
-<strong>HY DEFAULT</strong> resets automatic hyphenation
-to its default behaviour, cancelling any changes made with
-<strong>HY</strong> <kbd>LINES</kbd>, <strong>HY</strong>
-<kbd>MARGIN</kbd>, and/or <strong>HY</strong> <kbd>SPACE</kbd>.
+HY DEFAULT resets automatic hyphenation to its default behaviour,
+cancelling any changes made with HY <kbd>LINES</kbd>, HY
+<kbd>MARGIN</kbd>, and/or HY <kbd>SPACE</kbd>.
 </p>
 
-<h4><u>A note on hyphenation in general</u></h4>
+<div class="box-notes">
+<h3 id="hyphenation-thoughts" class="docs notes">Thoughts on hyphenation in general</h3>
 
-<p>
-Hyphenation is a necessary evil.  If it can be avoided, it should be.
-If it can't be, it should occur infrequently.  That's the reason for
-the number of parameters you can set with <strong>HY</strong>.
+<p style="margin-top: .5em">
+Hyphenation is a necessary evil.  If it can be avoided, it
+should be.  If it can&#8217;t be, it should occur infrequently.
+That&#8217;s the reason for the number of parameters you can set
+with HY.
 </p>
 
-<p>
+<p class="tip-bottom">
 Furthermore, hyphenation in
-<a href="definitions.html#TERMS_RAG">rag</a>
+<a href="definitions.html#rag">rag</a>
 copy requires a great deal of attention.  At best, it should be
 avoided completely by individually adjusting the number of words
 on consecutive lines to achieve a pleasing, natural-looking rag.
 Since such adjustments are often too fussy for document processing,
-I recommend playing around with <strong>HY MARGIN</strong> a bit if
-your copy looks hyphen-heavy.
+I recommend playing around with HY MARGIN a bit if your copy looks
+hyphen-heavy.
 </p>
+</div>
 
 <!-- -HY_SET- -->
 
-<hr width="33%" align="left"/>
-
-<a name="HY_SET"><h3><u>Set hyphenation parameters all at once</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="hy-set" class="macro-id">Set hyphenation parameters all at once</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>HY_SET</strong> <kbd>&lt;lines&gt; [ &lt;margin&gt; [ &lt;space&gt; ] ]</kbd></nobr>
-<br/>
+<div class="box-macro-args">
+Macro: <b>HY_SET</b> <kbd class="macro-args">&lt;lines&gt; [ &lt;margin&gt; [ &lt;space&gt; ] ]</kbd>
+</div>
 
-Alias: <strong>HYSET</strong>
+<p class="alias">
+<i>Alias:</i> <b>HYSET</b>
 </p>
 
 <p>
-<strong>HY_SET</strong> lets you set the parameters for hyphenation
-with a single macro. <kbd><nobr>&lt;lines&gt;,</nobr></kbd>
-<kbd><nobr>&lt;margin&gt;</nobr></kbd> and
-<kbd><nobr>&lt;space&gt;</nobr></kbd> correspond to the numeric
+HY_SET lets you set the parameters for hyphenation
+with a single macro. <kbd>&lt;lines&gt;,</kbd>
+<kbd>&lt;margin&gt;</kbd> and
+<kbd>&lt;space&gt;</kbd> correspond to the numeric
 values required by <kbd>LINES</kbd>,
 <kbd>MARGIN</kbd> and <kbd>SPACE</kbd> as described
-<a href="#HY">above</a>.
+<a href="#hy">above</a>.
 </p>
 
 <p>
 To set just the maximum number of consecutive hyphenated lines,
-you'd enter
-
-<pre>
-    .HY_SET 2
-</pre>
-</p>
-
-<p>
-If you wanted the same number of maximum consecutive hyphenated lines
-and a hyphenation margin for use with
-<a href="definitions.html#TERMS_RAG">rag</a>
-copy,
-
-<pre>
-    .HY_SET 2 36p
-</pre>
-
+you&#8217;d enter
+<br/>
+<span class="pre-in-pp">
+  .HY_SET 2
+</span>
+If you wanted the same number of maximum consecutive hyphenated
+lines and a hyphenation margin for use with
+<a href="definitions.html#rag">rag</a>
+copy,
+<br/>
+<span class="pre-in-pp">
+  .HY_SET 2 36p
+</span>
 would set the hyphenation margin to 36 points.
 </p>
 
 <p>
 If you wanted the same number of maximum consecutive hyphenated
 lines and a hyphenation space of 2 points for use with
-<a href="definitions.html#TERMS_JUST">justified</a>
+<a href="definitions.html#just">justified</a>
 copy, 
-
-<pre>
-    .HYSET 2 0 2p
-</pre>
-
-is how you'd do it.
+<br/>
+<span class="pre-in-pp">
+  .HYSET 2 0 2p
+</span>
+is how you&#8217;d do it.
 </p>
 
 <!-- -RW- -->
 
-<hr width="33%" align="left"/>
-
-<a name="RW"><h3><u>Reduce whitespace</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>RW</strong> <kbd>&lt;amount of whitespace reduction between letters&gt;</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="rw" class="macro-id">Reduce whitespace</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>RW</b> <kbd class="macro-args">&lt;amount of whitespace reduction between letters&gt;</kbd>
+</div>
 
 <p>
-<strong>RW</strong> (Reduce Whitespace) and its corresponding macro,
-<strong>EW</strong> (Expand Whitespace), allow you to tighten
-(or loosen)
-<a href="definitions.html#TERMS_OUTPUTLINE">output lines</a>
+RW (<span style="text-decoration: underline;">R</span>educe <span style="text-decoration: underline;">W</span>hitespace)
+and its corresponding macro,
+EW (<span style="text-decoration: underline;">E</span>xpand <span style="text-decoration: underline;">W</span>hitespace),
+allow you to tighten (or loosen)
+<a href="definitions.html#outputline">output lines</a>
 by uniformly reducing or expanding the space between characters.
 This is particularly useful when you want to squeeze or stretch
 lines on a narrow measure.
 </p>
 
 <p>
-The value passed to <strong>RW</strong> may be a whole number or a
-decimal fraction.  Since a value of 1 produces a noticeable reduction
-in the space between letters at text sizes, you'll most likely use
-small decimal values when tightening lines.  For example,
-
-<pre>
-    .RW .1
-      or
-    .RW .2
-</pre>
-
-may be just enough to squeeze an extra character or two on a
-line without the change in letter spacing being obvious.  I
-highly recommend previewing your work to assess the effect of
-<strong>RW</strong>.
-</p>
-
-<p>
-<strong>IMPORTANT:</strong> In versions prior to 1.1.9-a,
-<strong>RW</strong> affected all
-<a href="definitions.html#TERMS_FONT">fonts</a>
-in the
-<a href="definitions.html#TERMS_FAMILY">family</a>
-current at the time it was invoked.  As of 1.1.9-a, this behaviour
-has been changed. <strong>RW</strong> affects only the font current
-at the time it's invoked, and remains in effect for that font every
-time the font is called, hence must be reset to zero to cancel its
-effect (<kbd>.RW 0</kbd>) on that font.
+The value passed to RW may be a whole number or a decimal fraction.
+Since a value of 1 produces a noticeable reduction in the space
+between letters at text sizes, you&#8217;ll most likely use small
+decimal values when tightening lines.  For example,
+<br/>
+<span class="pre-in-pp">
+  .RW .1
+</span>
+or
+<span class="pre-in-pp">
+  .RW .2
+</span>
+may be just enough to squeeze an extra character or two on a line
+without the change in letter spacing being obvious.  I highly
+recommend previewing your work to assess the effect of RW.
 </p>
 
-<p>
-<strong>NOTE:</strong> By default, <strong>RW</strong> does not deposit a 
-<a href="#BR">break</a>
-when it's invoked if you're in one of the
-<a href="definitions.html#TERMS_FILL">fill</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> By default, RW does not deposit a 
+<a href="#br">break</a>
+when it&#8217;s invoked if you&#8217;re in one of the
+<a href="definitions.html#fill">fill</a>
 modes (i.e.
-<a href="#QUAD">QUAD</a>
-<strong>L, R, C, J</strong> or
-<a href="#JUSTIFY">JUSTIFY</a>).
+<a href="#quad">QUAD</a>
+L, R, C, J or
+<a href="#justify">JUSTIFY</a>).
 If you want
-<strong>RW</strong> to break at the ends of the previous
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
-while you're in a fill mode, tell <strong>mom</strong>
-that's what you want by invoking the
-<a href="#BR_AT_LINE_KERN"><kbd>.BR_AT_LINE_KERN</kbd></a>
-toggle macro.
+RW to break at the ends of the previous
+<a href="definitions.html#inputline">input lines</a>
+while you&#8217;re in a fill mode, tell mom
+that&#8217;s what you want by invoking
+<kbd><a href="#br-at-line-kern">.BR_AT_LINE_KERN</a></kbd>.
+</p>
+</div>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> In versions prior to
+1.1.9-a, RW affected all
+<a href="definitions.html#font">fonts</a>
+in the
+<a href="definitions.html#family">family</a>
+current at the time it was invoked.  As of 1.1.9-a, this behaviour
+has been changed. RW affects only the font current at the time
+it&#8217;s invoked, and remains in effect for that font every time
+the font is called, hence must be reset to zero to cancel its effect
+(<kbd>.RW&nbsp;0</kbd>) on that font.
 </p>
+</div>
 
 <!-- -EW- -->
 
-<hr width="33%" align="left"/>
-
-<a name="EW"><h3><u>Expand whitespace</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="ew" class="macro-id">Expand whitespace</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>EW</strong> <kbd>&lt;amount of whitespace expansion between letters&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>EW</b> <kbd class="macro-args">&lt;amount of whitespace expansion between letters&gt;</kbd>
+</div>
 
 <p>
-<strong>EW</strong> (Expand Whitespace) expands the amount of
-whitespace between letters, effectively &quot;loosening&quot; lines
-of type.
+EW (<span style="text-decoration: underline;">E</span>xpand <span style="text-decoration: underline;">W</span>hitespace)
+expands the amount of whitespace between letters, effectively
+&#8220;loosening&#8221; lines of type.
 </p>
 
 <p>
-The value passed to <strong>EW</strong> may be a whole number or a
-decimal fraction.  Since a value of 1 produces a noticeable
-expansion in the space between letters at text sizes, you'll most likely use
-small decimal values when loosening lines.  For example,
-
-<pre>
-    .EW .1
-      or
-    .EW .2
-</pre>
-
+The value passed to EW may be a whole number or a decimal fraction.
+Since a value of 1 produces a noticeable expansion in the space
+between letters at text sizes, you&#8217;ll most likely use small
+decimal values when loosening lines.  For example,
+<br/>
+<span class="pre-in-pp">
+  .EW .1
+</span>
+or
+<span class="pre-in-pp">
+  .EW .2
+</span>
 may be just enough to open up a line without the change in letter
 spacing being obvious.  I highly recommend previewing your work to
-assess the effect of <strong>EW</strong>.
-</p>
-
-<p>
-<strong>IMPORTANT:</strong> In versions prior to 1.1.9-a,
-<strong>EW</strong> affected all
-<a href="definitions.html#TERMS_FONT">fonts</a>
-in the
-<a href="definitions.html#TERMS_FAMILY">family</a>
-current at the time it was invoked.  As of 1.1.9-a, this behaviour
-has been changed.  <strong>EW</strong> affects only the font
-current at the time it's invoked, and remains in effect for that
-font every time the font is called, hence must be reset to zero to
-cancel its effect (<kbd>.EW 0</kbd>) on that font.
+assess the effect of EW.
 </p>
 
-<p>
-<strong>NOTE:</strong> By default, <strong>EW</strong> does not deposit a 
-<a href="#BR">break</a>
-when it's invoked if you're in one of the
-<a href="definitions.html#TERMS_FILL">fill</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> By default, EW does not deposit a 
+<a href="#br">break</a>
+when it&#8217;s invoked if you&#8217;re in one of the
+<a href="definitions.html#fill">fill</a>
 modes (i.e.
-<a href="#QUAD">QUAD</a>
-<strong>L, R, C, J</strong> or
-<a href="#JUSTIFY">JUSTIFY</a>).
+<a href="#quad">QUAD</a>
+L, R, C, J or
+<a href="#justify">JUSTIFY</a>).
 If you want
-<strong>EW</strong> to break at the ends of the previous
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
-while you're in a fill mode, tell <strong>mom</strong>
-that's what you want by invoking the
-<a href="#BR_AT_LINE_KERN"><kbd>.BR_AT_LINE_KERN</kbd></a>
+EW to break at the ends of the previous
+<a href="definitions.html#inputline">input lines</a>
+while you&#8217;re in a fill mode, tell mom that&#8217;s what you
+want by invoking the
+<kbd><a href="#br-at-line-kern">.BR_AT_LINE_KERN</a></kbd>
 toggle macro.
 </p>
+</div>
 
-<!-- -BR_AT_LINE_KERN- -->
-
-<hr width="33%" align="left"/>
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> In versions prior to
+1.1.9-a, EW affected all
+<a href="definitions.html#font">fonts</a>
+in the
+<a href="definitions.html#family">family</a>
+current at the time it was invoked.  As of 1.1.9-a, this behaviour
+has been changed.  EW affects only the font current at the time
+it&#8217;s invoked, and remains in effect for that font every time
+the font is called, hence must be reset to zero to cancel its effect
+(<kbd>.EW&nbsp;0</kbd>) on that font.
+</p>
+</div>
 
-<a name="BR_AT_LINE_KERN"><h3><u>Break before line kerning</u></h3></a>
+<!-- -BR_AT_LINE_KERN- -->
 
-<p>
-<nobr>Macro: <strong>BR_AT_LINE_KERN</strong> <kbd>toggle</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="br-at-line-kern" class="macro-id">Break before line kerning</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>BR_AT_LINE_KERN</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
 By default, in
-<a href="definitions.html#TERMS_FILLED">fill</a>
+<a href="definitions.html#filled">fill</a>
 modes (i.e.
-<a href="#QUAD">QUAD</a>
-<strong>L, R, C, J</strong> or
-<a href="#JUSTIFY">JUSTIFY</a>)
-<strong>mom</strong> does not break
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
+<a href="#quad">QUAD</a>
+L, R, C, J or
+<a href="#justify">JUSTIFY</a>)
+mom does not break
+<a href="definitions.html#inputline">input lines</a>
 when you invoke
-<a href="#RW">RW</a>
+<a href="#rw">RW</a>
 or
-<a href="#EW">EW</a>.
-If you'd like her to break input lines prior to <strong>RW</strong>
-or <strong>EW</strong>, invoke <kbd>.BR_AT_INPUT_LINE</kbd>
-without any argument.  To disable the breaks, invoke
-<kbd>.BR_AT_INPUT_LINE</kbd> with any argument (<strong>OFF, QUIT,
-Q, X</strong>...), like this
-
-<pre>
-    .BR_AT_LINE_KERN OFF
-        or
-    .BR_AT_LINE_KERN X
-</pre>
-</p>
-
-<p>
-With <strong>QUAD L, R</strong> or <strong>C</strong>,
-<strong>mom</strong> simply breaks the line.  With <strong>QUAD
-J</strong> (or just <strong>JUSTIFY</strong>, which is the same
-thing), she breaks and
-<a href="definitions.html#TERMS_FORCE">force justifies</a>
+<a href="#ew">EW</a>.
+If you&#8217;d like her to break input lines prior to RW or EW,
+invoke <kbd>.BR_AT_INPUT_LINE</kbd> without any argument.  To
+disable the breaks, invoke <kbd>.BR_AT_INPUT_LINE</kbd> with any
+argument (OFF, QUIT, Q, X...), like this
+<br/>
+<span class="pre-in-pp">
+  .BR_AT_LINE_KERN OFF
+</span>
+or
+<span class="pre-in-pp">
+  .BR_AT_LINE_KERN X
+</span>
+With QUAD L, R or C, mom simply breaks the line.  With QUAD J (or
+just JUSTIFY, which is the same thing), she breaks and
+<a href="definitions.html#force">force justifies</a>
 the line prior to <kbd>.EW</kbd> or <kbd>.RW</kbd>.
 </p>
 
 <!-- -KERN- -->
 
-<hr width="33%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="kern" class="macro-id">Automatic kerning</h3>
+</div>
 
-<a name="KERN"><h3><u>Automatic kerning</u></h3></a>
+<div class="box-macro-args">
+Macro: <b>KERN</b> <kbd class="macro-args">toggle</kbd>
+</div>
 
 <p>
-<nobr>Macro: <strong>KERN</strong> <kbd>toggle</kbd></nobr>
-</p>
-
-<p>
-By itself (i.e. with no argument), <strong>KERN</strong> turns
-automatic pairwise
-<a href="definitions.html#TERMS_KERN">kerning</a>
+By itself (i.e. with no argument), KERN turns automatic pairwise
+<a href="definitions.html#kern">kerning</a>
 on.  With any argument (e.g. OFF, Q, X), pairwise kerning is turned
 off.
 </p>
 
 <p>
-Kerning of individual character pairs can be controlled with
-the <a href="definitions.html#TERMS_INLINES">inline escapes</a>
-<kbd><nobr>\*[BU &lt;n&gt;]</nobr></kbd> and
-<kbd><nobr>\*[FU &lt;n&gt;]</nobr></kbd>.  See
-<a href="inlines.html#INLINE_KERNING_MOM">Inline Escapes, kerning</a>.
+Kerning of individual character pairs can be controlled with the
+<a href="definitions.html#inlines">inline escapes</a>
+<kbd>\*[BU &lt;n&gt;]</kbd> and
+<kbd>\*[FU &lt;n&gt;]</kbd>.  See
+<a href="inlines.html#inline-kerning-mom">Inline Escapes, kerning</a>.
 </p>
 
 <!-- -LIGATURES- -->
 
-<hr width="33%" align="left"/>
-
-<a name="LIGATURES"><h3><u>Automatic ligature generation</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>LIGATURES</strong> <kbd>toggle</kbd></nobr>
-<br/>
-
-Alias: <strong>LIG</strong>
+<div class="macro-id-overline">
+<h3 id="ligatures" class="macro-id">Automatic ligature generation</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>LIGATURES</b> <kbd class="macro-args">toggle</kbd>
+</div>
+<p class="alias">
+<i>Alias:</i> <b>LIG</b>
 </p>
 
 <p>
 Provided your current font has
-<a href="definitions.html#TERMS_LIGATURES">ligatures</a>,
-<strong>LIGATURES</strong>, by itself, turns on automatic
-generation of ligatures.  When automatic ligature generation is
-on, simply typing the letters of a ligature combination will
-produce the correct ligature upon output.  For example, if you
-type the word &quot;finally&quot;, the fi combination will be
-output as an fi ligature.  Generally speaking, ligatures are A
-Good Thing, hence <strong>mom</strong> has them on by default.
+<a href="definitions.html#ligatures">ligatures</a>,
+LIGATURES, by itself, turns on automatic generation of ligatures.
+When automatic ligature generation is on, simply typing the letters
+of a ligature combination will produce the correct ligature upon
+output.  For example, if you type the word &#8220;finally&#8221;,
+the fi combination will be output as an fi ligature.  Generally
+speaking, ligatures are A Good Thing, hence mom has them on by
+default.
 </p>
 
 <p>
-<strong>LIGATURES</strong> with any argument turns automatic
-ligature generation off.
+LIGATURES with any argument turns automatic ligature generation off.
 </p>
 
-<p>
-<strong>NOTE:</strong> Not all fonts support ligatures.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> Not all fonts support ligatures.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="MODIFICATIONS"><h2><u>Type modifications:
-<br/>
-
-pseudo-italic, -bold, -condensed, -extended</u></h2></a>
+<h2 id="modifications-intro" class="macro-group">Type modifications (pseudo font styles)</h2>
 
 <p>
 It sometimes happens that a PostScript 
-<a href="definitions.html#TERMS_FAMILY">family</a>
-doesn't contain all the fonts you need.  You might, for example, be
-missing an italic font, or a bold font.  Or you might not be able to
-get your hands on a condensed family.  That's where these macros and
-inline escapes come in.  With them, you can fake the fonts you're
-missing.  A word of caution, though: &quot;faked&quot; fonts are
-just that &mdash; faked.  You should only use them as a last resort, and
-then only sparingly.  A word or two or a line or two in a faked font
-will pass unnoticed; large patches of type in a faked font look
-typographically cheap.
-</p>
-
-<a name="INDEX_MODIFICATIONS"><h3><u>Type modifications macro list</u></h3></a>
-
-<ul>
-    <li><strong>Pseudo italic</strong></li>
-    <ul>
-        <li><a href="#SETSLANT">SETSLANT</a> &mdash; degree of pseudo-italicizing</li>
-        <li><a href="#SLANT_INLINE">\*[SLANT]</a> &mdash; inline escape for pseudo-italicizing type</li>
-    </ul>
-    <li><strong>Pseudo bold</strong></li>
-    <ul>
-        <li><a href="#SETBOLDER">SETBOLDER</a> &mdash; amount of emboldening</li>
-        <li><a href="#BOLDER_INLINE">\*[BOLDER]</a> &mdash; inline escape for emboldening type</li>
-    </ul>
-    <li><strong>Pseudo condensed</strong></li>
-    <ul>
-        <li><a href="#CONDENSE">CONDENSE</a> &mdash; percentage for pseudo-condensed type</li>
-        <li><a href="#COND_INLINE">\*[COND]</a> &mdash; inline escape for pseudo-condensed type</li>
-    </ul>
-    <li><strong>Pseudo extended</strong></li>
-    <ul>
-        <li><a href="#EXTEND">EXTEND</a> &mdash; percentage for pseudo-extended type</li>
-        <li><a href="#EXT_INLINE">\*[EXT]</a> &mdash; inline escape for pseudo-extending</li>
-    </ul>
+<a href="definitions.html#family">family</a>
+doesn&#8217;t contain all the fonts you need.  You might, for
+example, be missing an italic font, or a bold font.  Or you might
+not be able to get your hands on a condensed family.  That&#8217;s
+where these macros and inline escapes come in.  With them, you
+can fake the fonts you&#8217;re missing.  A word of caution,
+though: &#8220;faked&#8221; fonts are just that&mdash;faked.  You
+should only use them as a last resort, and then only sparingly.  A
+word or two or a line or two in a faked font will pass unnoticed;
+large patches of type in a faked font look typographically cheap.
+</p>
+
+<div id="index-modifications" class="macro-list-container">
+<h3 class="macro-list">Type modifications macros</h3>
+
+<ul class="macro-list">
+  <li>Pseudo italic
+  <ul style="list-style: none; margin-left: -1em;">
+    <li><a href="#setslant">SETSLANT</a> &ndash; degree of pseudo-italicizing</li>
+    <li><a href="#slant-inline">\*[SLANT]</a> &ndash; inline escape for pseudo-italicizing type</li>
+  </ul></li>
+  <li>Pseudo bold
+  <ul style="list-style: none; margin-left: -1em;">
+    <li><a href="#setbolder">SETBOLDER</a> &ndash; amount of emboldening</li>
+    <li><a href="#bolder-inline">\*[BOLDER]</a> &ndash; inline escape for emboldening type</li>
+  </ul></li>
+  <li>Pseudo condensed
+  <ul style="list-style: none; margin-left: -1em;">
+    <li><a href="#condense">CONDENSE</a> &ndash; percentage for pseudo-condensed type</li>
+    <li><a href="#cond-inline">\*[COND]</a> &ndash; inline escape for pseudo-condensed type</li>
+  </ul></li>
+  <li>Pseudo extended
+  <ul style="list-style: none; margin-left: -1em;">
+    <li><a href="#extend">EXTEND</a> &ndash; percentage for pseudo-extended type</li>
+    <li><a href="#ext-inline">\*[EXT]</a> &ndash; inline escape for pseudo-extending</li>
+  </ul></li>
 </ul>
+</div>
 
 <!-- -SETSLANT- -->
 
-<hr width="66%" align="left"/>
-
-<a name="SETSLANT"><h3><u>Set degree of slant for pseudo-italicizing</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>SETSLANT</strong> <kbd>&lt;degrees to slant type&gt; | RESET</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="setslant" class="macro-id">Set degree of slant for pseudo-italicizing</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SETSLANT</b> <kbd class="macro-args">&lt;degrees to slant type&gt; | RESET</kbd>
+</div>
 
 <p>
 Pseudo-italicizing of type is accomplished by slanting a roman font
-a certain number of degrees to the right. <strong>SETSLANT</strong>
-lets you fix the number of degrees. <strong>Mom</strong>'s default
-is 15, which produces an acceptable approximation of an italic font.
-If you want another value &mdash; say, 13 degrees &mdash; you'd set
-it by entering
-
-<pre>
-    .SETSLANT 13
-</pre>
-</p>
-
-<p>
-If you change the degree of slant and later want to set it back
-to the <strong>mom</strong> default, do
-
-<pre>
-    .SETSLANT RESET
-</pre>
-</p>
-
-<p>
-<strong>NOTE:</strong> By itself, <strong>SETSLANT</strong> will not
-start pseudo-italicizing type; it merely tells <strong>mom</strong>
-what degree of slant you want.  To start pseudo-italicizing, use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+a certain number of degrees to the right. SETSLANT lets you fix the
+number of degrees. Mom&#8217;s default is 15, which produces an
+acceptable approximation of an italic font.  If you want another
+value&mdash;say, 13 degrees&mdash;you&#8217;d set it by entering
+<br/>
+<span class="pre-in-pp">
+  .SETSLANT 13
+</span>
+If you change the degree of slant and later want to set it back to
+the mom default, do
+<br/>
+<span class="pre-in-pp">
+  .SETSLANT RESET
+</span>
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> By itself, SETSLANT will not start
+pseudo-italicizing type; it merely tells mom what degree of slant
+you want.  To start pseudo-italicizing, use the
+<a href="definitions.html#inlines">inline escape</a>
 <kbd>\*[SLANT]</kbd>.
 </p>
+</div>
 
 <!-- -\*[SLANT]- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SLANT_INLINE"><h3><u>Pseudo italic on/off</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="slant-inline" class="macro-id">Pseudo italic on/off</h3>
+</div>
 
-<p>
-Inline: <kbd>\*[SLANT] &mdash; turn pseudo-italic on</kbd>
+<div class="box-macro-args">
+Inline: <kbd class="macro-args">\*[SLANT]</kbd>
 <br/>
-
-Inline: <kbd>\*[SLANTX] &mdash; turn pseudo-italic off</kbd>
-</p>
+Inline: <kbd class="macro-args">\*[SLANTX</kbd>]
+</div>
 
 <p>
-<kbd>\*[SLANT]</kbd> begins pseudo-italicizing type.
-<kbd>\*[SLANTX]</kbd> turns the feature off.  Both are
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
+<kbd class="macro-args">\*[SLANT]</kbd> begins pseudo-italicizing type.
+<kbd class="macro-args">\*[SLANTX]</kbd> turns the feature off.  Both are
+<a href="definitions.html#inlines">inline escapes</a>,
 therefore they should not appear as separate lines, but rather be
 embedded in text lines, like this:
-
-<pre>
-    Not \*[SLANT]everything\*[SLANTX] is as it seems.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  Not \*[SLANT]everything\*[SLANTX] is as it seems.
+</span>
 Alternatively, if you wanted the whole line pseudo-italicized,
-you'd do
-
-<pre>
-    \*[SLANT]Not everything is as it seems.\*[SLANTX]
-</pre>
-</p>
-
-<p>
+you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  \*[SLANT]Not everything is as it seems.\*[SLANTX]
+</span>
 Once <kbd>\*[SLANT]</kbd> is invoked, it remains in effect until
 turned off.
 </p>
 
-<p>
-<strong>NOTE:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-tip" style="margin-top: .5em;">
+<p class="tip">
+<span class="note">Note:</span> If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<strong>mom</strong> underlines pseudo-italics by default.  To
-change this behaviour, use the special macro
-<a href="docprocessing.html#TYPEWRITE_CONTROL">SLANT_MEANS_SLANT</a>.
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+mom underlines pseudo-italics by default.  To change this behaviour,
+use the special macro
+<a href="docprocessing.html#typewrite-control">SLANT_MEANS_SLANT</a>.
 </p>
+</div>
 
 <!-- -SETBOLDER- -->
 
-<hr width="33%" align="left"/>
-
-<a name="SETBOLDER"><h3><u>Set amount of emboldening</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>SETBOLDER</strong> <kbd>&lt;amount of emboldening, in machine units&gt; | RESET</kbd></nobr>
-</p>
-
-<p>
-Emboldening of type is accomplished by printing characters
-twice; the second printing is slightly offset from the first,
-effectively &quot;thickening&quot; the character.
-<strong>SETBOLDER</strong> lets you set the number of
-<a href="definitions.html#TERMS_UNITS">machine units</a>
-for the offset.  <strong>Mom</strong>'s default is 700 units, which
-produces an acceptable approximation of a bold font.  If you want
-another value &mdash; say, 500 units &mdash; you'd set it by entering
-
-<pre>
-    .SETBOLDER 500
-</pre>
-</p>
-
-<p>
+<div class="macro-id-overline">
+<h3 id="setbolder" class="macro-id">Set amount of emboldening</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>SETBOLDER</b> <kbd class="macro-args">&lt;amount of emboldening, in machine units&gt; | RESET</kbd>
+</div>
+
+<p>
+Emboldening of type is accomplished by printing characters twice;
+the second printing is slightly offset from the first, effectively
+&#8220;thickening&#8221; the character.  SETBOLDER lets you set the
+number of
+<a href="definitions.html#units">machine units</a>
+for the offset.  Mom&#8217;s default is 700 units, which produces an
+acceptable approximation of a bold font.  If you want another
+value&mdash;say, 500 units&mdash;you&#8217;d set it by entering
+<br/>
+<span class="pre-in-pp">
+  .SETBOLDER 500
+</span>
 If you change the emboldening offset and later want to set it back
-to the <strong>mom</strong> default, do
-
-<pre>
-    .SETBOLDER RESET
-</pre>
+to the mom default, do
+<br/>
+<span class="pre-in-pp">
+  .SETBOLDER RESET
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> By itself, <strong>SETBOLDER</strong>
-will not start emboldening type; it merely tells
-<strong>mom</strong> what you want the emboldening offset to be.
-To start emboldening, use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> By itself, SETBOLDER will not start
+emboldening type; it merely tells mom what you want the emboldening
+offset to be.  To start emboldening, use the
+<a href="definitions.html#inlines">inline escape</a>
 <kbd>\*[BOLDER]</kbd>.
 </p>
+</div>
 
 <!-- -\*[BOLDER]- -->
 
-<hr width="66%" align="left"/>
-
-<a name="BOLDER_INLINE"><h3><u>Emboldening on/off</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="bolder-inline" class="macro-id">Emboldening on/off</h3>
+</div>
 
-<p>
-Inline: <kbd>\*[BOLDER] &mdash; turn emboldening on</kbd>
+<div class="box-macro-args">
+Inline: <kbd class="macro-args">\*[BOLDER]</kbd>
 <br/>
-
-Inline: <kbd>\*[BOLDERX] &mdash; turn emboldening off</kbd>
-</p>
-
-<p>
-<kbd>\*[BOLDER]</kbd> begins emboldening type.
-<kbd>\*[BOLDERX]</kbd> turns the feature off.  Both are
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
-therefore they should not appear as separate lines, but rather
-be embedded in text lines, like this:
-
-<pre>
-    Not \*[BOLDER]everything\*[BOLDERX] is as it seems.
-</pre>
-</p>
+Inline: <kbd class="macro-args">\*[BOLDERX]</kbd>
+</div>
 
 <p>
+<kbd class="macro-args">\*[BOLDER]</kbd> begins emboldening type.
+<kbd class="macro-args">\*[BOLDERX]</kbd> turns the feature off.  Both are
+<a href="definitions.html#inlines">inline escapes</a>,
+therefore they should not appear as separate lines, but rather be
+embedded in text lines, like this:
+<br/>
+<span class="pre-in-pp">
+  Not \*[BOLDER]everything\*[BOLDERX] is as it seems.
+</span>
 Alternatively, if you wanted the whole line emboldened,
-you'd do
-
-<pre>
-    \*[BOLDER]Not everything is as it seems.\*[BOLDERX]
-</pre>
-</p>
-
-<p>
+you&#8217;d do
+<br/>
+<span class="pre-in-pp">
+  \*[BOLDER]Not everything is as it seems.\*[BOLDERX]
+</span>
 Once <kbd>\*[BOLDER]</kbd> is invoked, it remains in effect
 until turned off.
 </p>
 
-<p>
-<strong>NOTE:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<strong>mom</strong> ignores <kbd>\*[BOLDER]</kbd> requests.
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+mom ignores <kbd>\*[BOLDER]</kbd> requests.
 </p>
+</div>
 
 <!-- -CONDENSE- -->
 
-<hr width="33%" align="left"/>
-
-<a name="CONDENSE"><h3><u>Set percentage for pseudo-condensed type</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>CONDENSE</strong> <kbd>&lt;pseudo-condense percentage&gt;</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="condense" class="macro-id">Set percentage for pseudo-condensed type</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>CONDENSE</b> <kbd class="macro-args">&lt;pseudo-condense percentage&gt;</kbd>
+</div>
 
 <p>
 Pseudo-condensing of type is accomplished by reducing the width of
 characters at a given point size without reducing their height,
 effectively narrowing them so they look like condensed type.
-<strong>CONDENSE</strong> tells <strong>mom</strong> what
-percentage of the normal character width you want the characters
-to be condensed.
-</p>
-
-<p>
-<strong>Mom</strong> has no default value for
-<strong>CONDENSE</strong>, therefore you must set it before using
-the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<a href="#COND_INLINE"><kbd>\*[COND]</kbd></a>.
-80 percent of the normal character width is a good value, and you'd
-set it like this:
-
-<pre>
-    .CONDENSE 80
-</pre>
+CONDENSE tells mom what percentage of the normal character width you
+want the characters to be condensed.
 </p>
 
 <p>
-<strong>NOTE:</strong> By itself, <strong>CONDENSE</strong> will not
-start pseudo-condensing type; it merely tells <strong>mom</strong>
-what percentage of the normal character width you want characters to
-be condensed.  To start pseudo-condensing, use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+Mom has no default value for CONDENSE, therefore you must set it
+before using the
+<a href="definitions.html#inlines">inline escape</a>
+<kbd><a href="#cond-inline">\*[COND]</a></kbd>.
+80 percent of the normal character width is a good value, and
+you&#8217;d set it like this:
+<br/>
+<span class="pre-in-pp">
+  .CONDENSE 80
+</span>
+</p>
+
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> By itself, CONDENSE will not start
+pseudo-condensing type; it merely tells mom what percentage of the
+normal character width you want characters to be condensed.  To
+start pseudo-condensing, use the
+<a href="definitions.html#inlines">inline escape</a>
 <kbd>\*[COND]</kbd>.
 </p>
 
-<p>
-<strong>Additional note:</strong> Make sure that pseudo-condensing
-is off (with
-<a href="#COND_INLINE"><kbd>\*[CONDX]</kbd></a>)
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span> Make sure that
+pseudo-condensing is off (with
+<kbd><a href="#cond-inline">\*[CONDX]</a></kbd>)
 before before making any changes to the pseudo-condense percentage
-with <strong>CONDENSE</strong>.
+with CONDENSE.
 </p>
+</div>
 
 <!-- -\*[COND]- -->
 
-<hr width="33%" align="left"/>
-
-<a name="COND_INLINE"><h3><u>Pseudo-condensing on/off</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="cond-inline" class="macro-id">Pseudo-condensing on/off</h3>
+</div>
 
-<p>
-Inline: <kbd>\*[COND] &mdash; turn pseudo-condensing on</kbd>
+<div class="box-macro-args">
+Inline: <kbd class="macro-args">\*[COND]</kbd>
 <br/>
-
-Inline: <kbd>\*[CONDX] &mdash; turn pseudo-condensing off</kbd>
-</p>
+Inline: <kbd class="macro-args">\*[CONDX]</kbd>
+</div>
 
 <p>
 <kbd>\*[COND]</kbd> begins pseudo-condensing type.
 <kbd>\*[CONDX]</kbd> turns the feature off.  Both are
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
-therefore they should not appear as separate lines, but rather
-be embedded in text lines, like this:
-
-<pre>
-    \*[COND]Not everything is as it seems.\*[CONDX]
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#inlines">inline escapes</a>,
+therefore they should not appear as separate lines, but rather be
+embedded in text lines, like this:
+<br/>
+<span class="pre-in-pp">
+  \*[COND]Not everything is as it seems.\*[CONDX]
+</span>
 <kbd>\*[COND]</kbd> remains in effect until you turn it
 off with <kbd>\*[CONDX]</kbd>.
 </p>
 
-<p>
-<strong>IMPORTANT:</strong> You MUST turn <kbd>\*[COND]</kbd>
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> You must turn
+<kbd>\*[COND]</kbd>
 off before making any changes to the point size of your type, either
 via the
-<a href="#PS">PT_SIZE</a>
+<a href="#ps">PT_SIZE</a>
 macro or with the <kbd>\s</kbd> inline escape.  If you wish
 the new point size to be pseudo-condensed, simply reinvoke
 <kbd>\*[COND]</kbd> afterwards.  Equally, <kbd>\*[COND]</kbd> must
 be turned off before changing the condense percentage with
-<a href="#CONDENSE">CONDENSE</a>.
+<kbd><a href="#condense">.CONDENSE</a></kbd>.
 </p>
+</div>
 
-<p>
-<strong>NOTE:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<strong>mom</strong> ignores <kbd>\*[COND]</kbd> requests.
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+mom ignores <kbd>\*[COND]</kbd> requests.
 </p>
+</div>
 
 <!-- -EXTEND- -->
 
-<hr width="33%" align="left"/>
-
-<a name="EXTEND"><h3><u>Set percentage for pseudo-extended type</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="extend" class="macro-id">Set percentage for pseudo-extended type</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>EXTEND</strong> <kbd>&lt;pseudo-extend percentage&gt;</kbd></nobr>
-</p>
+<div class="box-macro-args">
+Macro: <b>EXTEND</b> <kbd class="macro-args">&lt;pseudo-extend percentage&gt;</kbd>
+</div>
 
 <p>
-Pseudo-extending of type is accomplished by increasing the width
-of characters at a given point size without increasing their
-height, effectively widening them so they look like extended
-type. <strong>EXTEND</strong> tells <strong>mom</strong> what
-percentage of the normal character width you want the characters to
-be extended.
+Pseudo-extending of type is accomplished by increasing the width of
+characters at a given point size without increasing their height,
+effectively widening them so they look like extended type. EXTEND
+tells mom what percentage of the normal character width you want the
+characters to be extended.
 </p>
 
 <p>
-<strong>Mom</strong> has no default value for
-<strong>EXTEND</strong>, therefore you must set it before
-using the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<a href="#EXT_INLINE"><kbd>\*[EXT]</kbd></a>.
-120% of the normal character width is a good value, and you'd set it
-like this:
-
-<pre>
-    .EXTEND 120
-</pre>
+Mom has no default value for EXTEND, therefore you must set it
+before using the
+<a href="definitions.html#inlines">inline escape</a>
+<kbd><a href="#ext-inline">\*[EXT]</a></kbd>.
+120% of the normal character width is a good value, and you&#8217;d
+set it like this:
+<br/>
+<span class="pre-in-pp">
+  .EXTEND 120
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> By itself, <strong>EXTEND</strong> will not
-start pseudo-extending type; it merely tells <strong>mom</strong>
-what percentage of the normal character width you want characters to
-be extended.  To start pseudo-extending, use the
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> By itself, EXTEND will not start
+pseudo-extending type; it merely tells mom what percentage of the
+normal character width you want characters to be extended.  To start
+pseudo-extending, use the
+<a href="definitions.html#inlines">inline escape</a>
 <kbd>\*[EXT]</kbd>.
 </p>
 
-<p>
-<strong>Additional note:</strong> Make sure that pseudo-extending is
-off (with
-<a href="#EXT_INLINE"><kbd>\*[EXTX]</kbd></a>)
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span> Make sure that
+pseudo-extending is off (with
+<a href="#ext-inline"><kbd>\*[EXTX]</kbd></a>)
 before before making any changes to the pseudo-extend percentage
-with <strong>EXTEND</strong>.
+with EXTEND.
 </p>
+</div>
 
 <!-- -\*[EXT]- -->
 
-<hr width="33%" align="left"/>
-
-<a name="EXT_INLINE"><h3><u>Pseudo-extending on/off</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="ext-inline" class="macro-id">Pseudo-extending on/off</h3>
+</div>
 
-<p>
-Inline: <kbd>\*[EXT] &mdash; turn pseudo-extending on</kbd>
+<div class="box-macro-args">
+Inline: <kbd class="macro-args">\*[EXT]</kbd>
 <br/>
-
-Inline: <kbd>\*[EXTX] &mdash; turn pseudo-extending off</kbd>
-</p>
+Inline: <kbd class="macro-args">\*[EXTX]</kbd>
+</div>
 
 <p>
 <kbd>\*[EXT]</kbd> begins pseudo-extending type.
 <kbd>\*[EXTX]</kbd> turns the feature off.  Both are
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>,
-therefore they should not appear as separate lines, but rather
-be embedded in text lines, like this:
-
-<pre>
-    \*[EXT]Not everything is as it seems.\*[EXTX]
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#inlines">inline escapes</a>,
+therefore they should not appear as separate lines, but rather be
+embedded in text lines, like this:
+<br/>
+<span class="pre-in-pp">
+  \*[EXT]Not everything is as it seems.\*[EXTX]
+</span>
 <kbd>\*[EXT]</kbd> remains in effect until you turn it off with
 <kbd>\*[EXTX]</kbd>.
 </p>
 
-<p>
-<strong>IMPORTANT:</strong> You MUST turn <kbd>\*[EXT]</kbd> off
-before making any changes to the point size of your type, either via
-the
-<a href="#PS">PT_SIZE</a>
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> You must turn
+<kbd>\*[EXT]</kbd> off before making any changes to the point size
+of your type, either via the
+<a href="#ps">PT_SIZE</a>
 macro or with the <kbd>\s</kbd> inline escape.  If you wish the new
 point size to be pseudo-extended, simply reinvoke <kbd>\*[EXT]</kbd>
 afterwards.  Equally, <kbd>\*[EXT]</kbd> must be turned off before
 changing the extend percentage with
-<a href="#EXTEND">EXTEND</a>.
+<a href="#extend">EXTEND</a>.
 </p>
-
-<p>
-<strong>NOTE:</strong> If you're using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>
+</div>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> If you&#8217;re using the
+<a href="docprocessing.html#docprocessing">document processing macros</a>
 with
-<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
-<strong>mom</strong> ignores <kbd>\*[EXT]</kbd> requests.
+<a href="docprocessing.html#printstyle">PRINTSTYLE TYPEWRITE</a>,
+mom ignores <kbd>\*[EXT]</kbd> requests.
 </p>
+</div>
 
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="ALDRLD"><h2><u>Vertical movement</u></h2></a>
+<h2 id="aldrld-intro" class="macro-group">Vertical movements</h2>
 
 The two macros in this section allow you to move down or up on the
 page relative to the current
-<a href="definitions.html#TERMS_BASELINE">baseline</a>.
-
-<a name="INDEX_ALDRLD"><h3><u>Vertical movement macro list</u></h3></a>
+<a href="definitions.html#baseline">baseline</a>.
 
-<ul>
-    <li><a href="#ALD">ALD</a> &mdash; Advance Lead</li>
-    <li><a href="#RLD">RLD</a> &mdash; Reverse Lead</li>
+<div id="index-aldrld" class="macro-list-container">
+<h3 class="macro-list">Vertical movements macros</h3>
+<ul class="macro-list">
+  <li><a href="#ald">ALD</a> &ndash; Advance Lead</li>
+  <li><a href="#rld">RLD</a> &ndash; Reverse Lead</li>
 </ul>
+</div>
 
 <!-- -ALD- -->
 
-<hr width="66%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="ald" class="macro-id">Advance Lead (move downward)</h3>
+</div>
 
-<a name="ALD"><h3><u>Advance Lead (move downward)</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>ALD</strong> <kbd>&lt;distance to move downward&gt;</kbd></nobr>
-<br/>
-
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>ALD</b> <kbd class="macro-args">&lt;distance to move downward&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>ALD</strong> takes one argument: the distance to move downward
-on the page relative to the current vertical position.
+ALD takes one argument: the distance to move downward on the page
+relative to the current vertical position.
 </p>
 
 <p>
 Used by itself, or preceded by
-<a href="#BR">BR</a>,
-<strong>ALD</strong> will advance by one line space plus the
-distance you specify.  Preceded by
-<a href="#EL">EL</a>,
+<a href="#br">BR</a>,
+ALD will advance by one line space plus the distance you specify.
+Preceded by
+<a href="#el">EL</a>,
 it will advance by exactly the distance you specify.
 </p>
 
 <p>
-<strong>ALD</strong> requires a unit of measure.  Decimal fractions
-are allowed, and values may be combined.  Therefore, to move down
-on the page by 1/4 of an inch, you could enter either
-
-<pre>
-    .ALD .25i
-        or
-    .ALD 1P+6p
-</pre>
-</p>
-
-<p>
-As the mnemonic (<strong>A</strong>dvance
-<strong>L</strong>ea<strong>D</strong>) suggests, you'll most often
-use <strong>ALD</strong> with
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+ALD requires a unit of measure.  Decimal fractions are allowed, and
+values may be combined.  Therefore, to move down on the page by 1/4
+of an inch, you could enter either
+<br/>
+<span class="pre-in-pp">
+  .ALD .25i
+</span>
+or
+<br/>
+<span class="pre-in-pp">
+  .ALD 1P+6p
+</span>
+As the mnemonic
+(<span style="text-decoration: underline;">A</span>dvance <span style="text-decoration: underline;">L</span>ea<span style="text-decoration: underline;">D</span>)
+suggests, you&#8217;ll most often use ALD with
+<a href="definitions.html#picaspoints">points</a>
 of lead.
 </p>
 
-<p>
-<strong>NOTE:</strong> if you want to use <strong>ALD</strong>
-at the top of a page (i.e. to advance to the starting position
-of type on a page), combine the value you want with -1v (minus
-one line space), like this:
-
-<pre>
-    .ALD 1i-1v
-</pre>
-</p>
-
-<p>
-At the top of a page, this will advance one inch from the
-top edge of the paper.  Without the -1v, the same command would
-advance one inch from the top of the page plus the distance of
-one line space.
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> if you want to use ALD at the top
+of a page (i.e. to advance to the starting position of type on a
+page), combine the value you want with <kbd>-1v</kbd> (minus one
+line space), like this:
+<br/>
+<span class="pre-in-pp">
+  .ALD 1i-1v
+</span>
+At the top of a page, this will advance one inch from the top edge
+of the paper.  Without the -1v, the same command would advance one
+inch from the top of the page plus the distance of one line space.
 </p>
+</div>
 
 <!-- -RLD- -->
 
-<hr width="33%" align="left"/>
-
-<a name="RLD"><h3><u>Reverse Lead (move upward)</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>RLD</strong> <kbd>&lt;distance to move upward&gt;</kbd></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="rld" class="macro-id">Reverse Lead (move upward)</h3>
+</div>
 
-<em>*Requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>RLD</b> <kbd class="macro-args">&lt;distance to move upward&gt;</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>RLD</strong> takes one argument: the distance to move
-upward on the page relative to the current vertical position.
+RLD takes one argument: the distance to move upward on the page
+relative to the current vertical position.
 </p>
 
 <p>
 Used by itself, or preceded by
-<a href="#BR">BR</a>,
-<strong>RLD</strong> will advance by one line space, then
-reverse by the distance you specify.  Preceded by
-<a href="#EL">EL</a>,
+<a href="#br">BR</a>,
+RLD will advance by one line space, then reverse by the distance you
+specify.  Preceded by
+<a href="#el">EL</a>,
 it will reverse by exactly the distance you specify.
 </p>
 
 <p>
-<strong>RLD</strong> requires a unit of measure.  Decimal fractions
-are allowed, and values may be combined.  Therefore, to move up
-on the page by 1/4 of an inch, you could enter either
-
-<pre>
-    .RLD .25i
-        or
-    .RLD 1P+6p
-</pre>
-</p>
-
-<p>
-As the mnemonic (<strong>R</strong>everse
-<strong>L</strong>ea<strong>D</strong>) suggests, you'll most often
-use <strong>RLD</strong> with
-<a href="definitions.html#TERMS_PICASPOINTS">points</a>
+RLD requires a unit of measure.  Decimal fractions are allowed, and
+values may be combined.  Therefore, to move up on the page by 1/4 of
+an inch, you could enter either
+<br/>
+<span class="pre-in-pp">
+  .RLD .25i
+</span>
+or
+<span class="pre-in-pp">
+  .RLD 1P+6p
+</span>
+As the mnemonic
+(<span style="text-decoration: underline;">R</span>everse <span style="text-decoration: underline;">L</span>ea<span style="text-decoration: underline;">D</span>)
+suggests, you&#8217;ll most often use RLD with
+<a href="definitions.html#picaspoints">points</a>
 of lead.
 </p>
 
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="TABS"><h2><u>Tabs</u></h2></a>
+<h2 id="tabs-intro" class="macro-group">Tabs</h2>
 
 <p>
-<strong>Mom</strong> provides two different kinds of tab setup:
-typesetting tabs and string tabs.  Neither one has anything to do
-with the tab key on your keyboard, and both are utterly divorced
-from groff's notion of tabs.  I recommend reading this section
-carefully in order to understand how <strong>mom</strong> handles
-tabs.
+Mom provides two different kinds of tab setup: typesetting tabs
+and string tabs.  Neither one has anything to do with the tab key
+on your keyboard, and both are utterly divorced from groff&#8217;s
+notion of tabs.  I recommend reading this section carefully in order
+to understand how mom handles tabs.
 </p>
 
-<p>
-<strong>NOTE:</strong> see the section
-<a href="typemacdoc.html#TYPESETTING">Using typesetting macros during document processing</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> see the section
+<a href="docprocessing.html#behaviour">Typesetting macros during document processing</a>
 for re-assuring information on the use of tabs during
-<a href="docprocessing.html#DOCPROCESSING">document processing</a>.
+<a href="docprocessing.html#docprocessing">document processing</a>.
 </p>
+</div>
 
-<a name="TYPESETTING_TABS"><h3><u>Typesetting tabs</u></h3></a>
+<h3 id="typesetting-tabs" class="docs">Typesetting tabs</h3>
 
 <p>
-Typesetting tabs are defined by both an indent from the left margin and
-a line length.  This is quite different from typewriter-style tab stops
-(the groff norm) that only define the left indent.  In conjunction
-with the
-<a href="#MULTI_COLUMNS">multi-column macros</a>,
-typesetting tabs significantly facilitate
-tabular and columnar work.
+Typesetting tabs are defined by both an indent from the left margin
+and a line length.  This is quite different from typewriter-style
+tab stops (the groff norm) that only define the left indent.  In
+conjunction with the
+<a href="#multicolumns-intro">multi-column macros</a>,
+typesetting tabs significantly facilitate tabular and columnar work.
 </p>
 
 <p>
 Typesetting tabs are created with the
-<a href="#TAB_SET">TAB_SET</a>
-macro. <strong>TAB_SET</strong> identifies the tab (by number),
-establishes its left indent and line length, and optionally sets a
-quad direction and fill mode.  After tabs have been created with
-<strong>TAB_SET</strong>, they can be called at any time with the
-<a href="#TAB">TAB</a>
+<a href="#tab-set">TAB_SET</a>
+macro. TAB_SET identifies the tab (by number), establishes its left
+indent and line length, and optionally sets a quad direction and
+fill mode.  After tabs have been created with TAB_SET, they can be
+called at any time with the
+<a href="#tab">TAB</a>
 macro.
 </p>
 
-<a name="TYPESETTING_TABS_TUT"><h3><u>Quickie tutorial on typesetting tabs</u></h3></a>
+<div class="examples-container">
+<h3 id="typesetting-tabs-tut" class="docs notes">Quickie tutorial on typesetting tabs</h3>
 
-<p>
+<p style="margin-top: .5em;">
 Say you want to set up three tabs to produce an employee evaluation
 that looks something like this:
+</p>
 
-<a name="TYPSETTING_TABS_SAMPLE"></a>
-<pre>
-    CRITERION       EVALUATION     COMMENTS
+<div class="box-code" style="padding-bottom: 0;">
+<span id="typsetting-tabs-sample" class="pre-in-pp" style="color: #302419">
+CRITERION       EVALUATION     COMMENTS
 
-    Service           Good         Many clients specifically request
-                                   support from Joe by name.
+Service           Good         Many clients specifically request
+                               support from Joe by name.
 
-    Punctuality    Satisfactory    Tends to arrive after 8:00am, but
-                                   often works through lunch hour.
+Punctuality    Satisfactory    Tends to arrive after 8:00am, but
+                               often works through lunch hour.
 
-    Team spirit     Needs work     Persistently gives higher priority
-                                   to helping clients than respecting
-                                   organizational hierarchy.
-</pre>
-</p>
+Team spirit     Needs work     Persistently gives higher priority
+                               to helping clients than respecting
+                               organizational hierarchy.
+</span>
+</div>
 
 <p>
-You want the first tab (&quot;CRITERION&quot;)
-
-<ul>
-    <li>to begin at the left margin of the page (i.e. no indent)</li>
-    <li>to have a line length of 5 picas</li>
-    <li>to be set flush left</li>
-</ul>
+You want the first tab, CRITERION,
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>to begin at the left margin of the page &ndash; i.e. no indent</li>
+<li>to have a line length of 5 picas</li>
+<li>to be set flush left</li>
+</ul>
 
 <p>
 Tabs must be numbered, and each has to be set up with a separate
-<a href="#TAB_SET">TAB_SET</a>
+<a href="#tab-set">TAB_SET</a>
 line.  Therefore, to set up tab 1, you enter
-
-<pre>
-   .TAB_SET  1  0  5P  L
-             |  |  |   |
-      tab #__|  |  |   |__direction
-                |  |
-        indent__|  |__length
-</pre>
-</p>
-
-<p>
-You want the second tab (&quot;EVALUATION&quot;)
-
-<ul>
-    <li>to begin 8 picas from the left margin</li>
-    <li>to have a length of 9 picas</li>
-    <li>to be set centred.</li>
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET  1  0  5P  L
+            |  |  |   |
+     tab #--+  |  |   +--direction
+               |  |
+       indent--+  +--length
+</span>
+You want the second tab, EVALUATION,
+</p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>to begin 8 picas from the left margin</li>
+<li>to have a length of 9 picas</li>
+<li>to be set centered</li>
 </ul>
-</p>
 
 <p>
 You set it up like this:
-
-<pre>
-   .TAB_SET  2  8P  9P  C
-             |  |   |   |
-      tab #__|  |   |   |__direction
-                |   |
-        indent__|   |__length
-</pre>
-</p>
-
-<p>
-You want the third tab (&quot;COMMENTS&quot;)
-
-<ul>
-    <li>to begin 19 picas from the left margin</li>
-    <li>to have a length of 17 picas</li>
-    <li>to be set flush left, <a href="definitions.html#TERMS_FILLED">filled</a></li>
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET  2  8P  9P  C
+            |  |   |   |
+     tab #--+  |   |   +--direction
+               |   |
+       indent--+   +--length
+</span>
+You want the third tab, COMMENTS,
+</p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>to begin 19 picas from the left margin</li>
+<li>to have a length of 17 picas</li>
+<li>to be set flush left, <a href="definitions.html#filled">filled</a></li>
 </ul>
-</p>
 
 <p>
 The setup looks like this:
-
-<pre>
-   .TAB_SET  3  19P  17P  L  QUAD
-             |   |    |   |    |
-             |   |    |   |    |__fill output lines
-             |   |    |   |
-      tab #__|   |    |   |__direction
-                 |    |
-         indent__|    |__length
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET  3  19P  17P  L  QUAD
+            |   |    |   |    |
+            |   |    |   |    +--fill output lines
+            |   |    |   |
+     tab #--+   |    |   +--direction
+                |    |
+        indent--+    +--length
+</span>
 Once the tabs are set up, you can call them in one of two ways:
-
-<ul>
-    <li><a href="#TAB">TAB</a> (with the tab
-        number as an argument) breaks the current line,
-        advances one linespace, and calls the tab.</li>
-    <li><a href="#TN">TN</a> (Tab Next) keeps
-        you on the current line and moves over to the next
-        tab in sequence (i.e. from 1 to 2, 2 to 3, etc.).</li>
-</ul>
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>with <kbd><a href="#tab">.TAB</a></kbd> (passing the tab
+    number as an argument), which breaks the current line,
+    advances one linespace and calls the tab.</li>
+<li>with <kbd><a href="#tn">.TN</a></kbd> (Tab Next), which keeps
+    you on the current line and moves over to the next
+    tab in sequence (i.e. from 1 to 2, 2 to 3, etc.).</li>
+</ul>
 
 <p>
-To exit from tabs and restore your original left margin, line length,
-quad direction and fill mode,  use
-<a href="#TQ">TQ</a>
+To exit from tabs and restore your original left margin, line
+length, quad direction and fill mode, use
+<kbd><a href="#tq">.TQ</a></kbd>
 (Tab Quit).
 </p>
 
 <p>
-Here's how the input for our sample employee evaluation looks
+Here&#8217;s how the input for our sample employee evaluation looks
 (with some introductory parameters):
+</p>
 
-<pre>
-    .PAGE 8.5i 11i 1i 1i 1i
-    .FAMILY  T
-    .FT      R
-    .PT_SIZE 14
-    .LS      16
-    .QUAD    LEFT
-    .KERN
-    .HY OFF
-    .SS 0
-    .TAB_SET 1 0   5P  L
-    .TAB_SET 2 8P  9P  C
-    .TAB_SET 3 19P 17P L QUAD
-    .TAB 1
-    CRITERION
-    .TN
-    EVALUATION
-    .TN
-    COMMENTS
-    .SP
-    .TAB 1
-    Service
-    .TN
-    Good
-    .TN
-    Many clients specifically request support from Joe by name.
-    .SP
-    .TAB 1
-    Punctuality
-    .TN
-    Satisfactory
-    .TN
-    Tends to arrive after 8:00am, but often works through lunch hour.
-    .SP
-    .TAB 1
-    Team spirit
-    .TN
-    Needs work
-    .TN
-    Persistently gives higher priority to helping clients
-    than respecting organizational hierarchy.
-    .TQ
-</pre>
-</p>
-
-<p>
-Try setting this up and previewing it with
-
-<pre>
-    groff -mom -X &lt;filename&gt;
-</pre>
-</p>
-
-<p>
-Notice how <kbd>.TN</kbd> simply moves over to the next tab,
-while the combination <kbd>.SP/.TAB 1</kbd> breaks the
-line, advances by one extra linespace, and calls the first tab.
-</p>
-
-<p>
-Notice, too, how the <kbd>QUAD</kbd> argument passed to
-tab 3 means you don't have to worry about the length of
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>;
-<strong>mom</strong>
-<a href="definitions.html#TERMS_FILLED">fills</a>
+<div class="examples" style="margin-bottom: 0px;">Code:</div>
+<div class="box-code" style="height: 324px; padding-bottom: 18px; overflow: auto;">
+<span class="pre-in-pp">
+.PAGE 8.5i 11i 1i 1i 1i
+.FAMILY  T
+.FT      R
+.PT_SIZE 14
+.LS      16
+.QUAD    LEFT
+.KERN
+.HY OFF
+.SS 0
+.TAB_SET 1 0   5P  L
+.TAB_SET 2 8P  9P  C
+.TAB_SET 3 19P 17P L QUAD
+.TAB 1
+CRITERION
+.TN
+EVALUATION
+.TN
+COMMENTS
+.SP
+.TAB 1
+Service
+.TN
+Good
+.TN
+Many clients specifically request support from Joe by name.
+.SP
+.TAB 1
+Punctuality
+.TN
+Satisfactory
+.TN
+Tends to arrive after 8:00am, but often works through lunch hour.
+.SP
+.TAB 1
+Team spirit
+.TN
+Needs work
+.TN
+Persistently gives higher priority to helping clients
+than respecting organizational hierarchy.
+.TQ
+</span>
+</div>
+
+<p>
+Try setting this up and processing it it with
+<br/>
+<span class="pre-in-pp">
+  groff -mom &lt;filename&gt; &gt; &lt;filename&gt;.ps
+</span>
+then previewing the .ps file.  Notice how <kbd>.TN</kbd>
+simply moves over to the next tab, while the combination
+<kbd>.SP/.TAB&nbsp;1</kbd> breaks the line, advances by one extra
+linespace, and calls the first tab.
+</p>
+
+<p>
+Notice, too, how the <kbd>QUAD</kbd> argument passed to tab 3 means
+you don&#8217;t have to worry about the length of
+<a href="definitions.html#inputline">input lines</a>;
+mom
+<a href="definitions.html#filled">fills</a>
 the tab and sets the type flush left.
 </p>
+</div>
 
-<a name="STRING_TABS"><h3><u>String tabs (autotabs)</u></h3></a>
+<h3 id="string-tabs" class="docs">String tabs (autotabs)</h3>
 
 <p>
 String tabs let you mark off tab positions with
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
+<a href="definitions.html#inlines">inline escapes</a>
 embedded in
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>.
+<a href="definitions.html#inputline">input lines</a>.
 Left indents and line lengths are calculated from the beginning and
 end positions of the marks.  This is especially useful when tab
 indents and lengths need to be determined from the text that goes in
@@ -3493,48 +3374,47 @@
 Setting up string tabs is a two-step procedure.  First, you enter an
 input line in which you mark off where you want tabs to begin and
 end.  (This is often best done in conjunction with the
-<a href="goodies.html#SILENT">SILENT</a>
+<a href="goodies.html#silent">SILENT</a>
 macro.)
 </p>
 
 <p>
 Next, you invoke the
-<a href="#ST">ST</a>
+<a href="#st">ST</a>
 macro for every string tab you defined, and optionally pass quad and
 fill information to it.  That done, string tabs are called with the
-<a href="#TAB">TAB</a>
+<a href="#tab">TAB</a>
 macro, just like typesetting tabs.
 </p>
 
 <p>
 In combination with the
-<a href="goodies.html#PAD">PAD</a>
+<a href="goodies.html#pad">PAD</a>
 macro and the groff inline escape
-<a href="inlines.html#INLINE_HORIZONTAL_GROFF"><kbd>\h</kbd></a>
-(move horizontally across the page) or <strong>mom</strong>'s
-<a href="inlines.html#INLINE_HORIZONTAL_MOM"><kbd><nobr>\*[FWD &lt;distance&gt;]</nobr></kbd></a>
-(move forward) inline, string tabs provide
-tremendous flexibility in setting up complex tab structures.
+<kbd><a href="inlines.html#inline-horizontal-groff">\h</a></kbd>
+(move horizontally across the page) or mom&#8217;s
+<kbd><a href="inlines.html#inline-horizontal-mom">\*[FWD &lt;distance&gt;]</a></kbd>
+(move forward) inline, string tabs provide tremendous flexibility in
+setting up complex tab structures.
 </p>
 
-<a name="STRING_TABS_TUT"><h3><u>Quickie tutorial on string tabs</u></h3></a>
-
-<p>
+<div class="examples-container">
+<h3 id="string-tabs-tut" class="docs notes">Quickie tutorial on string tabs</h3>
+<p style="margin-top: .5em;">
 Say you want to set up tabs for the
-<a href="#TYPSETTING_TABS_SAMPLE">employee evaluation form</a>
+<a href="#typsetting-tabs-sample">employee evaluation form</a>
 used as an example in the
-<a href="#TYPESETTING_TABS_TUT">typesetting tabs tutorial</a>.
+<a href="#typesetting-tabs-tut">typesetting tabs tutorial</a>.
 This time, though, you want to play around with the point size of
-type, so you can't know exactly how long the tabs will be or where
-they should start.  All you know is
-
-<ul>
-    <li>CRITERION is the longest line in tab 1</li>
-    <li>EVALUATION is the longest line in tab 2</li>
-    <li>tab 3 should extend to the current right margin</li>
-    <li>you want a 1 pica gutter between each tab</li>
-</ul>
+type, so you can&#8217;t know exactly how long the tabs will be or
+where they should start.  All you know is
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>CRITERION is the longest line in tab 1</li>
+<li>EVALUATION is the longest line in tab 2</li>
+<li>tab 3 should extend to the current right margin</li>
+<li>you want a 1 pica gutter between each tab</li>
+</ul>
 
 <p>
 This is an ideal job for string tabs.
@@ -3542,1134 +3422,1091 @@
 
 <p>
 The first thing you need for string tabs is an
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
+<a href="definitions.html#inputline">input line</a>
 with tab positions marked on it.  Tabs are marked with the
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
-<a href="#INLINE_ST"><kbd><nobr>\*[ST&lt;n&gt;]</nobr></kbd></a>
+<a href="definitions.html#inlines">inline escapes</a>
+<kbd><a href="#inline-st">\*[ST&lt;n&gt;]</a></kbd>
 and
-<a href="#INLINE_ST"><kbd><nobr>\*[ST&lt;n&gt;X]</nobr></kbd></a>,
+<kbd><a href="#inline-st">\*[ST&lt;n&gt;X]</a></kbd>,
 where <kbd>&lt;n&gt;</kbd>
 is the number you want the tab to have.  (In this example, we
 enclose the input line with the
-<a href="goodies.html#SILENT">SILENT</a>
-macro so the line doesn't print.  We also use the
-<a href="goodies.html#PAD">PAD</a>
-macro to permit defining tab 3 as simply &quot;the amount of
-space remaining on the input line.&quot;)
+<a href="goodies.html#silent">SILENT</a>
+macro so the line doesn&#8217;t print.  We also use the
+<a href="goodies.html#pad">PAD</a>
+macro to permit defining tab 3 as simply &#8220;the amount of space
+remaining on the input line.&#8221;)
 </p>
 
 <p>
 The setup looks like this:
-
-<pre>
-    .SILENT
-    .PAD "\*[ST1]CRITERION\*[ST1X]\*[FWD 12p]\*[ST2]EVALUATION\*[ST2X]\*[FWD 12p]\*[ST3]#\*[ST3X]"
-    .SILENT OFF
-</pre>
 </p>
 
-<p>
-The long line after <kbd>.PAD</kbd> looks scary, but it isn't.
-Here's what it means when broken down into its component parts:
-
-<ul>
-    <li>The longest line in tab 1 is &quot;CRITERION&quot;, so we
-        enclose CRITERION with begin/end markers for string tab 1:
-
-        <pre>
-    \*[ST1]CRITERION\*[ST1X]
-        </pre>
-
-    </li>
-    <li>We want a 1 pica (12 points) gutter between tab 1 and 2,
-        so we insert 12 points of space with \*[FWD 12p]
-        (<strong>F</strong>or<strong>W</strong>ar<strong>D</strong> 12 points):
-
-        <pre>
-    \*[FWD 12p]
-        </pre>
-
-    </li>
-    <li>The longest line in tab 2 is &quot;EVALUATION&quot;, so
-        we enclose EVALUATION with begin/end markers for string
-        tab 2:
-
-        <pre>
-    \*[ST2]EVALUATION\*[ST2X]
-        </pre>
-
-    </li>
-    <li>We want 1 pica (12 points) between tab 2 and 3, so we
-        insert 12 points of space with another <kbd><nobr>\*[FWD 12p]</nobr></kbd>
-
-        <pre>
-    \*[FWD 12p]
-        </pre>
-
-    </li>
-    <li>We want tab 3 to be as long as whatever space remains on
-        the current line length, so we enclose the
-        <a href="goodies.html#PAD_MARKER">pad marker</a>
-        (#) with begin/end markers for string tab 3:
-
-        <pre>
-    \*[ST3]#\*[ST3X]
-        </pre>
+<div class="examples" style="margin-bottom: 0px;">Code:</div>
 
-     </li>
+<div class="box-code">
+<span class="pre-in-pp">
+.SILENT
+.PAD "\*[ST1]CRITERION\*[ST1X]\*[FWD 12p]\*[ST2]EVALUATION\*[ST2X]\*[FWD 12p]\*[ST3]#\*[ST3X]"
+.SILENT OFF
+</span>
+</div>
+
+<p>
+The long line after <kbd>.PAD</kbd> looks scary, but
+it isn&#8217;t really.  Here&#8217;s what it means when broken down
+into its component parts:
+</p>
+<ul style="margin-bottom: -1em;">
+<li>The longest line in tab 1 is &#8220;CRITERION&#8221;, so we
+    enclose CRITERION with begin/end markers for string tab 1:
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -.25em;">
+  \*[ST1]CRITERION\*[ST1X]
+</span>
+</li>
+<li>We want a 1 pica (12 points) gutter between tab 1 and 2,
+    so we insert 12 points of space with \*[FWD 12p]
+    (ForWarD 12 points):
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -.25em;">
+  \*[FWD 12p]
+</span>
+</li>
+<li>The longest line in tab 2 is &#8220;EVALUATION&#8221;, so
+    we enclose EVALUATION with begin/end markers for string
+    tab 2:
+<span class="pre-in-pp" style="margin-bottom: -.25em;">
+  \*[ST2]EVALUATION\*[ST2X]
+</span>
+</li>
+<li>We want 1 pica (12 points) between tab 2 and 3, so we
+    insert it with: 
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -.25em;">
+  \*[FWD 12p]
+</span>
+</li>
+<li>We want tab 3 to be as long as whatever space remains on
+    the current line length, so we enclose the
+    <a href="goodies.html#pad-marker">pad marker</a>
+    (#) with begin/end markers for string tab 3:
+<span class="pre-in-pp">
+  \*[ST3]#\*[ST3X]
+</span>
+   </li>
 </ul>
-</p>
 
 <p>
 The tabs are now defined, but they require
-<a href="definitions.html#TERMS_QUAD">quad direction</a>
+<a href="definitions.html#quad">quad direction</a>
 and
-<a href="definitions.html#TERMS_FILLED">fill</a>
-information.  For each string tab defined above, enter a
-separate
-<a href="#ST">ST</a>
+<a href="definitions.html#filled">fill</a>
+information.  For each string tab defined above, enter a separate
+<kbd><a href="#st">.ST</a></kbd>
 line, like this:
-
-<pre>
-    .ST  1  L
-    .ST  2  L
-    .ST  3  L  QUAD
-         |  |   |
-         |  |   |__fill output lines
-         |  |
-    tab__|  |__direction
-    number
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .ST  1  L
+  .ST  2  L
+  .ST  3  L  QUAD
+       |  |   |
+       |  |   +--fill output lines
+       |  |
+  tab #--+  +--direction
+</span>
 From here on in, you call the tabs with
-<a href="#TAB">TAB</a>
+<kbd><a href="#tab">.TAB</a></kbd>
 and
-<a href="#TN">TN</a>
+<kbd><a href="#tn">.TN</a></kbd>
 just like typesetting tabs (see
-<a href="#TYPESETTING_TABS_TUT">typesetting tabs tutorial</a>).
+<a href="#typesetting-tabs-tut">typesetting tabs tutorial</a>).
 </p>
 
 <p>
-Here's the complete setup and entry for the sample employee
+Here&#8217;s the complete setup and entry for the sample employee
 evaluation form utilizing string tabs.
+</p>
 
-<pre>
-    .PAGE 8.5i 11i 1i 1i 1i
-    .FAMILY  T
-    .FT      R
-    .PT_SIZE 14
-    .LS      16
-    .QUAD    LEFT
-    .KERN
-    .HY OFF
-    .SS 0
-    .SILENT
-    .PAD "\*[ST1]CRITERION\*[ST1X]\*[FWD 12p]\*[ST2]EVALUATION\*[ST2X]\*[FWD 12p]\*[ST3]#\*[ST3X]"
-    .SILENT OFF
-    .ST  1  L
-    .ST  2  L
-    .ST  3  L  QUAD
-    .TAB 1
-    CRITERION
-    .TN
-    EVALUATION
-    .TN
-    COMMENTS
-    .SP
-    .TAB 1
-    Service
-    .TN
-    Good
-    .TN
-    Many clients specifically request support from Joe by name.
-    .SP
-    .TAB 1
-    Punctuality
-    .TN
-    Satisfactory
-    .TN
-    Tends to arrive after 8:00am, but often works through lunch hour.
-    .SP
-    .TAB 1
-    Team spirit
-    .TN
-    Needs work
-    .TN
-    Persistently gives higher priority to helping clients
-    than respecting organizational hierarchy.
-    .TQ
-</pre>
-</p>
-
-<p>
-Try setting this up and previewing it with
-
-<pre>
-    groff -mom -X &lt;filename&gt;
-</pre>
-</p>
-
-<p>
-Now, change the point size of the above sample to 12 and preview
-it again.  You'll see that the tab structure remains identical (tab
-1=CRITERION, tab 2=EVALUATION, tab 3=space remaining, and the gutter
-between tabs is still 1 pica), while the position and length 
-of the tabs have altered because of the new point size.
-</p>
-
-<p>
-Now try increasing the gutters to 2 picas (<kbd>\*[FWD 24p]</kbd> or
-<kbd>\*[FWD 2P]</kbd> instead of <kbd>\*[FWD 12p]</kbd>).  Preview the
-file again, and notice how the tab structure remains the same, but
-the gutters are wider.
-</p>
-
-<a name="INDEX_TABS"><h3><u>Tabs macro list</u></h3></a>
-
-<ul>
-    <li><a href="#TAB_SET">TAB_SET</a> (create typesetting tabs)</li>
-    <li><a href="#INLINE_ST">\*[ST]...\*[STX]</a> (inline escapes for marking String Tabs)</li>
-    <li><a href="#ST">ST</a> (set String Tabs)</li>
-    <li><a href="#TAB">TAB</a> (call tabs)</li>
-    <li><a href="#TN">TN</a> (Tab Next; call next tab in a sequence)</li>
-    <li><a href="#TQ">TQ</a> (Tab Quit)</li>
-</ul>
-
-<!-- -TAB_SET- -->
-
-<hr width="66%" align="left"/>
-
-<a name="TAB_SET"><h3><u>Set up typesetting tabs</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>TAB_SET</strong> <kbd>&lt;tab number&gt; &lt;indent&gt; &lt;length&gt;  L | R | C | J [ QUAD ]</kbd></nobr>
-<br/>
-
-<em>*</em><kbd>&lt;indent&gt;</kbd> <em>and</em> <kbd>&lt;length&gt;</kbd> <em>require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="examples" style="margin-bottom: 0px;">Code:</div> 
+<div class="box-code" style="height: 324px; padding-bottom: 18px; overflow: scroll;">
+<span class="pre-in-pp">
+.PAGE 8.5i 11i 1i 1i 1i
+.FAMILY  T
+.FT      R
+.PT_SIZE 14
+.LS      16
+.QUAD    LEFT
+.KERN
+.HY OFF
+.SS 0
+.SILENT
+.PAD "\*[ST1]CRITERION\*[ST1X]\*[FWD 12p]\*[ST2]EVALUATION\*[ST2X]\*[FWD 12p]\*[ST3]#\*[ST3X]"
+.SILENT OFF
+.ST  1  L
+.ST  2  L
+.ST  3  L  QUAD
+.TAB 1
+CRITERION
+.TN
+EVALUATION
+.TN
+COMMENTS
+.SP
+.TAB 1
+Service
+.TN
+Good
+.TN
+Many clients specifically request support from Joe by name.
+.SP
+.TAB 1
+Punctuality
+.TN
+Satisfactory
+.TN
+Tends to arrive after 8:00am, but often works through lunch hour.
+.SP
+.TAB 1
+Team spirit
+.TN
+Needs work
+.TN
+Persistently gives higher priority to helping clients
+than respecting organizational hierarchy.
+.TQ
+</span>
+</div>
+
+<p>
+Try setting this up and processing it with
+<br/>
+<span class="pre-in-pp">
+  groff -mom &lt;filename&gt; &gt; &lt;filename&gt;.ps 
+</span>
+and previewing the .ps file.
+</p>
+
+<p>
+Now, change the point size of the above sample to 12 and preview it
+again.  You&#8217;ll see that the tab structure remains identical
+(tab 1=CRITERION, tab 2=EVALUATION, tab 3=space remaining, and the
+gutter between tabs is still 1 pica), while the position and length
+of the tabs have altered because of the new point size.
 </p>
 
 <p>
-<strong>TAB_SET</strong> creates typesetting tabs that later can be
-called with
-<a href="#TAB">TAB</a>.
-Typesetting tabs are numbered, and defined by an indent, a length,
-and a &quot;direction&quot;, hence <strong>TAB_SET</strong> has four
-required arguments:
-
-<ul>
-    <li>a tab number</li>
-    <li>an indent (measured from the left margin of the page,
-    or, if you're already in a tab, from the left margin of the tab)</li>
-    <li>a length</li>
-    <li>a direction</li>
+Now try increasing the gutters to 2 picas
+(<kbd>\*[FWD&nbsp;24p]</kbd> or <kbd>\*[FWD&nbsp;2P]</kbd> instead
+of <kbd>\*[FWD&nbsp;12p]</kbd>).  Preview the file again, and notice
+how the tab structure remains the same, but the gutters are wider.
+</p>
+</div>
+
+<div id="index-tabs" class="macro-list-container">
+<h3 class="macro-list">Tabs macros</h3>
+
+<ul class="macro-list">
+  <li><a href="#tab-set">TAB_SET</a> &ndash; create typesetting tabs</li>
+  <li><a href="#inline-st">\*[ST]...\*[STX]</a> &ndash; inline escapes for marking String Tabs</li>
+  <li><a href="#st">ST</a> &ndash; set String Tabs</li>
+  <li><a href="#tab">TAB</a> &ndash; call tabs</li>
+  <li><a href="#tn">TN</a> &ndash; Tab Next; call next tab in a sequence</li>
+  <li><a href="#tq">TQ</a> &ndash; Tab Quit</li>
 </ul>
 
-To set up a centred tab 6 picas long and 9 points from the left
-margin, you'd enter
+</div>
+
+<!-- -TAB_SET- -->
+
+<div class="macro-id-overline">
+<h3 id="tab-set" class="macro-id">Set up typesetting tabs</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TAB_SET</b> <kbd class="macro-args">&lt;tab number&gt; &lt;indent&gt; &lt;length&gt;  L | R | C | J [ QUAD ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;<kbd style="font-style: normal;">&lt;indent&gt;</kbd> and <kbd style="font-style: normal;">&lt;length&gt;</kbd> require a <a href="definitions.html#unitofmeasure">unit of measure</a>
+</p>
 
-<pre>
-    .TAB_SET 1 9p 6P C
-</pre>
+<p style="margin-bottom: -.5em;">
+TAB_SET creates typesetting tabs that later can be called with
+<kbd><a href="#tab">.TAB</a></kbd>.
+Typesetting tabs are numbered, and defined by an indent, a length,
+and a quad direction, hence TAB_SET has four required arguments:
 </p>
+<ul style="margin-top: .5em; margin-bottom: -.5em;">
+<li>a tab number</li>
+<li>an indent (measured from the left margin of the page,
+    or, if you&#8217;re already in a tab, from the left margin of the tab)</li>
+<li>a length</li>
+<li>a direction</li>
+</ul>
 
 <p>
-The tab number in the above (&quot;1&quot;) is simply an
-identifier.  It could have been 4, or 17, or 296.  There's no
+To set up a centred tab 6 picas long and 9 points from the left
+margin, you&#8217;d enter
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET 1 9p 6P C
+</span>
+The tab number in the above (&#8221;1&#8221;) is simply an
+identifier.  It could have been 4, or 17, or 296.  There&#8217;s no
 need to set up tabs in numerical sequence.
 </p>
 
 <p>
 By default, tabs are in
-<a href="definitions.html#TERMS_NOFILL">nofill</a>
+<a href="definitions.html#filled">nofill</a>
 mode, meaning you can enter text in tabs on a line-for-line basis
 without having to use the
-<a href="#BR">BR</a>
+<a href="#br">BR</a>
 macro.  If you want a tab to be
-<a href="definitions.html#TERMS_FILLED">filled</a>,
-pass the optional argument <kbd>QUAD</kbd>, which will make the tab
-behave as if you'd entered <kbd><nobr>.QUAD L | R | C</nobr></kbd>.
+<a href="definitions.html#filled">filled</a>,
+pass the optional argument <kbd>QUAD</kbd>,
+which will make the tab behave as if you&#8217;d entered
+<kbd class="bold">.QUAD&nbsp;L&nbsp;|&nbsp;R&nbsp;|&nbsp;C</kbd>.
 </p>
 
 <p>
 For
-<a href="definitions.html#TERMS_JUST">justified</a>
-tabs, simply pass the argument <strong>J</strong> (without the
-<strong>QUAD</strong> argument), like this:
-
-<pre>
-    .TAB 1 9p 6P J
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#just">justified</a>
+tabs, simply pass the argument J (without the QUAD argument), like
+this:
+<br/>
+<span class="pre-in-pp">
+  .TAB 1 9p 6P J
+</span>
 Once tabs are set, they can be called at any time with the
-<a href="#TAB"><nobr>TAB &lt;n&gt;</nobr></a>
+<a href="#tab">TAB &lt;n&gt;</a>
 macro, where &lt;n&gt; is the number of the desired tab.
 </p>
 
 <p>
 You can set up any number of typesetting tabs.  However, be aware
 that
-<a href="#STRING_TABS">string tabs</a>
-are also called with <strong><nobr>TAB &lt;n&gt;</nobr></strong>,
-so be careful that you don't set up a typesetting tab numbered,
-say, 4, when you already have a string tab numbered 4.  Every tab,
-typesetting or string, must have a unique numeric identifier.
-</p>
-
-<p>
-<strong>NOTE:</strong> If you use <strong>TAB_SET</strong> while
-you're currently inside a tab, the indent argument is the distance from
-the tab's left margin, not the left margin of the page.  Therefore,
-you should exit tabs (with
-<a href="#TQ">TQ</a>)
-before creating new tabs (unless, of course, you want to set
-up a tab structure within the confines of an existing tab).
-</p>
-
-<p>
-<strong>IMPORTANT:</strong> Turn all indents off (see
-<a href="#INDENTS">Indents</a>)
-before setting up tabs with <strong>TAB_SET</strong>, or
-<strong>mom</strong> may get confused.
+<a href="#string-tabs">string tabs</a>
+are also called with TAB &lt;n&gt;, so be careful that you
+don&#8217;t set up a typesetting tab numbered, say, 4, when you
+already have a string tab numbered 4.  Every tab, typesetting or
+string, must have a unique numeric identifier. </p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> If you use TAB_SET while
+you&#8217;re currently inside a tab, the indent argument is the
+distance from the tab&#8217;s left margin, not the left margin of
+the page.  Therefore, you should exit tabs (with
+<kbd><a href="#tq">.TQ</a></kbd>)
+before creating new tabs (unless, of course, you want to set up a
+tab structure within the confines of an existing tab).
+</p>
+</div>
+
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> Turn all indents off (see
+<a href="#indents">Indents</a>)
+before setting up tabs with TAB_SET, or mom may get confused.
 </p>
+</div>
 
 <!-- -INLINE_ST- -->
 
-<hr width="33%" align="left"/>
-
-<a name="INLINE_ST"><h3><u>Mark positions of string tabs</u></h3></a>
-
-<p>
-Inlines: <kbd>\*[ST&lt;number&gt;]...\*[ST&lt;number&gt;X]</kbd>
-<br/>
-
-<em>*The <a href="definitions.html#TERMS_QUAD">Quad</a>
-direction must be</em> LEFT <em>or</em> JUSTIFY <em>(see</em>
-<a href="#QUAD">QUAD</a>
-<em>and</em>
-<a href="#JUSTIFY">JUSTIFY</a>)
-<em>or the
-<a name="definitions.html#TERMS_NOFILL">no-fill mode</a>
-set to</em>
-<a href="#LRC">LEFT</a>
-<em>in order for these inlines to function properly.  Please see</em>
-<a href="#IMPORTANT">IMPORTANT</a>,
-<em>below.</em>
+<div class="macro-id-overline">
+<h3 id="inline-st" class="macro-id">Mark positions of string tabs</h3>
+</div>
+
+<div class="box-macro-args">
+Inlines: <kbd class="macro-args">\*[ST&lt;number&gt;]...\*[ST&lt;number&gt;X]</kbd>
+</div>
+
+<p class="requires">
+The <a href="definitions.html#quad">quad</a>
+direction must be
+<span style="font-style: normal">LEFT</span>
+or
+<span style="font-style: normal">JUSTIFY</span>
+(see
+<a href="#quad"><span style="font-style: normal">QUAD</span></a>
+and
+<a href="#justify"><span style="font-style: normal">JUSTIFY</span></a>)
+or the
+<a href="definitions.html#filled">no-fill mode</a>
+set to
+<a href="#lrc"><span style="font-style: normal">LEFT</span></a>
+in order for these inlines to function properly.  Please see
+<a href="#important"><span style="font-style: normal">IMPORTANT</span></a>,
+below.
 </p>
 
 <p>
 String tabs need to be marked off with
-<a href="definitions.html#TERMS_INLINES">inline escapes</a>
+<a href="definitions.html#inlines">inline escapes</a>
 before being set up with the
-<a href="#ST">ST</a>
-macro.  Any input line may contain string tab markers.
-<kbd>&lt;number&gt;</kbd>, above, means the numeric identifier of the
-tab.  The following shows a sample input line with string tab
-markers.
-
-<pre>
-    \*[ST1]Now is the time\*[ST1X] for all \*[ST2]good men\*ST2X] to come to the aid of the party.
-</pre>
-</p>
-
-<p>
+<a href="#st">ST</a>
+macro.  Any input line may contain string tab markers. <kbd
+class="bold">&lt;number&gt;</kbd>, above, means the numeric
+identifier of the tab.  The following shows a sample input line with
+string tab markers.
+<br/>
+<span class="pre-in-pp">
+  \*[ST1]Now is the time\*[ST1X] for all \*[ST2]good men\*ST2X] to come to the aid of the party.
+</span>
 String tab 1 begins at the start of the line and ends after the word
-&quot;time&quot;.  String tab 2 starts at &quot;good&quot; and ends
-after &quot;men&quot;.  Inline escapes (e.g. font or point size
-changes, or horizontal movements, including
-<a href="goodies.html#PAD">padding</a>)
-are taken into account when <strong>mom</strong> determines the
-position and length of string tabs.
+&#8220;time&#8221;.  String tab 2 starts at &#8220;good&#8221; and
+ends after &#8220;men&#8221;.  Inline escapes (e.g. font or point
+size changes, or horizontal movements, including
+<a href="goodies.html#pad">padding</a>)
+are taken into account when mom determines the position and length
+of string tabs.
 </p>
 
 <p>
-Up to nineteen string tabs may be marked (not necessarily all on
-the same line, of course), and they must be numbered between 1
-and 19.
+Up to nineteen string tabs may be marked (not necessarily all on the
+same line, of course), and they must be numbered between 1 and 19.
 </p>
 
 <p>
-Once string tabs have been marked in input lines, they have to
-be &quot;set&quot; with
-<a href="#ST">ST</a>,
+Once string tabs have been marked in input lines, they have to be
+&#8220;set&#8221; with
+<kbd><a href="#st">.ST</a></kbd>,
 after which they may be called, by number, with
-<a href="#TAB">TAB</a>.
+<kbd><a href="#tab">.TAB</a></kbd>.
 </p>
 
-<p>
-<strong>NOTE:</strong> Lines with string tabs marked off in them are
-normal input lines, i.e. they get printed, just like any input line.
-If you want to set up string tabs without the line printing, use the
-<a href="goodies.html#SILENT">SILENT</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> Lines with string tabs marked off
+in them are normal input lines, i.e. they get printed, just like
+any input line.  If you want to set up string tabs without the line
+printing, use the
+<a href="goodies.html#silent">SILENT</a>
 macro.
 </p>
+</div>
 
-<p>
-<a name="IMPORTANT"><strong>IMPORTANT:</strong></a>
+<div class="box-important">
+<p class="tip-top">
+<span id="important" class="important">IMPORTANT:</span>
 Owing to the way groff processes
-<a href="definitions.html#TERMS_INPUTLINE">input lines</a>
+<a href="definitions.html#inputline">input lines</a>
 and turns them into
-<a href="definitions.html#TERMS_OUTPUTLINE">output lines</a>,
-it is not possible for <strong>mom</strong> to &quot;guess&quot; the
-correct starting position of string tabs marked off in lines that
-are centered or set flush right.
+<a href="definitions.html#outputline">output lines</a>,
+it is not possible for mom to &#8220;guess&#8221; the correct
+starting position of string tabs marked off in lines that are
+centered or set flush right.
 </p>
 
 <p>
 Equally, she cannot guess the starting position if a line is fully
 justified and broken with
-<a href="#SPREAD">SPREAD</a>.
+<a href="#spread">SPREAD</a>.
 </p>
 
 <p>
 In other words, in order to use string tabs,
-<a href="#LRC">LEFT</a>
+<a href="#lrc">LEFT</a>
 must be active, or, if
-<a href="#QUAD">QUAD LEFT</a>
+<a href="#quad">QUAD LEFT</a>
 or
-<a href="#JUSTIFY">JUSTIFY</a>
+<a href="#justify">JUSTIFY</a>
 are active, the line on which the string tabs are marked must be
-broken &quot;manually&quot; with
-<a href="#BR">BR</a>
+broken &#8220;manually&#8221; with
+<kbd><a href="#br">.BR</a></kbd>
 (but not
-<a href="#SPREAD">SPREAD</a>).
+<kbd><a href="#spread">.SPREAD</a></kbd>).
 </p>
 
-<p>
+<p class="tip-bottom">
 To circumvent this behaviour, I recommend using the
-<a href="goodies.html#PAD">PAD</a>
+<a href="goodies.html#pad">PAD</a>
 to set up string tabs in centered or flush right lines.  Say, for
 example, you want to use a string tab to underscore the text of a
 centered line with a rule.  Rather than this,
-
-<pre>
-    .CENTER
-    \*[ST1]A line of text\*[ST1X]\c
-    .EL
-    .ST 1
-    .TAB 1
-    .PT_SIZE 24
-    .ALD 3p
-    \*[RULE]
-    .RLD 3p
-    .TQ
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .CENTER
+  \*[ST1]A line of text\*[ST1X]\c
+  .EL
+  .ST 1
+  .TAB 1
+  .PT_SIZE 24
+  .ALD 3p
+  \*[RULE]
+  .RLD 3p
+  .TQ
+</span>
 you should do:
-
-<pre>
-    .QUAD CENTER
-    .PAD "#\*[ST1]A line of text\*[ST1X]#"
-    .EL
-    .ST 1
-    .TAB 1
-    .PT_SIZE 24
-    .ALD 3p
-    \*[RULE] \" Note that you can't use \*[UP ] or \*[DOWN] with \*[RULE]
-    .RLD 3p
-    .TQ
-</pre>
+<br/>
+<span class="pre-in-pp">
+  .QUAD CENTER
+  .PAD "#\*[ST1]A line of text\*[ST1X]#"
+  .EL
+  .ST 1
+  .TAB 1
+  .PT_SIZE 24
+  .ALD 3p
+  \*[RULE] \" Note that you can&#8217;t use \*[UP ] or \*[DOWN] with \*[RULE]
+  .RLD 3p
+  .TQ
+</span>
 </p>
+</div>
 
 <!-- -ST- -->
 
-<hr width="33%" align="left"/>
-
-<a name="ST"><h3><u>Set string tabs</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>ST</strong> <kbd>&lt;tab number&gt;  L | R | C | J [ QUAD ]</kbd></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="st" class="macro-id">Set string tabs</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>ST</b> <kbd class="macro-args">&lt;tab number&gt;  L | R | C | J [ QUAD ]</kbd>
+</div>
 
 <p>
 After string tabs have been marked off on an input line (see
-<a href="#INLINE_ST"><kbd>\*[ST]...\*[STX]</kbd></a>),
-you need to &quot;set&quot; them by giving them a direction
-and, optionally, the <kbd>QUAD</kbd> argument.  In this
-respect, <strong>ST</strong> is like
-<a href="#TAB_SET">TAB_SET</a>
-except that you don't have to give <strong>ST</strong> an indent
-or a line length (that's already taken care of, inline, by
+<a href="#inline-st"><kbd>\*[ST]...\*[STX]</kbd></a>),
+you need to &#8220;set&#8221; them by giving them a direction and,
+optionally, the <kbd>QUAD</kbd> argument.  In this respect, ST is
+like
+<a href="#tab-set">TAB_SET</a>
+except that you don&#8217;t have to give ST an indent or a
+line length (that&#8217;s already taken care of, inline, by
 <kbd>\*[ST]...\*[STX]</kbd>).  If you want string tab 1 to be left,
 enter
-
-<pre>
-    .ST 1 L
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .ST 1 L
+</span>
 If you want it to be left and
-<a href="definitions.html#TERMS_FILLED">filled</a>, enter
-
-<pre>
-    .ST 1 L QUAD
-</pre>
-</p>
-
-<p>
+<a href="definitions.html#filled">filled</a>, enter
+<br/>
+<span class="pre-in-pp">
+  .ST 1 L QUAD
+</span>
 If you want it to be justified, enter
-
-<pre>
-    .ST 1 J
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .ST 1 J
+</span>
 See the
-<a href="#STRING_TABS_TUT">Quickie tutorial on string tabs</a>
+<a href="#string-tabs-tut">Quickie tutorial on string tabs</a>
 for a full explanation of setting up string tabs.
 </p>
 
 <!-- -TAB- -->
 
-<hr width="33%" align="left"/>
-
-<a name="TAB"><h3><u>Call tabs</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>TAB</strong> <kbd>&lt;tab number&gt;</kbd></nobr>
-<br/>
-
-Alias: <strong>TB</strong>
+<div class="macro-id-overline">
+<h3 id="tab" class="macro-id">Call tabs</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TAB</b> <kbd class="macro-args">&lt;tab number&gt;</kbd>
+</div>
+<p class="alias">
+<i>Alias:</i> <b>TB</b>
 </p>
 
 <p>
 After tabs have been defined (either with
-<a href="#TAB_SET">TAB_SET</a>
+<a href="#tab-set">TAB_SET</a>
 or
-<a href="#ST">ST</a>),
-<strong>TAB</strong> moves to whatever tab number you pass it as
-an argument.  For example,
-
-<pre>
-    .TAB 3
-</pre>
-
+<a href="#st">ST</a>),
+TAB moves to whatever tab number you pass it as an argument.  For
+example,
+<br/>
+<span class="pre-in-pp">
+  .TAB 3
+</span>
+<br/>
 moves you to tab 3.
 </p>
 
-<a name="NOTE_TN"></a>
-
-<p>
-<strong>NOTE:</strong> <strong>TAB</strong> breaks the line preceding
-it and advances 1 linespace.  Hence,
-
-<pre>
-    .TAB 1
-    A line of text in tab 1.
-    .TAB 2
-    A line of text in tab 2.
-</pre>
-
+<div id="note-tn" class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> TAB breaks the line preceding it and
+advances 1 linespace.  Hence,
+<br/>
+<span class="pre-in-pp">
+  .TAB 1
+  A line of text in tab 1.
+  .TAB 2
+  A line of text in tab 2.
+</span>
 produces, on output
-
-<pre>
-    A line of text in tab 1.
-                               A line of text in tab 2.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  A line of text in tab 1.
+  A line of text in tab 2.
+</span>
 If you want the tabs to line up, use
-<a href="#TN">TN</a>
+<a href="#tn">TN</a>
 (Tab Next), like this:
-
-<pre>
-    .TAB 1
-    A line of text in tab 1.
-    .TN
-    A line of text in tab 2.
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .TAB 1
+  A line of text in tab 1.
+  .TN
+  A line of text in tab 2.
+</span>
 which produces
-
-<pre>
-    A line of text in tab 1.   A line of text in tab 2.
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  A line of text in tab 1.   A line of text in tab 2.
+</span>
 If the text in your tabs runs to several lines, and you want the
 first lines of each tab to align, you must use the
-<a href="#MULTI_COLUMNS">multi-column</a> macros.
+<a href="#multicolumns-intro">multi-column</a> macros.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Any indents in effect prior to
-calling a tab are automatically turned off by <strong>TAB</strong>.
-If you were happily zipping down the page with a left indent of 2
-picas turned on, and you call a tab whose indent from the left margin
-is 6 picas, your new distance from the left margin will be 6 picas,
-not 6 picas plus the 2 pica indent.
+<p id="tab-add-note" class="tip-bottom">
+<span class="additional-note">Additional note:</span> Any indents
+in effect prior to calling a tab are automatically turned off by
+TAB.  If you were happily zipping down the page with a left indent
+of 2 picas turned on, and you call a tab whose indent from the left
+margin is 6 picas, your new distance from the left margin will be 6
+picas, not 6 picas plus the 2 pica indent.
 </p>
+</div>
 
 <!-- -TN- -->
 
-<hr width="66%" align="left"/>
-
-<a name="TN"><h3><u>Tab Next</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>TN</strong></nobr>
-<br/>
-
-<em>*In tabs that aren't given the</em> <kbd>QUAD</kbd> <em>argument
-when they're set up with</em>
-<a href="#TAB_SET">TAB_SET</a>
-<em>or</em>
-<a href="#ST">ST</a>,
-<em>you must terminate the line preceding</em> <kbd>.TN</kbd>
-<em>with the</em> <kbd>\c</kbd> <em>inline escape.  See the</em>
-<a href="#TN_NOTE">ADDITIONAL NOTE</a>.
-<em>If you find remembering
-whether to put in the <kbd>\c</kbd> bothersome, you may prefer to
-use the</em>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-<em>alternative to</em>
-<kbd>.TN</kbd>,
-<a href="inlines.html#TB+"><kbd>\*[TB+]</kbd></a>,
-<em>which works consistently regardless of the fill mode.</em>
-</p>
-
-<p>
-<strong>TN</strong> moves over to the next tab in numeric
-sequence (tab n+1) without advancing on the page.  See the
-<a href="#NOTE_TN">NOTE</a>
-in the description of the <strong>TAB</strong> macro for an
-example of how <strong>TN</strong> works.
-</p>
-
-<p>
-<strong>NOTE:</strong> You <em>must</em> put text in the
-<a href="definitions.html#TERMS_INPUTLINE">input line</a>
-immediately after <strong>TN</strong>. &quot;Stacking&quot; of
-<strong>TN</strong>'s is not allowed.  In other words, you cannot
-do
-
-<pre>
-    .TAB 1
-    Some text
-    .TN
-    Some more text
-    .TN
-    .TN
-    Yet more text
-</pre>
+<div class="macro-id-overline">
+<h3 id="tn" class="macro-id">Tab Next</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TN</b>
+</div>
+<p class="requires">
+In tabs that aren&#8217;t given the <kbd class="normal">QUAD</kbd>
+argument when they&#8217;re set up with
+<a href="#tab-set" class="normal">TAB_SET</a>
+or
+<a href="#st" class="normal">ST</a>,
+you must terminate the line preceding <kbd class="normal">.TN</kbd>
+with the <kbd class="normal">\c</kbd> inline escape.  See the
+<a href="#tn-note" class="normal">ADDITIONAL NOTE</a>.
+If you find remembering whether to put in the
+<kbd class="normal">\c</kbd> bothersome, you may prefer to use the
+<a href="definitions.html#inlines" class="normal">inline escape</a>
+alternative to
+<kbd class="normal">.TN</kbd>,
+<kbd class="normal"><a href="inlines.html#TB+">\*[TB+]</a></kbd>,
+which works consistently regardless of the fill mode.
 </p>
 
 <p>
+TN moves over to the next tab in numeric sequence (tab n+1) without
+advancing on the page.  See the
+<a href="#note-tn">NOTE</a>
+in the description of the TAB macro for an example of how TN works.
+</p>
+
+<div id="tn-note" class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> You must put text in the
+<a href="definitions.html#inputline">input line</a>
+immediately after TN. &#8220;Stacking&#8221; of TN&#8217;s is not
+allowed.  In other words, you cannot do
+<br/>
+<span class="pre-in-pp">
+  .TAB 1
+  Some text
+  .TN
+  Some more text
+  .TN
+  .TN
+  Yet more text
+</span>
 The above example, assuming tabs numbered from 1 to 4, should be entered
-
-<pre>
-    .TAB 1
-    Some text
-    .TN
-    Some more text
-    .TAB 4
-    Yet more text
-</pre>
-</p>
-
-<p>
-<a name="TN_NOTE"><strong>ADDITIONAL NOTE:</strong></a>
-In versions of mom prior to 1.1.9, <strong>TN</strong> did not
-always work as advertised on the last
-<a name="TERMS_OUTPUTLINE">output line</a>
+<br/>
+<span class="pre-in-pp">
+  .TAB 1
+  Some text
+  .TN
+  Some more text
+  .TAB 4
+  Yet more text
+</span>
+<span class="additional-note">Additional note:</span>
+In versions of mom prior to 1.1.9, TN did not always work as
+advertised on the last
+<a href="definitions.html#outputline">output line</a>
 of pages that contained a footer trap (e.g. one set with
-<a href="#B_MARGIN">B_MARGIN</a>
+<a href="#b-margin">B_MARGIN</a>
 or in  documents formatted using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>).
+<a href="docprocessing.html#docprocessing">document processing macros</a>).
 </p>
 
 <p>
-<strong>TN</strong> has been re-written so that this should no longer be the
-case.  However, in order for it to work in tabs that have not been
-given a <kbd>QUAD</kbd> argument (see
-<a href="#TAB_SET">TAB_SET</a>
+TN has been re-written so that this should no longer be the case.
+However, in order for it to work in tabs that have not been given a
+<kbd>QUAD</kbd> argument (see
+<a href="#tab-set">TAB_SET</a>
 and
-<a href="#ST">ST</a>)
-you must always &quot;join&quot; <strong>.TN</strong> to the line
-before it using the
-<a href="#JOIN"><kbd>\c</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>,
+<a href="#st">ST</a>)
+you must always &#8220;join&#8221; <kbd>.TN</kbd> to
+the line before it using the
+<kbd><a href="#join">\c</a></kbd>
+<a href="definitions.html#inlines">inline escape</a>,
 as in the following example:
-
-<pre>
-    .TAB_SET 1 0  1P  L
-    .TAB_SET 2 1P 20P L
-    .TAB 1
-    1.\c
-    .TN
-    The first rule of survival is &quot;make and keep good friends.&quot;
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .TAB_SET 1 0  1P  L
+  .TAB_SET 2 1P 20P L
+  .TAB 1
+  1.\c
+  .TN
+  The first rule of survival is &#8220;make and keep good friends.&#8221;
+</span>
 When output, the example will look like this:
-
-<pre>
-    1.  The first rule of survival is &quot;make and keep good friends.&quot;
-</pre>
+<br/>
+<span class="pre-in-pp">
+  1.  The first rule of survival is &#8220;make and keep good friends.&#8221;
+</span>
 </p>
 
-<p>
+<p class="tip-bottom">
 Conversely, if you did give a <kbd>QUAD</kbd> argument
-to <strong>TAB_SET</strong> or <strong>ST</strong>, the
+to TAB_SET or ST, the
 <kbd>\c</kbd> must not be used.
 </p>
+</div>
 
 <!-- -TQ- -->
 
-<hr width="33%" align="left"/>
-
-<a name="TQ"><h3><u>Tab Quit</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>TQ</strong></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="tq" class="macro-id">Tab Quit</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TQ</b>
+</div>
 
 <p>
-<strong>TQ</strong> takes you out of whatever tab you were in,
-advances 1 linespace, and restores the left margin, line length,
-quad direction and
-<a href="definitions.html#TERMS_FILLED">fill mode</a>
+TQ takes you out of whatever tab you were in, advances 1 linespace,
+and restores the left margin, line length, quad direction and
+<a href="definitions.html#filled">fill mode</a>
 that were in effect prior to invoking any tabs.
 </p>
 
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="MULTI_COLUMNS"><h2><u>Multi-Columns</u></h2></a>
+<h2 id="multicolumns-intro" class="macro-group">Multiple columns</h2>
 
 <p>
 Tabs are not by nature columnar, which is to say that if the text
 inside a tab runs to several lines, calling another tab does not
 automatically move to the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+<a href="definitions.html#baseline">baseline</a>
 of the first line in the previous tab.  To demonstrate:
-
-<pre>
-    .TAB 1
-    Carrots
-    Potatoes
-    Broccoli
-    .TAB 2
-    $1.99/5 lbs
-    $0.25/lb
-    $0.99/bunch
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .TAB 1
+  Carrots
+  Potatoes
+  Broccoli
+  .TAB 2
+  $1.99/5 lbs
+  $0.25/lb
+  $0.99/bunch
+</span>
 produces, on output
-
-<pre>
-    Carrots
-    Potatoes
-    Broccoli
-               $1.99/5 lbs
-               $0.25/lb
-               $0.99/bunch
-</pre>
-
-<p>
-The multi-column macros allow you to set tabs in columnar
-fashion, rather than line by line.  When you invoke multi-column
-mode (with
-<a href="#MCO">MCO</a>),
-<strong>mom</strong> saves the position of the current baseline.
-<a href="#MCR">MCR</a>
-(Multi-column return) at any point while multi-columns are on
-returns you to the saved position.  Exiting multi-columns
-(<a href="#MCX">MCX</a>)
-quits the current tab (if you're in one) and moves you to the
+<br/>
+<span class="pre-in-pp">
+  Carrots
+  Potatoes
+  Broccoli
+            $1.99/5 lbs
+            $0.25/lb
+            $0.99/bunch
+</span>
+The multi-column macros allow you to set tabs in columnar fashion,
+rather than line by line.  When you invoke multi-column mode (with
+<kbd><a href="#mco">.MCO</a></kbd> &ndash;
+<span style="text-decoration: underline">M</span>ulti-<span style="text-decoration: underline">C</span>olumn <span style="text-decoration: underline">O</span>n),
+mom saves the position of the current baseline.
+<kbd><a href="#mcr">.MCR</a></kbd>
+(<span style="text-decoration: underline">M</span>ulti-<span style="text-decoration: underline">C</span>olumn <span style="text-decoration: underline">R</span>eturn)
+at any point while multi-columns are on returns you to the saved
+position.  Exiting multi-columns
+(<kbd><a href="#mcx">.MCX</a></kbd> &ndash;
+<span style="text-decoration: underline">M</span>ulti-<span style="text-decoration: underline">C</span>olumn e<span style="text-decoration: underline">X</span>it)
+quits the current tab (if you&#8217;re in one) and moves you to the
 bottom of the longest column.  (Note that you do not have to use
 multi-columns in conjunction with tabs.)
 </p>
 
 <p>
 Using our example above, but setting it in multi-column mode,
-
-<pre>
-    .MCO
-    .TAB 1
-    Carrots
-    Potatoes
-    Broccoli
-    .MCR
-    .TAB 2
-    $1.99/5 lbs
-    $0.25/lb
-    $0.99/bunch
-    .MCX
-</pre>
-
+<br/>
+<span class="pre-in-pp">
+  .MCO
+  .TAB 1
+  Carrots
+  Potatoes
+  Broccoli
+  .MCR
+  .TAB 2
+  $1.99/5 lbs
+  $0.25/lb
+  $0.99/bunch
+  .MCX
+</span>
 produces
+<br/>
+<span class="pre-in-pp">
+  Carrots   $1.99/5 lbs
+  Potatoes  $0.25/lb
+  Broccoli  $0.99/bunch
+</span>
 </p>
 
-<pre>
-    Carrots   $1.99/5 lbs
-    Potatoes  $0.25/lb
-    Broccoli  $0.99/bunch
-</pre>
-</p>
-
-<p>
-<strong>NOTE:</strong> Do not confuse <strong>MCO</strong> with
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> Do not confuse MCO with
 the
-<a href="docprocessing.html#COLUMNS">COLUMNS</a>
+<a href="docprocessing.html#columns">COLUMNS</a>
 macro in the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+<a href="docprocessing.html#docprocessing">document processing macros</a>.
 </p>
+</div>
 
-<a name="INDEX_MULTI_COLUMNS"><h3><u>Columns macro list</u></h3></a>
+<div id="index-multicolumns" class="macro-list-container">
+<h3 class="macro-list">Multi-columns macros</h3>
 
-<ul>
-    <li><a href="#MCO">MCO (begin multi-column setting)</a></li>
-    <li><a href="#MCR">MCR (return to top of column)</a></li>
-    <li><a href="#MCX">MCX (exit multi-columns)</a></li>
+<ul class="macro-list">
+  <li><a href="#mco">MCO</a> &ndash; begin multi-column setting</li>
+  <li><a href="#mcr">MCR</a> &ndash; return to top of column</li>
+  <li><a href="#mcx">MCX</a> &ndash; exit multi-columns</li>
 </ul>
+</div>
 
 <!-- -MCO- -->
 
-<hr width="66%" align="left"/>
+<div class="macro-id-overline">
+<h3 id="mco" class="macro-id">Begin multi-column setting</h3>
+</div>
 
-<a name="MCO"><h3><u>Begin multi-column setting</u></h3></a>
+<div class="box-macro-args">
+	Macro: <b>MCO</b>
+</div>
 
 <p>
-<nobr>Macro: <strong>MCO</strong></nobr>
-</p>
-
-<p>
-<strong>MCO</strong> (<strong>M</strong>ulti-<strong>C</strong>olumn
-<strong>O</strong>n) is the macro you use to begin multi-column
+MCO (<span style="text-decoration: underline;">M</span>ulti-<span style="text-decoration: underline;">C</span>olumn <span style="text-decoration: underline;">O</span>n) is the macro you use to begin multi-column
 setting.  It marks the current
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
+<a href="definitions.html#baseline">baseline</a>
 as the top of your columns, for use later with
-<a href="#MCR">MCR</a>.  See the
-<a href="#MULTI_COLUMNS">introduction to columns</a>
+<a href="#mcr">MCR</a>.
+See the
+<a href="#multicolumns-intro">introduction to columns</a>
 for an explanation of multi-columns and some sample
 input.
 </p>
 
-<p>
-<strong>NOTE:</strong> Do not confuse <strong>MCO</strong> with
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> Do not confuse MCO with
 the
-<a href="docprocessing.html#COLUMNS">COLUMNS</a>
+<a href="docprocessing.html#columns">COLUMNS</a>
 macro in the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+<a href="docprocessing.html#docprocessing">document processing macros</a>.
 </p>
+</div>
 
 <!-- -MCR- -->
 
-<hr width="66%" align="left"/>
-
-<a name="MCR"><h3><u>Return to top of column</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>MCR</strong></nobr>
-</p>
+<div class="macro-id-overline">
+<h3 id="mcr" class="macro-id">Return to top of column</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>MCR</b>
+</div>
 
 <p>
-Once you've turned multi-columns on (with
-<a href="#MCO">MCO</a>),
-<strong>MCR</strong>, at any time, returns you to the top of
+Once you&#8217;ve turned multi-columns on (with
+<kbd><a href="#mco">.MCO</a></kbd>),
+<kbd>.MCR</kbd>, at any time, returns you to the top of
 your columns.
 </p>
 
 <!-- -MCX- -->
 
-<hr width="33%" align="left"/>
-
-<a name="MCX"><h3><u>Exit multi-columns</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>MCX</strong> <kbd>[ &lt;distance to advance below longest column&gt; ]</kbd></nobr>
-<br/>
+<div class="macro-id-overline">
+<h3 id="mcx" class="macro-id">Exit multi-columns</h3>
+</div>
 
-<em>*Optional argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>MCX</b> <kbd class="macro-args">[ &lt;distance to advance below longest column&gt; ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;Optional argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>MCX</strong> takes you out of any tab you were in (by
-silently invoking
-<a href="#TQ">TQ</a>) and advances to the bottom of the longest
-column.
+MCX takes you out of any tab you were in (by silently invoking
+<kbd><a href="#tq">.TQ</a></kbd>)
+and advances to the bottom of the longest column.
 </p>
 
 <p>
-Without an argument, <strong>MCX</strong> advances 1 linespace
-below the longest column.  Linespace, in this instance, is the
-<a href="definitions.html#TERMS_LEADING">leading</a>
-in effect <em>at the moment <strong>MCX</strong> is
-invoked.</em>
+Without an argument, MCX advances 1 linespace below the longest
+column.  Linespace, in this instance, is the
+<a href="definitions.html#leading">leading</a>
+in effect at the moment MCX is invoked.
 </p>
 
 <p>
-If you pass the <kbd><nobr>&lt;distance&gt;</nobr></kbd> argument to
-<strong>MCX</strong>, it advances 1 linespace below the longest
-column (see above) PLUS the distance specified by the argument.
-The argument requires a unit of measure; therefore, to advance
-an extra 6 points below where <strong>MCX</strong> would
-normally place you, you'd enter
-
-<pre>
-    .MCX 6p
-</pre>
+If you pass the <kbd>&lt;distance&gt;</kbd> argument to MCX, it
+advances 1 linespace below the longest column (see above) PLUS the
+distance specified by the argument.  The argument requires a unit
+of measure; therefore, to advance an extra 6 points below where MCX
+would normally place you, you&#8217;d enter
+<br/>
+<span class="pre-in-pp">
+  .MCX 6p
+</span>
 </p>
 
-<p>
-<strong>NOTE:</strong> If you wish to advance a precise distance
-below the
-<a href="definitions.html#TERMS_BASELINE">baseline</a>
-of the longest column, use <strong>MCX</strong> with an
-argument of 0 (zero; no unit of measure required) in conjunction
-with the
-<a href="#ALD">ALD</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> If you wish to advance a precise
+distance below the
+<a href="definitions.html#baseline">baseline</a>
+of the longest column, use MCX with an argument of 0 (zero; no unit
+of measure required) in conjunction with the
+<a href="#ald">ALD</a>
 macro, like this:
-
-<pre>
-    .MCX 0
-    .ALD 24p
-</pre>
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -12px;">
+  .MCX 0
+  .ALD 24p
+</span>
 </p>
+</div>
 
 <p>
 The above advances to precisely 24 points below the baseline
 of the longest column.
 </p>
 
-<hr/>
+<div class="rule-short" style="margin-bottom: 24px;"><hr/></div>
 
 <!-- ==================================================================== -->
 
-<a name="INDENTS"><h2><u>Indents</u></h2></a>
+<h2 id="indents-intro" class="macro-group">Indents</h2>
 
-<p> With <strong>mom</strong>'s indents, you can indent from the
-left, the right, or both margins.  In addition, <strong>mom</strong>
-provides temporary left indents (i.e. only one line is indented, as
-at the start of a paragraph) and &quot;hanging&quot; left indents
-(the reverse of a temporary indent; the first line isn't indented,
-subsequent lines are).
+<p>
+With mom&#8217;s indents, you can indent from the left, the right,
+or both margins.  In addition, mom provides temporary left indents
+(i.e. only one line is indented, as at the start of a paragraph)
+and &#8220;hanging&#8221; left indents (the reverse of a temporary
+indent; the first line isn&#8217;t indented, subsequent lines are).
 </p>
 
-<a name="INDENTS_TUT"><h3><u>A brief explanation of how mom handles indents</u></h3></a>
+<h3 id="indents-handling" class="docs">How mom handles indents</h3>
 
 <p>
-<strong>Mom</strong> provides five kinds of indents: left, right,
-both, temporary, and hanging.  Each is invoked by its own name:
-
-<ul>
-    <li><strong>IL</strong> (<strong>I</strong>ndent <strong>L</strong>eft)</li>
-    <li><strong>IR</strong> (<strong>I</strong>ndent <strong>R</strong>ight)</li>
-    <li><strong>IB</strong> (<strong>I</strong>ndent <strong>B</strong>oth)</li>
-    <li><strong>HI</strong> (<strong>H</strong>anging <strong>I</strong>ndent)</li>
-    <li><strong>TI</strong> (<strong>T</strong>emporary <strong>I</strong>ndent)</li>
-</ul>
+Mom provides five kinds of indents: left, right, both, temporary,
+and hanging.  Each is invoked by its own name:
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>IL &ndash; Indent Left</li>
+<li>IR &ndash; Indent Right</li>
+<li>IB &ndash; Indent Both</li>
+<li>HI &ndash; Hanging Indent</li>
+<li>TI &ndash; Temporary Indent</li>
+</ul>
 
 <p>
 In addition, there are four macros to control exiting from
 indents:
-
-<ul>
-    <li><strong>IQ</strong> (quit all active indents)</li>
-    <li><strong>ILX</strong> (exit indent style left)</li>
-    <li><strong>IRX</strong> (exit indent style right)</li>
-    <li><strong>IBX</strong> (exit indent style both)</li>
-</ul>
 </p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+<li>IQ &ndash; quit all active indents</li>
+<li>ILX &ndash; exit indent style left</li>
+<li>IRX &ndash; exit indent style right</li>
+<li>IBX &ndash; exit indent style both</li>
+</ul>
 
 <p>
-This section deals exclusively with <strong>IL, IR</strong> and
-<strong>IB</strong>.  For an explanation of hanging and temporary
-indents &mdash; how they work and how to use them &mdash; see
-<a href="#HI">Hanging indents</a>
+This section deals exclusively with IL, IR and IB.  For an
+explanation of hanging and temporary indents&mdash;how they work and
+how to use them&mdash;see
+<a href="#hi">Hanging indents</a>
 and
-<a href="#TI">Temporary indents</a>.
+<a href="#ti">Temporary indents</a>.
 </p>
 
 <p>
-The first time you invoke any of <strong>mom</strong>'s indents,
-you must supply a measure.  For example,
-
-<pre>
-    .IL 2P
-</pre>
-
-indents text 2 picas from the left margin (or current tab
-indent).
+The first time you invoke any of mom&#8217;s indents, you must
+supply a measure.  For example,
+<br/>
+<span class="pre-in-pp">
+  .IL 2P
+</span>
+indents text 2 picas from the left margin (or current tab indent).
 </p>
 
 <p>
 When you want to exit the above indent, use either
-
-<pre>
-    .IQ
-     or
-    .ILX
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -1em;">
+  .IQ
+</span>
+or
+<span class="pre-in-pp" style="margin-top: -.5em;">
+  .ILX
+</span>
 The next time you want the same indent, invoke it without the
 argument, like this:
-
-<pre>
-    .IL
-</pre>
-</p>
-
-<p>
-As you can see, once you've supplied a measure to an indent macro
-<strong>mom</strong> stores the value, obviating the need to repeat
-it on subsequent invocations.  And <strong>mom</strong> doesn't just
-store the measure &mdash; she hangs on to it tenaciously.  Arguments
-passed to <strong>IL, IR</strong> and <strong>IB</strong> are
-additive.  Consider the following:
-
-<pre>
-    .LL 20P
-    .IR 2P    \"Indent right by 2 picas
-    A first block of text...
-    ...
-    ...
-    .IQ       \"Turn indent off
-    A second block of text...
-    ...
-    ...
-    .IR 2P    \"Indent right by an additional 2 picas (i.e. 4 picas)
-    A third block of text...
-    ...
-    ...
-</pre>
-</p>
-
-<p>
+<br/>
+<span class="pre-in-pp">
+  .IL
+</span>
+As you can see, once you&#8217;ve supplied a measure to an indent
+macro mom stores the value, obviating the need to repeat it on
+subsequent invocations.  And mom doesn&#8217;t just store the
+measure&mdash;she hangs on to it tenaciously.  Arguments passed to
+IL, IR and IB are additive.  Consider the following:
+<br/>
+<span class="pre-in-pp">
+  .LL 20P
+  .IR 2P    \"Indent right by 2 picas
+  A first block of text...
+  ...
+  ...
+  .IQ       \"Turn indent off
+  A second block of text...
+  ...
+  ...
+  .IR 2P    \"Indent right by an additional 2 picas (i.e. 4 picas)
+  A third block of text...
+  ...
+  ...
+</span>
 The first block of text is right indented by 2 picas (i.e. the line
 length is shortened by 2 picas to 18 picas).  The second block of
-text, after <strong>IQ</strong>, is, as you'd expect, set to the
-full measure.  The third block of text &mdash; the one to pay attention
-to &mdash; is not right indented by 2 picas, but rather by 4 picas.
-<strong>Mom</strong> adds the value of arguments to <strong>IL,
-IR</strong> and <strong>IB</strong> to whatever value is already in
-effect.
+text, after IQ, is, as you&#8217;d expect, set to the full measure.
+The third block of text&mdash;the one to pay attention to&mdash;is
+not right indented by 2 picas, but rather by 4 picas.  Mom adds
+the value of arguments to IL, IR and IB to whatever value is already
+in effect.
 </p>
 
 <p>
 If you wanted the third block of text in the example above to be
-right indented by just 2 picas (the original measure given to
-<strong>IR</strong>), you would enter <kbd>.IR</kbd> without an
-argument.
+right indented by just 2 picas (the original measure given to IR),
+you would enter <kbd>.IR</kbd> without an argument.
 </p>
 
 <p>
 Because indent arguments are additive, putting a minus sign in front
 of the argument can be used to subtract from the current value.
 In the following example, the first line is indented 18 points,
-the second is indented 36 points (18+18), and the third is again
-indented 18 points (36-18).
-
-<pre>
-    .IL 18p     \"Indent left by 18 points      = 18 points
-    Now is the time
-    .IL 18p     \"Indent left by 18 points more = 36 points
-    for all good men to come
-    .IL -18p    \"Indent left by 18 points less = 18 points
-    to the aid of the party.
-</pre>
-</p>
-
-<p>
-Sometimes, you may want to clear out the stored indent values
-&mdash; let <strong>mom</strong> start indenting with a clean slate,
-as it were.  Giving the optional argument <kbd>CLEAR</kbd> to any of
-the &quot;indent quit&quot; macros resets them to zero.
-
-<ul>
-    <li><strong>IQ CLEAR</strong> (quit and clear all indents)</li>
-    <li><strong>ILX CLEAR</strong> (quit and clear indent style left)</li>
-    <li><strong>IRX CLEAR</strong> (quit and clear indent style right)</li>
-    <li><strong>IBX CLEAR</strong> (quit and clear indent style both)</li>
+the second is indented 36 points (18 + 18), and the third is again
+indented 18 points (36 - 18).
+<br/>
+<span class="pre-in-pp">
+  .IL 18p     \"Indent left by 18 points      = 18 points
+  Now is the time
+  .IL 18p     \"Indent left by 18 points more = 36 points
+  for all good men to come
+  .IL -18p    \"Indent left by 18 points less = 18 points
+  to the aid of the party.
+</span>
+Sometimes, you may want to clear out the stored indent
+values&mdash;let mom start indenting with a clean slate, as it
+were.  Giving the optional argument <kbd>CLEAR</kbd> to any of the
+&#8220;indent quit&#8221; macros resets them to zero.
+</p>
+<ul style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>IQ CLEAR &ndash; quit and clear all indents</li>
+  <li>ILX CLEAR &ndash; quit and clear indent style left</li>
+  <li>IRX CLEAR &ndash; quit and clear indent style right</li>
+  <li>IBX CLEAR &ndash; quit and clear indent style both</li>
 </ul>
-</p>
-
-<p>
-Indent styles may be combined and manipulated separately.  You could,
-for example, have a left indent of 4 picas and a right indent of 6
-picas and control each separately, as in the following example.
-
-<pre>
-    .IL 4P     \"Indent left 4 picas
-    .IR 6P     \"Indent right 6 picas
-    Some text
-    .IRX       \"Turn off the right indent only
-    More text  \"Text is still indented 4 picas left
-</pre>
-</p>
 
 <p>
+Indent styles may be combined and manipulated separately.  You
+could, for example, have a left indent of 4 picas and a right indent
+of 6 picas and control each separately, as in the following example.
+<br/>
+<span class="pre-in-pp">
+  .IL 4P     \"Indent left 4 picas
+  .IR 6P     \"Indent right 6 picas
+  Some text
+  .IRX       \"Turn off the right indent only
+  More text  \"Text is still indented 4 picas left
+</span>
 If, at <kbd>.IRX</kbd>, you wanted the text afterwards to have no
 indents (either left or right), you would enter <kbd>.IQ</kbd>,
 which exits all indent styles at once.
 </p>
 
 <p>
-<strong>A word of advice:</strong> Indents are best used only
-when you have a compelling reason not to change the current left
-margin or line length.  In many instances where indents might
-seem expedient, it's better to use tabs, or actually change the
-left margin or the line length. <strong>Mom</strong>'s indenting
-macros are flexible and powerful, but easy to get tangled up
-in.  Personally, I don't use them much, except for cutarounds and
-multi-level lists à la html, at which they excel.
+A word of advice: Indents are best used only when you have a
+compelling reason not to change the current left margin or line
+length.  In many instances where indents might seem expedient,
+it&#8217;s better to use tabs, or actually change the left margin
+or the line length. Mom&#8217;s indenting macros are flexible and
+powerful, but easy to get tangled up in.  Personally, I don&#8217;t
+use them much, except for cutarounds and multi-level lists à la
+html, at which they excel.
 </p>
 
-<p>
-<strong>NOTE:</strong> see the section
-<a href="typemacdoc.html#TYPESETTING">Typesetting Macros in Document Processing</a>
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span> see the section
+<a href="docprocessing.html#behaviour">Typesetting macros during document processing</a>
 for information and advice on using indents with the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
+<a href="docprocessing.html#docprocessing">document processing macros</a>.
 </p>
+</div>
 
-<a name="INDEX_INDENTS"><h3><u>Indents macro list</u></h3></a>
+<div id="index-indents" class="macro-list-container">
+<h3 class="macro-list">Indents macros</h3>
 
-<ul>
-    <li><a href="#IL">IL</a> (Indent left)</li>
-    <li><a href="#IR">IR</a> (Indent right)</li>
-    <li><a href="#IB">IB</a> (Indent both)</li>
-    <li><a href="#TI">TI</a> (Temporary indent, left)</li>
-    <li><a href="#HI">HI</a> (Hanging Indent)</li>
-    <ul>
-        <li><a href="#NUM_LISTS">A recipe for numbered lists</a></li>
-    </ul>
-    <li><a href="#IQ">IQ</a> (Quit indents, all)</li>
-    <li><a href="#IQ">ILX</a> (Exit indent style left)</li>
-    <li><a href="#IQ">IRX</a> (Exit indent style right)</li>
-    <li><a href="#IQ">IBX</a> (Exit indent style both)</li>
+<ul class="macro-list">
+  <li><a href="#il">IL</a> &ndash; Indent left</li>
+  <li><a href="#ir">IR</a> &ndash; Indent right</li>
+  <li><a href="#ib">IB</a> &ndash; Indent both</li>
+  <li><a href="#ti">TI</a> &ndash; Temporary indent, left</li>
+  <li><a href="#hi">HI</a> &ndash; Hanging Indent
+  <ul style="margin-left: -.5em; list-style-type: disc;">
+    <li><a href="#num-lists">Recipe: a numbered list using hanging indents</a></li>
+  </ul></li>
+  <li><a href="#iq">IQ</a> &ndash; Quit indents, all</li>
+  <li><a href="#iq">ILX</a> &ndash; Exit indent style left</li>
+  <li><a href="#iq">IRX</a> &ndash; Exit indent style right</li>
+  <li><a href="#iq">IBX</a> &ndash; Exit indent style both</li>
 </ul>
+</div>
 
 <!-- -IL- -->
 
-<hr width="66%" align="left"/>
-
-<a name="IL"><h3><u>Indent left</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>IL</strong> <kbd>[ &lt;measure&gt; ]</kbd></nobr>
-
-<br/>
-<em>*The optional argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="macro-id-overline">
+<h3 id="il" class="macro-id">Indent left</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>IL</b> <kbd class="macro-args">[ &lt;measure&gt; ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;The optional argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>IL</strong> indents text from the left margin of the
-page, or if you're in a tab, from the left edge of the tab.  Once
-<strong>IL</strong> is on, the left indent is applied uniformly to
-every subsequent line of text, even if you change the line length.
+IL indents text from the left margin of the page, or if you&#8217;re
+in a tab, from the left edge of the tab.  Once IL is on, the left
+indent is applied uniformly to every subsequent line of text, even
+if you change the line length.
 </p>
 
 <p>
@@ -4677,52 +4514,52 @@
 measure.  Subsequent invocations with a measure add to the previous
 measure.  A minus sign may be prepended to the argument to subtract
 from the current measure.  The
-<a href="inlines.html#INLINE_STRINGWIDTH_GROFF"><kbd>\w</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-may be used to specify a text-dependent measure, in which case
-no unit of measure is required.  For example,
-
-<pre>
-    .IL \w'margarine'
-</pre>
-
-indents text by the width of the word &quot;margarine&quot;.
+<kbd><a href="inlines.html#inline-stringwidth-groff">\w</a></kbd>
+<a href="definitions.html#inlines">inline escape</a>
+may be used to specify a text-dependent measure, in which case no
+unit of measure is required.  For example,
+<br/>
+<span class="pre-in-pp">
+  .IL \w'margarine'
+</span>
+indents text by the width of the word &#8220;margarine&#8221;.
 </p>
 
 <p>
-With no argument, <strong>IL</strong> indents by its last
-active value.  See the
-<a href="#INDENTS_TUT">brief explanation of how mom handles indents</a>
+With no argument, IL indents by its last active value.  See the
+<a href="#indents-explanation">brief explanation of how mom handles indents</a>
 for more details.
 </p>
 
-<p>
-<strong>NOTE:</strong> Calling a tab (with
-<a href="#TAB">TAB</a>)
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> Calling a tab (with
+<kbd><a href="#tab">.TAB &lt;n&gt;</a></kbd>)
 automatically cancels any active indents.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Invoking <strong>IL</strong>
-automatically turns off <strong>IB</strong>.
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span> Invoking IL
+automatically turns off IB.
 </p>
+</div>
 
 <!-- -IR- -->
 
-<hr width="33%" align="left"/>
-
-<a name="IR"><h3><u>Indent right</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="ir" class="macro-id">Indent right</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>IR</strong> <kbd>[ &lt;measure&gt; ]</kbd></nobr>
-<br/>
-
-<em>*The optional argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>IR</b> <kbd class="macro-args">[ &lt;measure&gt; ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;The optional argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>IR</strong> indents text from the right margin of the
-page, or if you're in a tab, from the end of the tab.
+IR indents text from the right margin of the page, or if
+you&#8217;re in a tab, from the end of the tab.
 </p>
 
 <p>
@@ -4730,285 +4567,269 @@
 measure.  Subsequent invocations with a measure add to the previous
 indent measure.  A minus sign may be prepended to the argument to
 subtract from the current indent measure.  The
-<a href="inlines.html#INLINE_STRINGWIDTH_GROFF"><kbd>\w</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-may be used to specify a text-dependent measure, in which case
-no unit of measure is required.  For example,
-
-<pre>
-    .IR \w'jello'
-</pre>
-
-indents text by the width of the word &quot;jello&quot;.
+<kbd><a href="inlines.html#inline-stringwidth-groff">\w</a></kbd>
+<a href="definitions.html#inlines">inline escape</a>
+may be used to specify a text-dependent measure, in which case no
+unit of measure is required.  For example, <br/>
+<span class="pre-in-pp">
+  .IR \w'jello'
+</span>
+indents text by the width of the word &#8220;jello&#8221;.
 </p>
 
 <p>
-With no argument, <strong>IR</strong> indents by its last
-active value.  See the
-<a href="#INDENTS_TUT">brief explanation of how mom handles indents</a>
+With no argument, IR indents by its last active value.  See the
+<a href="#indents-explanation">brief explanation of how mom handles indents</a>
 for more details.
 </p>
 
-<p>
-<strong>NOTE:</strong> Calling a tab (with
-<a href="#TAB">TAB</a>)
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> Calling a tab (with
+<kbd><a href="#tab">.TAB &lt;n&gt;</a></kbd>)
 automatically cancels any active indents.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Invoking <strong>IR</strong>
-automatically turns off <strong>IB</strong>.
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span> Invoking IR
+automatically turns off IB.
 </p>
+</div>
 
 <!-- -IB- -->
 
-<hr width="33%" align="left"/>
-
-<a name="IB"><h3><u>Indent both</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="ib" class="macro-id">Indent both</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>IB</strong> <kbd>[ &lt;left measure&gt; &lt;right measure&gt; ]</kbd></nobr>
-<br/>
-
-<em>*The optional arguments require a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="box-macro-args">
+Macro: <b>IB</b> <kbd class="macro-args">[ &lt;left measure&gt; &lt;right measure&gt; ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;The optional arguments require a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
-<strong>IB</strong> allows you to set or invoke a left and a right
-indent at the same time.
+IB allows you to set or invoke a left and a right indent at the same
+time.
 </p>
 
 <p>
-At its first invocation, you must supply a measure for both
-indents; at subsequent invocations when you wish to supply a
-measure, both must be given again.  As with <strong>IL</strong> and
-<strong>IR</strong>, the measures are added to the values previously
-passed to the macro.  Hence, if you wish to change just one of the
-values, you must give an argument of zero to the other.
+At its first invocation, you must supply a measure for both indents;
+at subsequent invocations when you wish to supply a measure, both
+must be given again.  As with IL and IR, the measures are added to
+the values previously passed to the macro.  Hence, if you wish to
+change just one of the values, you must give an argument of zero to
+the other.
 </p>
 
 <p>
-<strong>A word of advice:</strong> If you need to manipulate
-left and right indents separately, use a combination of
-<strong>IL</strong> and <strong>IR</strong> instead of
-<strong>IB</strong>.  You'll save yourself a lot of grief.
+A word of advice: If you need to manipulate left and right
+indents separately, use a combination of IL and IR instead of IB.
+You&#8217;ll save yourself a lot of grief.
 </p>
 
 <p>
 A minus sign may be prepended to the arguments to subtract from
 their current values.  The
-<a href="inlines.html#INLINE_STRINGWIDTH_GROFF"><kbd>\w</kbd></a>
-<a href="definitions.html#TERMS_INLINES">inline escape</a>
-may be used to specify text-dependent measures, in which case
-no unit of measure is required.  For example,
-
-<pre>
-    .IB \w'margarine' \w'jello'
-</pre>
-
-left indents text by the width of the word &quot;margarine&quot;
-and right indents by the width of &quot;jello&quot;.
+<a href="inlines.html#inline-stringwidth-groff"><kbd>\w</kbd></a>
+<a href="definitions.html#inlines">inline escape</a>
+may be used to specify text-dependent measures, in which case no
+unit of measure is required.  For example,
+<br/>
+<span class="pre-in-pp">
+  .IB \w&#8217;margarine&#8217; \w'jello'
+</span>
+left indents text by the width of the word &#8220;margarine&#8221;
+and right indents by the width of &#8220;jello&#8221;.
 </p>
 
 <p>
-Like <strong>IL</strong> and <strong>IR</strong>, <strong>IB</strong>
-with no argument indents by its last active values.  See the
-<a href="#INDENTS_TUT">brief explanation of how mom handles indents</a>
+Like IL and IR, IB with no argument indents by its last active
+values.  See the
+<a href="#indents-explanation">brief explanation of how mom handles indents</a>
 for more details.
 </p>
 
-<p>
-<strong>NOTE:</strong> Calling a tab (with
-<a href="#TAB">TAB</a>)
+<div class="box-tip">
+<p class="tip-top">
+<span class="note">Note:</span> Calling a tab (with
+<kbd><a href="#tab">.TAB &lt;n&gt;</a></kbd>)
 automatically cancels any active indents.
 </p>
 
-<p>
-<strong>ADDITIONAL NOTE:</strong> Invoking <strong>IB</strong>
-automatically turns off <strong>IL</strong> and
-<strong>IR</strong>.
+<p class="tip-bottom">
+<span class="additional-note">Additional note:</span> Invoking IB
+automatically turns off IL and IR.
 </p>
+</div>
 
 <!-- -TI- -->
 
-<hr width="33%" align="left"/>
-
-<a name="TI"><h3><u>Temporary (left) indent</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>TI</strong> <kbd>[ &lt;measure&gt; ]</kbd></nobr>
-<br/>
-
-<em>*The optional argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="macro-id-overline">
+<h3 id="ti" class="macro-id">Temporary (left) indent</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>TI</b> <kbd class="macro-args">[ &lt;measure&gt; ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;The optional argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
 A temporary indent is one that applies only to the first line of
-text that comes after it.  Its chief use is indenting the first
-line of paragraphs.  (<strong>Mom</strong>'s
-<a href="docelement.html#PP">PP</a>
+text that comes after it.  Its chief use is indenting the first line
+of paragraphs.  (Mom&#8217;s
+<a href="docelement.html#pp">PP</a>
 macro, for example, uses a temporary indent.)
 </p>
 
 <p>
-The first time you invoke <kbd>.TI</kbd>, you must give it
-a measure.  If you want to indent the first line of a
-paragraph by, say, 2
-<a href="definitions.html#TERMS_EM">ems</a>,
+The first time you invoke <kbd>.TI</kbd>, you must give
+it a measure.  If you want to indent the first line of a paragraph
+by, say, 2
+<a href="definitions.html#em">ems</a>,
 do
-
-<pre>
-    .TI 2m
-</pre>
-</p>
-
-<p>
-Subsequent invocations of <strong>TI</strong> do not require you
-to supply a measure; <strong>mom</strong> keeps track of the
-last measure you gave it.
+<br/>
+<span class="pre-in-pp">
+  .TI 2m
+</span>
+Subsequent invocations of TI do not require you to supply a measure;
+mom keeps track of the last measure you gave it.
 </p>
 
 <p>
-Because temporary indents are temporary, there's no need to turn
-them off.
+Because temporary indents are temporary, there&#8217;s no need to
+turn them off.
 </p>
 
-<p>
-<strong>IMPORTANT:</strong> Unlike <strong>IL, IR</strong> and
-<strong>IB</strong>, measures given to <strong>TI</strong>
-are NOT additive.  In the following example, the second <kbd>.TI
-2P</kbd> is exactly 2 picas.
-
-<pre>
-    .TI 1P
-    The beginning of a paragraph...
-    .TI 2P
-    The beginning of another paragraph...
-</pre>
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> Unlike IL, IR and IB,
+measures given to TI are NOT additive.  In the following example,
+the second <kbd>.TI&nbsp;2P</kbd> is exactly 2 picas.
+<br/>
+<span class="pre-in-pp" style="margin-bottom: -18px;">
+  .TI 1P
+  The beginning of a paragraph...
+  .TI 2P
+  The beginning of another paragraph...
+</span>
 </p>
+</div>
 
 <!-- -HI- -->
 
-<hr width="66%" align="left"/>
-
-<a name="HI"><h3><u>Hanging indent</u></h3></a>
-
-<p>
-<nobr>Macro: <strong>HI</strong> <kbd>[ &lt;measure&gt; ]</kbd></nobr>
-<br/>
-
-<em>*The optional argument requires a <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>
+<div class="macro-id-overline">
+<h3 id="hi" class="macro-id">Hanging indent</h3>
+</div>
+
+<div class="box-macro-args">
+Macro: <b>HI</b> <kbd class="macro-args">[ &lt;measure&gt; ]</kbd>
+</div>
+<p class="requires">
+&bull;&nbsp;The optional argument requires a <a href="definitions.html#unitofmeasure">unit of measure</a>
 </p>
 
 <p>
 A hanging indent looks like this:
-
-<pre>
-    The thousand injuries of Fortunato I had borne as best I
-        could, but when he ventured upon insult, I vowed
-        revenge.  You who so well know the nature of my soul
-        will not suppose, however, that I gave utterance to a
-        threat, at length I would be avenged...
-</pre>
-</p>
-
-<p>
-The first line of text &quot;hangs&quot; outside the left
-margin.
+<br/>
+<span class="pre-in-pp">
+  The thousand injuries of Fortunato I had borne as best I
+    could, but when he ventured upon insult, I vowed
+    revenge.  You who so well know the nature of my soul
+    will not suppose, however, that I gave utterance to a
+    threat, at length I would be avenged...
+</span>
+The first line of text &#8220;hangs&#8221; outside the left margin.
 </p>
 
 <p>
 In order to use hanging indents, you must first have a left indent
 active (set with either
-<a href="#IL">IL</a>
+<kbd><a href="#il">.IL</a></kbd>
 or
-<a href="#IB">IB</a>).
-<strong>Mom</strong> will not hang text outside the left margin set with
-<a href="#L_MARGIN">L_MARGIN</a>
+<kbd><a href="#ib">.IB</a></kbd>).
+Mom will not hang text outside the left margin set with
+<kbd><a href="#l-margin">.L_MARGIN</a></kbd>
 or outside the left margin of a tab.
 </p>
 
 <p>
-The first time you invoke <kbd>.HI</kbd>, you must give it
-a measure.  If you want the first line of a paragraph to hang by,
+The first time you invoke <kbd>.HI</kbd>, you must give
+it a measure.  If you want the first line of a paragraph to hang by,
 say, 1 pica, do
-
-<pre>
-    .IL 1P
-    .HI 1P
-</pre>
-</p>
-
-<p>
-Subsequent invocations of <strong>HI</strong> do not require you
-to supply a measure; <strong>mom</strong> keeps track of the
-last measure you gave it.
+<br/>
+<span class="pre-in-pp">
+  .IL 1P
+  .HI 1P
+</span>
+Subsequent invocations of HI do not require you to supply a measure;
+mom keeps track of the last measure you gave it.
 </p>
 
 <p>
-Generally speaking, you should invoke <strong>HI</strong>
-immediately prior to the line you want hung (i.e. without any
-intervening
-<a href="definitions.html#TERMS_CONTROLLINES">control lines</a>).
-And because hanging indents affect only one line, there's no need to
-turn them off.
+Generally speaking, you should invoke HI immediately prior to the
+line you want hung (i.e. without any intervening
+<a href="definitions.html#controllines">control lines</a>).
+And because hanging indents affect only one line, there&#8217;s no
+need to turn them off.
 </p>
 
-<a name="NUM_LISTS"><h4><u>A recipe for numbered lists</u></h4></a>
+<h4 id="num-lists" class="macro-id">Recipe: Numbered lists using hanging indents</h4>
 
-<p>
-<strong>PLEASE NOTE: mom</strong> now has macros for setting lists (see
-<a href="docelement.html#LIST_INTRO">Nested lists</a>),
-making this recipe superfluous.  It remains here in the hope that
-it will clarify the use of hanging indents generally, if no longer
-specifically.
+<div class="box-tip" style="margin-top: -.5em; margin-bottom: -.5em;">
+<p class="tip">
+<span class="note">Note:</span> mom has macros for setting lists (see
+<a href="docelement.html#list-intro">Nested lists</a>).
+This recipe exists to demonstrate the use of hanging indents only.
 </p>
+</div>
 
-<p>
+<p style="margin-top: 1.5em;">
 Consider the following example:
-
-<pre>
-    .PAGE 8.5i 11i 1i 1i 1i 1i
-    .FAMILY  T
-    .FT      R
-    .PT_SIZE 12
-    .LS      14
-    .JUSTIFY
-    .KERN
-    .SS 0
-    .IL \w'\0\0.'    \"Indent left by 2 figure spaces and a period
-    .HI \w'\0\0.'    \"Hang first line of text back by 2 figure spaces and a period
-    1.\0The most important point to be considered is whether the
-    answer to the meaning of life, the universe, and everything
-    really is 42.  We have no-one's word on the subject except
-    Mr. Adams'.
-    .HI
-    2.\0If the answer to the meaning of life, the universe,
-    and everything is indeed 42, what impact does this have on
-    the politics of representation?  42 is, after all not a
-    prime number.  Are we to infer that prime numbers don't
-    deserve equal rights and equal access in the universe?
-    .HI
-    3.\0If 42 is deemed non-exclusionary, how do we present it
-    as the answer and, at the same time, forestall debate on its
-    exclusionary implications?
-</pre>
-</p>
-
-<p>
-First, we invoke a left indent with a measure equal to the width
-of 2
-<a href="definitions.html#TERMS_FIGURESPACE">figures spaces</a>
+<br/>
+<span class="pre-in-pp">
+  .PAGE 8.5i 11i 1i 1i 1i 1i
+  .FAMILY  T
+  .FT      R
+  .PT_SIZE 12
+  .LS      14
+  .JUSTIFY
+  .KERN
+  .SS 0
+  .IL \w'\0\0.'  \"Indent left by 2 figure spaces and a period
+  .HI \w'\0\0.'  \"Hang first line back by 2 figure spaces and a period
+  1.\0The most important point to be considered is whether the
+  answer to the meaning of Life, the Universe, and Everything
+  really is 42.  We have no-one&#8217;s word on the subject except
+  Mr. Adams&#8217;.
+  .HI
+  2.\0If the answer to the meaning of Life, the Universe,
+  and Everything is indeed 42, what impact does this have on
+  the politics of representation?  42 is, after all not a
+  prime number.  Are we to infer that prime numbers don&#8217;t
+  deserve equal rights and equal access in the universe?
+  .HI
+  3.\0If 42 is deemed non-exclusionary, how do we present it
+  as the answer and, at the same time, forestall debate on its
+  exclusionary implications?
+</span>
+First, we invoke a left indent with a measure equal to the width of
+2
+<a href="definitions.html#figurespace">figures spaces</a>
 plus a period (using the
-<a href="inlines.html#INLINE_STRINGWIDTH_GROFF"><kbd>\w</kbd></a>
+<a href="inlines.html#inline-stringwidth-groff"><kbd>\w</kbd></a>
 inline escape).  At this point, the left indent is active; text
-afterwards would normally be indented.  However, we invoke a hanging
-indent of exactly the same width, which hangs the first line (and
-first line only!) to the left of the indent by the same distance (in
-this case, that means &quot;out to the left margin&quot;).  Because
-we begin the first line with a number, a period, and a figure space,
-the actual text (&quot;The most important point...&quot;) starts at
-exactly the same spot as the indented lines that follow.
+afterwards would normally be indented.  However, we invoke a
+hanging indent of exactly the same width, which hangs the first
+line (and first line only!) to the left of the indent by the
+same distance (in this case, that means &#8220;out to the left
+margin&#8221;).  Because we begin the first line with a number,
+a period, and a figure space, the actual text (&#8220;The most
+important point...&#8221;) starts at exactly the same spot as the
+indented lines that follow.
 </p>
 
 <p>
@@ -5018,50 +4839,50 @@
 
 <p>
 Paste the example above into a file and preview it with <kbd>groff
-- mom -X &lt;filename&gt;</kbd> to see hanging indents in action.
+-mom -X &lt;filename&gt;</kbd> to see hanging indents in action.
 </p>
 
-<p>
-<strong>IMPORTANT:</strong> Unlike <strong>IL, IR</strong> and
-<strong>IB</strong>, measures given to <strong>HI</strong>
-are NOT additive.  Each time you pass a measure to
-<strong>HI</strong>, the measure is treated literally.
+<div class="box-important">
+<p class="tip">
+<span class="important">IMPORTANT:</span> Unlike IL, IR and IB,
+measures given to HI are NOT additive.  Each time you pass a measure
+to HI, the measure is treated literally.
 </p>
+</div>
 
 <!-- -IX- -->
 
-<hr width="33%" align="left"/>
-
-<a name="IQ"><h3><u>Quitting indents</u></h3></a>
+<div class="macro-id-overline">
+<h3 id="iq" class="macro-id">Quitting indents</h3>
+</div>
 
-<p>
-<nobr>Macro: <strong>IQ</strong> <kbd>[ CLEAR ]</kbd> (quit any/all indents &mdash; see <strong>IMPORTANT NOTE</strong>)</nobr>
+<div class="box-macro-args">
+Macro: <b>IQ</b> <kbd class="macro-args">[ CLEAR ]</kbd> (quit any/all indents &mdash; see IMPORTANT NOTE)
+</div>
 <br/>
 
-<nobr>Macro: <strong>ILX</strong> <kbd>[ CLEAR ]</kbd> (exit <strong>I</strong>ndent <strong>L</strong>eft)</nobr>
+Macro: <b>ILX</b> <kbd class="macro-args">[ CLEAR ]</kbd> (exit Indent Left)
 <br/>
 
-<nobr>Macro: <strong>IRX</strong> <kbd>[ CLEAR ]</kbd> (exit <strong>I</strong>ndent <strong>R</strong>ight)</nobr>
+Macro: <b>IRX</b> <kbd class="macro-args">[ CLEAR ]</kbd> (exit Indent Right)
 <br/>
 
-<nobr>Macro: <strong>IBX</strong> <kbd>[ CLEAR ]</kbd> (exit <strong>I</strong>ndent <strong>B</strong>oth)</nobr>
-</p>
+Macro: <b>IBX</b> <kbd class="macro-args">[ CLEAR ]</kbd> (exit Indent Both)
 
-<p>
-<strong>*IMPORTANT NOTE:</strong> <em>Formerly, the macro for
-quitting all indents was</em> <strong>IX</strong><em>.  This usage
-is now deprecated, in favour of</em> <strong>IQ</strong><em>.</em>
-<strong>IX</strong> <em>will continue to behave as before, but</em>
-<strong>mom</strong> <em>will issue a warning to stderr indicating
-that you should update your documents.</em>
+<div class="box-important">
+<p class="tip-top">
+<span class="important">IMPORTANT NOTE:</span> Formerly, the macro
+for quitting all indents was IX.  This usage is now deprecated, in
+favour of IQ.  IX will continue to behave as before, but mom will
+issue a warning to stderr indicating that you should update your
+documents.
 </p>
 
-<p>
-<em>As a consequence of this change,</em> <strong>ILX, IRX</strong>
-<em>and</em> <strong>IBX</strong> <em>may now also be
-invoked as</em> <strong>ILQ, IRQ</strong> <em>and</em>
-<strong>IBQ</strong><em>.  Both forms are acceptable.</em>
+<p class="tip-bottom">
+As a consequence of this change, ILX, IRX and IBX may now also be
+invoked as ILQ, IRQ and IBQ.  Both forms are acceptable.
 </p>
+</div>
 
 <p>
 Without an argument, the macros to quit indents merely restore your
@@ -5079,21 +4900,25 @@
 </p>
 
 <p>
-<kbd>.IQ CLEAR</kbd>, as you'd suspect, quits and clears the values
-for all indent styles at once.
+<kbd>.IQ&nbsp;CLEAR</kbd>, as you&#8217;d suspect,
+quits and clears the values for all indent styles at once.
 </p>
 
-<hr/>
+<div class="rule-long"><hr/></div>
 
-<p>
-<a href="goodies.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="definitions.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+<tr>
+  <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+  <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+  <td style="width: 33%; text-align: right;"><a href="goodies.html#top">Next: Goodies</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
 
 </body>
 </html>
-
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/momdoc/using.html groff-1.21/contrib/mom/momdoc/using.html
--- groff-1.20.1/contrib/mom/momdoc/using.html	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/contrib/mom/momdoc/using.html	2010-12-31 08:33:09.000000000 +0100
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -16,220 +16,170 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Using mom</title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+  <title>Using mom</title>
+  <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
-<body bgcolor="#dfdfdf">
+
+<body style="background-color: #f5faff;">
 
 <!-- ==================================================================== -->
 
-<a name="TOP"></a>
+<div id="top" class="page">
 
-<p>
-<a href="typesetting.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="definitions.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
-</p>
+<!-- Navigation links -->
+<table style="width: 100%;">
+  <tr>
+    <td><a href="toc.html">Back to Table of Contents</a></td>
+    <td style="text-align: right;"><a href="typesetting.html#top">Next: The typesetting macros</a></td>
+  </tr>
+  </table>
+
+<h1 id="using" class="docs">Using mom</h1>
+
+<div style="text-align: center;">
+<ul class="no-enumerator" style="margin-left: -2.5em;">
+  <li ><a href="#using-intro">Introduction</a></li>
+  <li ><a href="#using-macros">How to input mom&#8217;s macros</a></li>
+  <li ><a href="#using-previewing">How to preview documents</a></li>
+  <li ><a href="#using-saving">Saving documents</a></li>
+  <li ><a href="#using-printing">Printing documents</a></li>
+</ul>
+</div>
 
-<a name="USING"><h1 align="center"><u>Using mom</u></h1></a>
+<div class="rule-short" style="margin-top: 18px;"><hr/></div>
 
-<p>
-<a href="#USING_INTRO">Introduction</a>
-<br/>
-<a href="#USING_MACROS">Inputting macros</a>
-<br/>
-<a href="#USING_INVOKING">Invoking groff</a>
-<br/>
-<a href="#USING_PREVIEWING">Previewing documents</a>
-</p>
-
-<hr/>
-
-<h2><a name="USING_INTRO"><u>Introduction</u></a></h2>
+<h2 id="using-intro" class="docs">Introduction</h2>
 
 <p>
 As explained in the section
-<a href="intro.html#INTRO">What is mom?</a>,
-<strong>mom</strong> can be used in two ways: for straight
-typesetting or for document processing.  The difference between
-the two is that in straight typesetting, every macro is a literal
+<a href="intro.html#top">What is mom?</a>,
+mom can be used in two ways: for straight typesetting or
+for document processing.  The difference between the two
+is that in straight typesetting, every macro is a literal
 typesetting instruction that determines precisely how text
-following it will look.  Document processing, on the other hand,
-uses markup &quot;tags&quot; (e.g. <kbd>.PP</kbd> for paragraphs,
-<kbd>.HEAD</kbd> for heads, <kbd>.FOOTNOTE</kbd> for footnotes,
-etc.) that make a lot of typesetting decisions automatically.
-</p>
-
-<p>
-You tell <strong>mom</strong> that you want to use the document
-processing macros with the
-<a href="docprocessing.html#START">START</a>
-macro, explained below.  After <strong>START</strong>,
-<strong>mom</strong> determines the appearance of text following
-the markup tags automatically, although you, the user, can easily
-change how <strong>mom</strong> interprets the tags.  This gives you
-nearly complete control over document design.  In addition, the
-typesetting macros, in combination with document processing, let you
-meet all sorts of typesetting needs that just can't be covered by
-&quot;one macro fits all&quot; markup tags.
+following it will look.  Document processing, on the other
+hand, uses markup tags (e.g. <kbd>.PP</kbd> for
+paragraphs, <kbd>.HEAD</kbd> for heads,
+<kbd>.FOOTNOTE</kbd> for footnotes, etc.) that make a
+lot of typesetting decisions automatically.
 </p>
 
-<a name="USING_MACROS"><h2><u>How to input mom's macros</u></h2></a>
-
 <p>
-Regardless of which way you use <strong>mom</strong>, the
-following apply.
-</p>
-
-<ol>
-    <li>
-    You need a good text editor for inputting
-    <strong>mom</strong> files.
-
-    <p>
-    I cannot recommend highly enough that you use an
-    editor that lets you write syntax highlighting
-    rules for <strong>mom</strong>'s macros and
-    <a href="definitions.html#TERMS_INLINES">inline escapes</a>.
-    I use the vi clone called elvis, and find it a pure
-    joy in this regard.  Simply colourizing macros and
-    inlines to half-intensity can be enough to make text stand
-    out clearly from formatting commands.
-    </p>
-
-    </li>
-
-    <li>
-    All <strong>mom</strong>'s macros begin with a period
-    (dot) and must be entered in upper case (capital)
-    letters.
-    </li>
-
-    <li>
+You tell mom that you want to use the document processing macros
+with the
+<a href="docprocessing.html#start"><kbd>START</kbd></a>
+macro, explained below.  After <kbd>START</kbd>,
+mom determines the appearance of text following the markup tags
+automatically, although you, the user, can easily change how mom
+interprets the tags.  This gives you nearly complete control
+over document design.  In addition, the typesetting macros, in
+combination with document processing, let you meet all sorts of
+typesetting needs that just can&#8217;t be covered by &#8220;one
+macro fits all&#8220; markup tags.
+</p>
+
+<h2 id="using-macros" class="docs">How to input mom&#8217;s macros</h2>
+
+<p>
+Regardless of which way you use mom, the following apply:
+</p>
+
+<ol style="margin-top: -.5em; margin-bottom: -.5em;">
+  <li>
+    You need a good text editor for inputting mom files.
+    <span style="display: block; margin-top: .25em; margin-bottom: .5em;">
+    I cannot recommend highly enough that you use an editor that
+    lets you write syntax highlighting rules for mom&#8217;s
+    macros and
+    <a href="definitions.html#inlines">inline escapes</a>.
+    Simply colourizing macros and inlines to half-intensity can be
+    enough to make text stand out clearly from formatting commands.
+    </span>
+  </li>
+  <li>
+    All mom&#8217;s macros begin with a period (dot) and must be
+    entered in upper case (capital) letters.
+  </li>
+  <li>
     Macro
-    <a href="definitions.html#TERMS_ARGUMENTS">arguments</a>
+    <a href="definitions.html#arguments">arguments</a>
     are separated from the macro itself by spaces.  Multiple
     arguments to the same macro are separated from each
     other by spaces.  Any number of spaces may be used.  All
     arguments to a macro must appear on the same line as the
     macro.
-    </li>
-
-    <li>
+  </li>
+  <li>
     Any argument (except a
-    <a href="definitions.html#TERMS_STRINGARGUMENT">string argument</a>)
+    <a href="definitions.html#stringargument">string argument</a>)
     that is not a digit must be entered in upper case
     (capital) letters.
-    </li>
-
-    <li>
+  </li>
+  <li>
     Any argument that requires a plus or minus sign must
     have the plus or minus sign prepended to the argument
-    with no intervening space (e.g. <kbd>+2, -4</kbd>).
-    </li>
-
-    <li>
+    with no intervening space (e.g. <kbd>+2</kbd>).
+  </li>
+  <li>
     Any argument that requires a
-    <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
-    must have the unit appended directly to the argument, with
-    no intervening space (e.g. <kbd>4P, .5i, 2v</kbd>).
-    </li>
-
-    <li>
-    <a href="definitions.html#TERMS_STRINGARGUMENT">String arguments</a>,
-    in the sense that the term is used in this manual, must
-    be surrounded by double-quotes (&quot;text of
-    string&quot;).  Multiple string arguments are separated
-    from each other by spaces (each argument surrounded by
-    double-quotes, of course).
-    </li>
-
-    <li>
-    If a string argument, as entered in your text editor,
-    becomes uncomfortably long (i.e. runs longer than the
-    visible portion of your screen or window), you may break
-    it into two or more lines by placing the backslash
-    character (<kbd>\</kbd>) at the ends of lines to break
-    them up, like this:
-
-    <pre>
-    .SUBTITLE "An In-Depth Consideration of the \
-    Implications of Forty-Two as the Meaning of Life, \
-    The Universe, and Everything"
-    </pre>
-    </li>
+    <a href="definitions.html#unitofmeasure">unit of measure</a>
+    must have the unit appended directly to the argument, with no
+    intervening space (e.g. <kbd>.5i</kbd>).
+  </li>
+  <li>
+    <a href="definitions.html#stringargument">String arguments</a>,
+    in the sense that the term is used in this manual, must be
+    surrounded by double-quotes
+    (<kbd>"&lt;text of string&gt;"</kbd>).  Multiple
+    string arguments are separated from each other by spaces (each
+    argument surrounded by double-quotes, of course).
+  </li>
+  <li>
+    If a string argument, as entered in your text editor, becomes
+    uncomfortably long (i.e. runs longer than the visible portion of
+    your screen or window), you may break it into two or more lines
+    by placing the backslash character (<kbd>\</kbd>)
+    at the ends of lines to break them up, like this:
+    <span class="pre">
+  .SUBTITLE "An In-Depth Consideration of the \
+  Implications of Forty-Two as the Meaning of Life, \
+  The Universe, and Everything"
+    </span>
+  </li>
 </ol>
 
-<p>
-It's important that formatted documents be easy to read/interpret
-when you're looking at them in a text editor.  One way to achieve
-this is to group macros that serve a similar purpose together, and
-separate them from other groups of macros with a blank comment
-line.  In groff, that's done with <kbd>\#</kbd> on a line by itself.
-Consider the following, which is a template for starting the chapter
-of a book.
-
-<pre>
-    .TITLE   "My Pulitzer Novel"
-    .AUTHOR  "Joe Blow"
-    .CHAPTER  1
-    \#
-    .DOCTYPE    CHAPTER
-    .PRINTSTYLE TYPESET
-    \#
-    .FAM     P
-    .PT_SIZE 10
-    .LS      12
-    \#
-    .START
-</pre>
-</p>
-
-<a name="USING_INVOKING"><h2><u>Printing &mdash; invoking groff with mom</u></h2></a>
-
-<p>
-After you've finished your document, naturally you will want to
-print it.  This involves invoking groff from the command line.  In
-all likelihood, you already know how to do this, but in case you
-don't, here are two common ways to do it.
-
-<pre>
-    groff -mom -l &lt;filename&gt;
-    groff -mom &lt;filename&gt; | lpr
-</pre>
-</p>
-
-<p>
-In the first, the <kbd>-l</kbd> option to groff tells groff to
-send the output to your printer.  In the second, you're doing the
-same thing, except you're telling groff to pipe the output to your
-printer.  Basically, they're the same thing.  The only advantage to
-the second is that your system may be set up to use something other
-than <strong>lpr</strong> as your print command, in which case, you
-can replace <kbd>lpr</kbd> with whatever is appropriate to your box.
-</p>
-
-<p>
-Sadly, it is well beyond the scope of this manual to tell you
-how to set up a printing system.  See the README file for
-minimum requirements to run groff with <strong>mom</strong>.
-</p>
-
-<p>
-<strong>NOTE FOR ADVANCED USERS:</strong> I've sporadically
-had groff choke on perfectly innocent sourced files within
-<strong>mom</strong> documents.  You'll know you have this problem
-when groff complains that it can't find the sourced file even when
-you can plainly see that the file exists, and that you've given
-<kbd>.so</kbd> the right path and name.  Should this happen, pass
-groff the <kbd>-U</kbd> (unsafe mode) option along with the other
-options you require.  Theoretically, you only need <kbd>-U</kbd>
-with <kbd>.open, .opena, .pso, .sy,</kbd> and <kbd>.pi</kbd>,
-however reality seems, at times, to dictate otherwise.
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+It&#8217;s important that formatted documents be easy to
+read/interpret when you&#8217;re looking at them in a text editor.
+One way to achieve this is to group macros that serve a similar
+purpose together, and separate them from other groups of macros
+with a blank comment line.  In groff, that&#8217;s done with
+<kbd>\#</kbd> on a line by itself.  Consider the
+following, which is a template for starting the chapter of a book.
+<br/>
+<span class="pre-in-pp">
+  .TITLE   "My Pulitzer Novel"
+  .AUTHOR  "Joe Blow"
+  .CHAPTER  1
+  \#
+  .DOCTYPE    CHAPTER
+  .PRINTSTYLE TYPESET
+  \#
+  .FAM     P
+  .PT_SIZE 10
+  .LS      12
+  \#
+  .START
+</span>
 </p>
+</div>
 
-<a name="USING_PREVIEWING"><h2><u>How to preview documents</u></h2></a>
+<h2 id="using-previewing" class="docs">How to preview documents</h2>
 
 <p>
 Other than printing out hard copy, there are two well-established
@@ -239,60 +189,115 @@
 
 <p>
 Groff itself comes with a quick and dirty previewer called
-gxditview. Invoke it with
-
-<pre>
-    groff -X -mom filename
-</pre>
-
-It's not particularly pretty, doesn't have many navigation
-options, requires a lot of work if you want to use other than
-the &quot;standard&quot; groff PostScript fonts, and occasionally
-has difficulty accurately reproducing some of
-<strong>mom</strong>'s macro effects
-(<a href="goodies.html#SMARTQUOTES">smartquotes</a>
+gxditview. Invoke it with:
+<br/>
+<span class="pre-in-pp">
+  groff -X -mom &lt;filename&gt;
+</span>
+It&#8217;s not particularly pretty, doesn&#8217;t have many
+navigation options, requires a lot of work if you want to use
+other than the standard groff PostScript fonts, and occasionally has
+difficulty accurately reproducing some of mom&#8217;s macro effects
+(<a href="goodies.html#smartquotes">smartquotes</a>
 and
-<a href="goodies.html#LEADER">leaders</a>
-come to mind).  What it does have going for it is that it's fast and
-doesn't gobble up system resources.
+<a href="goodies.html#leader">leaders</a>
+come to mind).  What it does have going for it is that it&#8217;s
+fast and doesn&#8217;t gobble up system resources.
 </p>
 
 <p>
-A surer way to preview documents is with <strong>gv</strong>
-(ghostview).  This involves processing documents with groff,
-and directing the output to a PostScript file, like this,
-
-<pre>
-    groff -mom filename &gt; filename.ps
-</pre>
-
-then opening the .ps file in <strong>gv</strong>.
+A surer way to preview documents is with gv (ghostview).  This
+involves processing documents with groff and directing the default
+PostScript output to a file, like this:
+<br/> 
+<span class="pre-in-pp">
+  groff -mom &lt;filename&gt; &gt; &lt;filename&gt;.ps
+</span>
+You can then then open the ps file in gv.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="tip">Tip:</span>
+I&#8217;ve set up my editor (vi[m]) to do seamless, automatic
+previewing.  Whenever I&#8217;m working on a document that
+needs previewing/checking, I fire up gv with the &#8220;Watch
+File&#8220; option turned on.  The first time I want to look at
+the file, I tell vim (via a keymapping) to process it with groff
+and send it to a PostScript file:
+<br/>
+<span class="pre-in-pp">
+  groff -mom &lt;filename&gt; &gt; &lt;filename&gt;.ps
+</span>
+I then open the file inside gv.  Ever after, when I want to look at
+any changes I make, I simply tell vim to work its magic again.
+The Watch File option in gv registers that the PostScript file has
+changed, and automatically loads the new version.  <i>Voilà!</i>&mdash;instant
+previewing.
+</p>
+</div>
+
+<h2 id="using-saving" class="docs">Saving documents</h2>
+
+<p>
+By default, groff dumps its PostScript output to stdout (your
+terminal screen) so you have to say where you want it to go if you
+want to save it to a file.  The most straightforward way to do
+this is:
+<br/>
+<span class="pre-in-pp">
+  groff -mom &lt;filename&gt; &gt; &lt;filename&gt;.ps
+</span>
+which drops the output in a PostScript file.  Alternatively, you
+might prefer to save it as a pdf file, in which case you'd do:
+<br/>
+<span class="pre">
+  groff -mom &lt;filename&gt; | ps2pdf - &lt;filename&gt;.pdf
+</span>
 </p>
 
+<h2 id="using-printing" class="docs" style="margin-top: 1.5em;">Printing documents</h2>
+
 <p>
-While that may sound like a lot of work, I've set up my editor
-(elvis) to do it for me.  Whenever I'm working on a document that
-needs previewing/checking, I fire up <strong>gv</strong> with the
-&quot;Watch File&quot; option turned on.  To look at the file, I
-tell elvis to process it (with groff) and send it to a temporary
-file (<kbd>groff -mom filename &gt; filename.ps</kbd>), then open
-the file inside <strong>gv</strong>.  Ever after, when I want to
-look at any changes I make, I simply tell elvis to work his magic
-again.  The Watch File option in <strong>gv</strong> registers that
-the file has changed, and automatically loads the new version.
-Voilà! &mdash; instant previewing.
-</p>
+You can process and print documents from the command line without
+saving them to .ps or .pdf files first.  Here are two common ways
+to do it:
 
-<hr/>
+<span class="pre">
+  groff -mom -l &lt;filename&gt;
+  groff -mom &lt;filename&gt; | lpr
+</span>
+</p>
 
-<p>
-<a href="typesetting.html#TOP">Next</a>&nbsp;&nbsp;
-<a href="definitions.html#TOP">Prev</a>&nbsp;&nbsp;
-<a href="#TOP">Top</a>&nbsp;&nbsp;
-<a href="toc.html">Back to Table of Contents</a>
+<p style="margin-top: -1.5em;">
+In the first, the <kbd>-l</kbd> option tells groff
+to send the output to your printer.  In the second, you&#8217;re
+doing the same thing, except you&#8217;re telling groff to
+<i>pipe</i> the output to your printer spooler.  Basically,
+they&#8217;re the same thing.  The advantage to the second is that
+you can pass additional options to lpr, for example to send
+the output to a particular printer, like this:
+<br/>
+<span class="pre-in-pp">
+  groff -mom &lt;filename&gt; | lpr -P &lt;printer_name&gt;
+</span>
 </p>
 
+<div class="rule-long" style="margin-top: -.5em;"><hr/></div>
+
+<!-- Navigation links -->
+<table style="width: 100%; margin-top: 12px;">
+  <tr>
+    <td style="width: 33%;"><a href="toc.html">Back to Table of Contents</a></td>
+    <td style="width: 33%; text-align: center;"><a href="#top">Top</a></td>
+    <td style="width: 33%; text-align: right;"><a href="typesetting.html#top">Next: The typesetting macros</a></td>
+</tr>
+</table>
+
+</div>
+
+<div class="bottom-spacer"><br/></div>
+
 </body>
 </html>
-<!-- vim: fileencoding=latin1: nomodified:
--->
+<!-- vim: fileencoding=utf-8: nomodified: -->
diff -ruN groff-1.20.1/contrib/mom/NEWS groff-1.21/contrib/mom/NEWS
--- groff-1.20.1/contrib/mom/NEWS	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/NEWS	2010-12-31 08:33:09.000000000 +0100
@@ -1,10 +1,30 @@
-    Copyright 2004, 2005, 2006, 2007, 2008, 2009
+    Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
     notice and this notice are preserved.
 
+Release 1.6
+-----------
+Complete overhaul of refer handling.  If you've been using mom and
+refer, the changes may affect documents you've already created.
+Please read refer.html.
+
+Improved underlining thanks to Tadziu Hoffman.
+
+Increased flexibility of PRINTSTYLE TYPEWRITE, which now allows
+user to choose the monospace family and point size.
+
+Release 1.5-e
+-------------
+Complete overhaul of documentation
+
+Release 1.5-d
+-------------
+Control macros added to various miscellaneous docprocessing
+functions
+
 Release 1.5-c
 -------------
 Bugfix release (see BUGS, Version 1.5-b).
diff -ruN groff-1.20.1/contrib/mom/om.tmac groff-1.21/contrib/mom/om.tmac
--- groff-1.20.1/contrib/mom/om.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/om.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -2,9 +2,9 @@
 .ig
 Mom -- a typesetting/document-processing macro set for groff.
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   Free Software Foundation, Inc.
-     Written by Peter Schaffter (pschaffter@magma.ca)
+     Written by Peter Schaffter (peter@schaffter.ca)
 
 This file is part of groff.
 
@@ -21,8 +21,8 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 1.5-c
--------------
+Version 1.6
+-----------
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
 nothing left to take away.
@@ -89,7 +89,52 @@
 \# Instruct grops to use square linecaps and joins.
 \# This instruction is also executed in DO_B_MARGIN, NEWPAGE, and HEADER
 \#
+.if !n \{\
 \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap'
+.\}
+\#
+\# The following PostScript, provided by Tadziu Hoffmann, permits
+\# no-fail underlining
+\#
+.de ul*ps
+ps: def
+grops begin
+/decornone { grops begin /X { } def /Y { } def /y2 -1 def end } def
+/decorline { grops begin u neg /uld exch def u /ulw exch def
+             /X { currentpoint /y0 exch def /x0 exch def } def
+             /Y { currentpoint /y1 exch def /x1 exch def
+                  drawline /x2 x1 def /y2 y1 def } def end } def
+/drawline { gsave ulw setlinewidth 0 setlinecap x1 y1 uld sub moveto
+            y2 y0 eq { x2 y2 } { x0 y0 } ifelse uld sub lineto stroke
+            grestore } def
+decornone
+/uld 0 def
+/ulw 0 def
+/A { X show Y } def
+/B { 0 SC 3 -1 roll X widthshow Y } def
+/C { 0 exch X ashow Y } def
+/D { 0 exch 0 SC 5 2 roll X awidthshow Y } def
+/E { 0 rmoveto X show Y } def
+/F { 0 rmoveto 0 SC 3 -1 roll X widthshow Y } def
+/G { 0 rmoveto 0 exch X ashow Y } def
+/H { 0 rmoveto 0 exch 0 SC 5 2 roll X awidthshow Y } def
+/I { 0 exch rmoveto X show Y } def
+/J { 0 exch rmoveto 0 SC 3 -1 roll X widthshow Y } def
+/K { 0 exch rmoveto 0 exch X ashow Y } def
+/L { 0 exch rmoveto 0 exch 0 SC 5 2 roll X awidthshow Y } def
+/M { rmoveto X show Y } def
+/N { rmoveto 0 SC 3 -1 roll X widthshow Y } def
+/O { rmoveto 0 exch X ashow Y } def
+/P { rmoveto 0 exch 0 SC 5 2 roll X awidthshow Y } def
+/Q { moveto X show Y } def
+/R { moveto 0 SC 3 -1 roll X widthshow Y } def
+/S { moveto 0 exch X ashow Y } def
+/T { moveto 0 exch 0 SC 5 2 roll X awidthshow Y } def
+end
+..
+.if !n \{\
+\Y[ul*ps]
+.\}
 \#
 \# ====================================================================
 \#
@@ -326,7 +371,7 @@
 .    nr #T_MARGIN_LEAD_ADJ \\n[#LEAD]-12000
 .    ev B_MARGIN
 .    bp
-.    nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap'
+.    if !n \{ .nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap' \}
 .    ev
 .END
 \#
@@ -354,7 +399,7 @@
 .       ie !\\n[#DOCS]=1 \{\
 .          ev NP
 .          bp
-.          nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap'
+.          if !n \{ .nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap' \}
 .          ev
 .       \}
 .       el \{\
@@ -451,11 +496,11 @@
 .MAC FAMILY END
 .    ds $FAMILY \\$1
 .    if \\n[#PRINT_STYLE]=1 \{\
-.       fam C
+.       fam \\*[$TYPEWRITER_FAM]
 .       return
 .    \}
 .    if \\n[#IGNORE] \{\
-.       fam C
+.       fam \\*[$TYPEWRITER_FAM]
 .       return
 .    \}
 .    if (\\n[.x]\\n[.y]\\n[.Y] >= 1192) \{\
@@ -499,7 +544,11 @@
 .             return
 .          \}
 .       \}
-.       el \{ .UNDERLINE OFF \}
+.       el \{\
+.          ev 1
+.          UNDERLINE OFF
+.          ev
+.       \}
 .       return
 .    \}
 .    ft 0
@@ -612,7 +661,7 @@
 \#   AUTOLEAD is turned off.
 \# *Notes:
 \#   With the optional FACTOR argument, the current point size is
-\#   multiplied by #AUTOLEAD_VALUE instead of the two being added
+\#   multiplied by #AUTOLEAD_VALUE/1000 instead of the two being added
 \#   together.
 \#
 .MAC AUTOLEAD END
@@ -874,6 +923,10 @@
 .       ie \\n[#JUSTIFY]=1 \{ .brp \}
 .       el \{ .br \}
 .    \}
+.    rr #EW
+.    rm $EW
+.    nr #RW 1
+.    ds $RW \\$1
 .    tkf \\n(.f 1 -\\$1 1 -\\$1
 .END
 \#
@@ -883,6 +936,10 @@
 .       ie \\n[#JUSTIFY]=1 \{ .brp \}
 .       el \{ .br \}
 .    \}
+.    rr #RW
+.    rm $RW
+.    nr #EW 1
+.    ds $EW \\$1
 .    tkf \\n(.f 1 \\$1 1 \\$1
 .END
 \#
@@ -1196,8 +1253,8 @@
 .    if \\n[#RESTORE_SQ]=1 \{\
 .       rr #RESTORE_SQ
 .       ie '\\*[$RESTORE_SQ]'' \{\
-.          ds $QUOTE0 \[dq]
-.          ds $QUOTE1 \[dq]
+.          ds $QUOTE0 \[lq]
+.          ds $QUOTE1 \[rq]
 .       \}
 .       el \{\
 .          SMARTQUOTES \\*[$RESTORE_SQ]
@@ -1283,16 +1340,16 @@
 .          ds $QUOTE1 \\[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
-.       if !r#ARGS_TO_SQ \{\
-.          ds $QUOTE0 \\[dq]
-.          ds $QUOTE1 \\[dq]
-.          nr #RESTORE_SQ 1
-.       \}
+.    \}
+.    if !r#ARGS_TO_SQ \{\
+.       ds $QUOTE0 \\[lq]
+.       ds $QUOTE1 \\[rq]
+.       nr #RESTORE_SQ 1
 .    \}
 .END
 \#
-.ds $QUOTE0 \[dq]
-.ds $QUOTE1 \[dq]
+.ds $QUOTE0 \[lq]
+.ds $QUOTE1 \[rq]
 \#
 \# Strings for foot and inch marks
 \#
@@ -1744,6 +1801,11 @@
 .    br
 .    rr #TAB_ACTIVE
 .    rr #IN_TAB
+.    nr #LOOP 0 1
+.    while \\n+[#LOOP]<20 \{\
+.       rm $ST\\n[#LOOP]_FILL
+.\}
+.    rr #LOOP
 .    po \\n[#L_MARGIN]u
 .    ll \\n[#L_LENGTH]u
 .    ta \\n(.lu
@@ -1848,153 +1910,56 @@
 \# *Arguments:
 \#   <none> | <anything>
 \# *Function:
-\#   When on, underlines all letters, words, and digits in a passage,
-\#   ignoring punctuation and spaces.
+\#   Simulates typewriter-style underlining of italic passages.
 \# *Notes:
-\#   Only for use when the font family is COURIER, to simulate
-\#   typewriter-style underlining of italic  passages.
+\#   Defaults for rule weight and distance from baseline are below.
+\#   UNDERLINE_SPECS lets user change them
+\#
+.nr _w 500
+.nr _d 1250
+\#
+.MAC UNDERLINE_SPECS END
+.    ie \B'\\$1' \{ .nr _w (u;\\$1) \}
+.    el \{\
+.       ie '\\$1'DEFAULT' \{ .nr _w 500 \}
+.       el \{\
+.          nr _w 500
+.          tm1 "[mom]: The first argument to \\$0 must be a numeric
+.          tm1 "       argument with a unit of measure appended, or DEFAULT.
+.          tm1 "       Setting underline weight to DEFAULT.
+.       \}
+.    \}
+.    shift
+.    ie \B'\\$1' \{ .nr _d (u;\\$1) \}
+.    el \{\
+.       ie '\\$1'DEFAULT' \{ .nr _d 1250 \}
+.       el \{\
+.          nr _d 1250
+.          tm1 "[mom]: The second argument to \\$0 must be a numeric
+.          tm1 "       argument with a unit of measure appended, or DEFAULT.
+.          tm1 "       Setting underline distance from baseline to DEFAULT.
+.       \}
+.    \}
+.END
 \#
 .MAC UNDERLINE END
+\c
+.    ds $SAVED_SS_VAR \\*[$SS_VAR]
 .    ie '\\$1'' \{\
 .       nr #UNDERLINE_ON 1
-.       char A _A
-.       char B _B
-.       char C _C
-.       char D _D
-.       char E _E
-.       char F _F
-.       char G _G
-.       char H _H
-.       char I _I
-.       char J _J
-.       char K _K
-.       char L _L
-.       char M _M
-.       char N _N
-.       char O _O
-.       char P _P
-.       char Q _Q
-.       char R _R
-.       char S _S
-.       char T _T
-.       char U _U
-.       char V _V
-.       char W _W
-.       char X _X
-.       char Y _Y
-.       char Z _Z
-.       char \[`A] _\[`A]
-.       char \[^A] _\[^A]
-.       char \['A] _\['A]
-.       char \[:A] _\[:A]
-.       char \[oA] _\[oA]
-.       char \[~A] _\[~A]
-.       char \[AE] _\[AE]
-.       char \[`E] _\[`E]
-.       char \[^E] _\[^E]
-.       char \['E] _\['E]
-.       char \[:E] _\[:E]
-.       char \[`I] _\[`I]
-.       char \[^I] _\[^I]
-.       char \['I] _\['I]
-.       char \[:I] _\[:I]
-.       char \[`O] _\[`O]
-.       char \[^O] _\[^O]
-.       char \['O] _\['O]
-.       char \[:O] _\[:O]
-.       char \[~O] _\[~O]
-.       char \[/O] _\[/O]
-.       char \[`U] _\[`U]
-.       char \[^U] _\[^U]
-.       char \['U] _\['U]
-.       char \[:U] _\[:U]
-.       char \[,C] _\[,C]
-.       char \[-D] _\[-D]
-.       char \[~N] _\[~N]
-.       char \[TP] _\[TP]
-.       char \['Y] _\['Y]
-.       char \[:Y] _\[:Y]
-.       char a _a
-.       char b _b
-.       char c _c
-.       char d _d
-.       char e _e
-.       char f _f
-.       char g _g
-.       char h _h
-.       char i _i
-.       char j _j
-.       char k _k
-.       char l _l
-.       char m _m
-.       char n _n
-.       char o _o
-.       char p _p
-.       char q _q
-.       char r _r
-.       char s _s
-.       char t _t
-.       char u _u
-.       char v _v
-.       char w _w
-.       char x _x
-.       char y _y
-.       char z _z
-.       char \[`a] _\[`a]
-.       char \[^a] _\[^a]
-.       char \['a] _\['a]
-.       char \[:a] _\[:a]
-.       char \[oa] _\[oa]
-.       char \[~a] _\[~a]
-.       char \[ae] _\[ae]
-.       char \[`e] _\[`e]
-.       char \[^e] _\[^e]
-.       char \['e] _\['e]
-.       char \[:e] _\[:e]
-.       char \[`i] _\[`i]
-.       char \[^i] _\[^i]
-.       char \['i] _\['i]
-.       char \[:i] _\[:i]
-.       char \[`o] _\[`o]
-.       char \[^o] _\[^o]
-.       char \['o] _\['o]
-.       char \[:o] _\[:o]
-.       char \[~o] _\[~o]
-.       char \[/o] _\[/o]
-.       char \[`u] _\[`u]
-.       char \[^u] _\[^u]
-.       char \['u] _\['u]
-.       char \[:u] _\[:u]
-.       char \[,c] _\[,c]
-.       char \[Sd] _\[Sd]
-.       char \[~n] _\[~n]
-.       char \[Tp] _\[Tp]
-.       char \['y] _\['y]
-.       char \[:y] _\[:y]
-.       char \[ss] _\[ss]
-.       char ' _'
-.       char 1 _1
-.       char 2 _2
-.       char 3 _3
-.       char 4 _4
-.       char 5 _5
-.       char 6 _6
-.       char 7 _7
-.       char 8 _8
-.       char 9 _9
-.       char 0 _0
+.       ss \\n[.ss] (\\n[.ss]-\\n[.ss])
+.       ie !n \{\
+.          nop \X'ps: exec \\n[_w] \\n[_d] decorline'\c
+.       \}
+.       el \{ .ul 1000 \}
 .    \}
 .    el \{\
 .       nr #UNDERLINE_ON 0
-.       rchar A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
-        a b c d e f g h i j k l m n o p q r s t u v w x y z \
-        \[`A] \[^A] \['A] \[:A] \[oA] \[~A] \[AE] \[`E] \[^E] \['E] \[:E] \
-        \[`I] \[^I] \['I] \[:I] \[`O] \[^O] \['O] \[:O] \[~O] \[/O] \[`U] \
-        \[^U] \['U] \[:U] \[,C] \[-D] \[~N] \[TP] \['Y] \[:Y] \
-        \[`a] \[^a] \['a] \[:a] \[oa] \[~a] \[ae] \[`e] \[^e] \['e] \[:e] \[`i] \
-        \[^i] \['i] \[:i] \[`o] \[^o] \['o] \[:o] \[~o] \[/o] \[`u] \[^u] \['u] \
-        \[:u] \[,c] \[Sd] \[~n] \[Tp] \['y] \[:y] \[ss] \
-        ' 1 2 3 4 5 6 7 8 9 0
+.       SS \\*[$SAVED_SS_VAR]
+.       ie !n \{\
+.          nop \X'ps: exec decornone'\c
+.       \}
+.       el \{ .ul 0 \}
 .    \}
 .END
 \#
@@ -2004,156 +1969,64 @@
 \# *Arguments:
 \#   <none>
 \# *Function:
-\#   Underscores all letters, words, and digits in a passage,
-\#   ignoring punctuation and spaces.
+\#   Simulates typewriter-style underlining of italic passages.
 \# *Notes:
 \#   Intended to be called with inline escapes \*[UL] (underline
-\#   on) and \*[ULX] (underline off).  Only works when the font family
-\#   is fixed width, to simulate typewriter-style underlining of italic
-\#   passages.
+\#   on) and \*[ULX] (underline off).
 \#
 .MAC UL END
-\c\R'#UNDERLINE_ON 1'
-.       char A _A
-.       char B _B
-.       char C _C
-.       char D _D
-.       char E _E
-.       char F _F
-.       char G _G
-.       char H _H
-.       char I _I
-.       char J _J
-.       char K _K
-.       char L _L
-.       char M _M
-.       char N _N
-.       char O _O
-.       char P _P
-.       char Q _Q
-.       char R _R
-.       char S _S
-.       char T _T
-.       char U _U
-.       char V _V
-.       char W _W
-.       char X _X
-.       char Y _Y
-.       char Z _Z
-.       char \[`A] _\[`A]
-.       char \[^A] _\[^A]
-.       char \['A] _\['A]
-.       char \[:A] _\[:A]
-.       char \[oA] _\[oA]
-.       char \[~A] _\[~A]
-.       char \[AE] _\[AE]
-.       char \[`E] _\[`E]
-.       char \[^E] _\[^E]
-.       char \['E] _\['E]
-.       char \[:E] _\[:E]
-.       char \[`I] _\[`I]
-.       char \[^I] _\[^I]
-.       char \['I] _\['I]
-.       char \[:I] _\[:I]
-.       char \[`O] _\[`O]
-.       char \[^O] _\[^O]
-.       char \['O] _\['O]
-.       char \[:O] _\[:O]
-.       char \[~O] _\[~O]
-.       char \[/O] _\[/O]
-.       char \[`U] _\[`U]
-.       char \[^U] _\[^U]
-.       char \['U] _\['U]
-.       char \[:U] _\[:U]
-.       char \[,C] _\[,C]
-.       char \[-D] _\[-D]
-.       char \[~N] _\[~N]
-.       char \[TP] _\[TP]
-.       char \['Y] _\['Y]
-.       char \[:Y] _\[:Y]
-.       char a _a
-.       char b _b
-.       char c _c
-.       char d _d
-.       char e _e
-.       char f _f
-.       char g _g
-.       char h _h
-.       char i _i
-.       char j _j
-.       char k _k
-.       char l _l
-.       char m _m
-.       char n _n
-.       char o _o
-.       char p _p
-.       char q _q
-.       char r _r
-.       char s _s
-.       char t _t
-.       char u _u
-.       char v _v
-.       char w _w
-.       char x _x
-.       char y _y
-.       char z _z
-.       char \[`a] _\[`a]
-.       char \[^a] _\[^a]
-.       char \['a] _\['a]
-.       char \[:a] _\[:a]
-.       char \[oa] _\[oa]
-.       char \[~a] _\[~a]
-.       char \[ae] _\[ae]
-.       char \[`e] _\[`e]
-.       char \[^e] _\[^e]
-.       char \['e] _\['e]
-.       char \[:e] _\[:e]
-.       char \[`i] _\[`i]
-.       char \[^i] _\[^i]
-.       char \['i] _\['i]
-.       char \[:i] _\[:i]
-.       char \[`o] _\[`o]
-.       char \[^o] _\[^o]
-.       char \['o] _\['o]
-.       char \[:o] _\[:o]
-.       char \[~o] _\[~o]
-.       char \[/o] _\[/o]
-.       char \[`u] _\[`u]
-.       char \[^u] _\[^u]
-.       char \['u] _\['u]
-.       char \[:u] _\[:u]
-.       char \[,c] _\[,c]
-.       char \[Sd] _\[Sd]
-.       char \[~n] _\[~n]
-.       char \[Tp] _\[Tp]
-.       char \['y] _\['y]
-.       char \[:y] _\[:y]
-.       char \[ss] _\[ss]
-.       char ' _'
-.       char 1 _1
-.       char 2 _2
-.       char 3 _3
-.       char 4 _4
-.       char 5 _5
-.       char 6 _6
-.       char 7 _7
-.       char 8 _8
-.       char 9 _9
-.       char 0 _0
+\c
+.    ds $SAVED_SS_VAR \\*[$SS_VAR]
+.    ss \\n[.ss] (\\n[.ss]-\\n[.ss])
+.    ie !'\\n[.z]'' 
+\c
+.       ie !n \{\
+\?\h'-\w'\\n[.ss]'u'\?
+\?\R'#UNDERLINE_ON 1'\X'ps: exec \\n[_w] \\n[_d] decorline'\?\c
+.       \}
+.       el \{\
+\?\R'#UNDERLINE_ON 1'\?\c
+.          ul 1000
+.       \}
+.    el \{\
+.       ie !n \{\
+\h'-\w'\\n[.ss]'u'
+.          nr #UNDERLINE_ON 1
+.          nop \X'ps: exec \\n[_w] \\n[_d] decorline'\c
+.       \}
+.       el \{\
+\h'-\w'\\n[.ss]'u'
+.          nr #UNDERLINE_ON 1
+.          ul 1000
+.       \}
+.    \}
 .END
 \#
 \#
 .MAC ULX END
-\c\R'#UNDERLINE_ON 0'
-.    rchar A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
-     a b c d e f g h i j k l m n o p q r s t u v w x y z \
-     \[`A] \[^A] \['A] \[:A] \[oA] \[~A] \[AE] \[`E] \[^E] \['E] \[:E] \
-     \[`I] \[^I] \['I] \[:I] \[`O] \[^O] \['O] \[:O] \[~O] \[/O] \[`U] \
-     \[^U] \['U] \[:U] \[,C] \[-D] \[~N] \[TP] \['Y] \[:Y] \
-     \[`a] \[^a] \['a] \[:a] \[oa] \[~a] \[ae] \[`e] \[^e] \['e] \[:e] \[`i] \
-     \[^i] \['i] \[:i] \[`o] \[^o] \['o] \[:o] \[~o] \[/o] \[`u] \[^u] \['u] \
-     \[:u] \[,c] \[Sd] \[~n] \[Tp] \['y] \[:y] \[ss] \
-     ' 1 2 3 4 5 6 7 8 9 0
+\c
+.    SS \\*[$SAVED_SS_VAR]
+.    rm $SAVED_SS_VAR
+.    ie !'\\n[.z]'' \{\
+\c
+.       ie !n \{\
+\?\R'#UNDERLINE_ON 0'\X'ps: exec decornone'\?\c
+.       \}
+.       el \{\
+\?\R'#UNDERLINE_ON 0'\?\c
+.          ul 0
+.       \}
+.    \}
+.    el \{\
+.       ie !n \{\
+.          nr #UNDERLINE_ON 0
+.          nop \X'ps: exec decornone'\c
+.       \}
+.       el \{\
+.          nr #UNDERLINE_ON 0
+.          ul 0
+.       \}
+.    \}
 .END
 \#
 \#
@@ -2355,36 +2228,54 @@
 .ds $UNDERSCORE_GAP           2p
 \#
 \#
-\# SUPERSCRIPT INLINES
-\# -------------------
+\# SUPERSCRIPT
+\# -----------
 \# *Function:
-\#   Prints everything after invocation as superscript.
+\#   Prints everything after inline invocation as superscript.
 \# *Notes:
 \#   \*[SUP] and \*[SUPX] turn superscript on and off respectively.
 \#   If running type is pseudo-condensed/expanded, invoke the superscript
 \#   strings as \*[CONDSUP] or \*[EXTSUP] and turn off with \*[CONDSUPX]
 \#   and \*[EXTSUPX] respectively.
 \#
+\# Default raise/lower amount
+.ds $SUP_RAISE \v'-.3m'
+.ds $SUP_LOWER \v'.3m'
+\#
+\# SUPERSCRIPT RAISE
+\# -----------------
+\# *Argument:
+\#   <amount to raise superscript>
+\# *Function:
+\#   Defines strings $SUP_RAISE and $SUP_LOWER for use with \*[SUP],
+\#   \*[CONDSUP] and \*[EXTSUP].
+\#
+.MAC SUPERSCRIPT_RAISE_AMOUNT END
+.    ds $SUP_RAISE_AMOUNT \\$1
+.    ds $SUP_RAISE \v'-\\*[$SUP_RAISE_AMOUNT]'
+.    ds $SUP_LOWER \v'\\*[$SUP_RAISE_AMOUNT]'
+.END
+\#
 .ds SUP \
 \R'#PT_SIZE_IN_UNITS \En[.ps]'\
 \R'#SUP_PT_SIZE \En[#PT_SIZE_IN_UNITS]u*6u/10u'\
-\s[\En[#PT_SIZE_IN_UNITS]u]\v'-.26m'\s[\En[#SUP_PT_SIZE]u]
+\s[\En[#PT_SIZE_IN_UNITS]u]\E*[$SUP_RAISE]\s[\En[#SUP_PT_SIZE]u]
 \#
-.ds SUPX \s[\En[#PT_SIZE_IN_UNITS]u]\v'.26m'
+.ds SUPX \s[\En[#PT_SIZE_IN_UNITS]u]\E*[$SUP_LOWER]
 \#
 .ds CONDSUP \
 \R'#PT_SIZE_IN_UNITS \En[.ps]'\
 \R'#SUP_PT_SIZE \En[#PT_SIZE_IN_UNITS]u*6u/10u'\
-\s[\En[#PT_SIZE_IN_UNITS]u]\v'-.3m'\s[\En[#SUP_PT_SIZE]u]\E*[COND_FOR_SUP]
+\s[\En[#PT_SIZE_IN_UNITS]u]\E*[$SUP_RAISE]\s[\En[#SUP_PT_SIZE]u]\E*[COND_FOR_SUP]
 \#
-.ds CONDSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\v'.3m'\E*[COND]
+.ds CONDSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\E*[$SUP_LOWER]\E*[COND]
 \#
 .ds EXTSUP \
 \R'#PT_SIZE_IN_UNITS \En[.ps]'\
 \R'#SUP_PT_SIZE \En[#PT_SIZE_IN_UNITS]u*6u/10u'\
-\s[\En[#PT_SIZE_IN_UNITS]u]\v'-.3m'\s[\En[#SUP_PT_SIZE]u]\E*[EXT_FOR_SUP]
+\s[\En[#PT_SIZE_IN_UNITS]u]\E*[$SUP_RAISE]\s[\En[#SUP_PT_SIZE]u]\E*[EXT_FOR_SUP]
 \#
-.ds EXTSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\v'.3m'\E*[EXT]
+.ds EXTSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\E*[$SUP_LOWER]\E*[EXT]
 \#
 \#
 \# SLANT
@@ -2570,7 +2461,7 @@
 .    if !d$PAD_MARKER .ds $PAD_MARKER #
 .    char \\*[$PAD_MARKER] \R'#PAD_COUNT \En[#PAD_COUNT]+1'
 .    ds $FAMILY_FOR_PAD \\n[.fam]
-.    fp \\n[.fp] \\n[.sty]
+.    if !n \{ .fp \\n[.fp] \\n[.sty] \}
 .    ds $FONT_FOR_PAD   \\*[$FONT]
 .    nr #SIZE_FOR_PAD   \\n[.ps]
 .    ds $PAD_STRING \\$1
@@ -2751,9 +2642,9 @@
 .    \}
 .    if \\n[#DOCS] \{\
 .       if \\n[#PRINT_STYLE]=1 \{\
-.       PRINT \\$1\c
-.       return
-.    \}
+.          PRINT \\$1\c
+.          return
+.       \}
 .       if \\n[#PRINT_STYLE]=2 \{\
 .          if \\n[#PP_STYLE]=2 \{\
 .             PRINT \\$1\c
@@ -2797,30 +2688,37 @@
 .       nr #GET_DC_HEIGHT \\n[#CAP_HEIGHT]
 .\}
 .    if d$DC_ADJUST \{ .ps \\*[$DC_ADJUST]p \}
-.    mk x
-.    sp \\n[#DC_LINES]v
-.    if \\n[#DOCS]=1 \{ .SHIM \}
+.    nr #DC_LINES +1
 .    ie \\n[#DC_COLOR]=1 \{\
 .       ie !'\\$3'' \{\
-.          ie '\\$3'COND' \{ .PRINT \m[\\*[$DC_COLOR]]\\*[COND]\\*[$DROPCAP]\\*[CONDX]\m[] \}
-.          el \{ .PRINT \m[\\*[$DC_COLOR]]\\*[EXT]\\*[$DROPCAP]\\*[EXTX]\m[] \}
+.          ie '\\$3'COND' \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[COND]\\*[$DROPCAP]\\*[CONDX]\m[]\\*[UP \\n[#DC_LINES]v] \}
+.          el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[EXT]\\*[$DROPCAP]\\*[EXTX]\m[]\\*[UP \\n[#DC_LINES]v] \}
 .       \}
-.       el \{ .PRINT \m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[] \}
+.       el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[]\\*[UP \\n[#DC_LINES]v] \}
 .    \}
 .    el \{\
 .       ie !'\\$3'' \{\
-.          ie '\\$3'COND' \{ .PRINT \\*[COND]\\*[$DROPCAP]\\*[CONDX] \}
-.          el \{ .PRINT \\*[EXT]\\*[$DROPCAP]\\*[EXTX] \}
+.          ie '\\$3'COND' \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\\*[COND]\\*[$DROPCAP]\\*[CONDX]\\*[UP \\n[#DC_LINES]v] \}
+.          el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\\*[EXT]\\*[$DROPCAP]\\*[EXTX]\\*[UP \\n[#DC_LINES]v] \}
 .       \}
-.       el \{ .PRINT \m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[] \}
+.       el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[]\\*[UP \\n[#DC_LINES]v] \}
 .    \}
 .    if '\\$3'COND' \{ \E*[COND] \}
 .    if '\\$3'EXT'  \{ \E*[EXT]  \}
-.    ie \\n(.i \{ .in +\w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u \}
-.    el        \{ .in \w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u \}
+.    ie \\n(.i \{\
+.       vs 0
+.       br
+.       in +\w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u
+.       vs
+.    \}
+.    el \{\
+.       vs 0
+.       br
+.       in \w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u
+.       vs
+.    \}
 .    if '\\$3'COND' \{ \E*[CONDX]\c \}
 .    if '\\$3'EXT'  \{ \E*[EXTX]\c \}
-.    rt \\nxu
 .    FAM \\*[$RESTORE_FAM]
 .    FT  \\*[$RESTORE_FT]
 .    ps \\n[#RESTORE_PT_SIZE]u
@@ -2851,6 +2749,7 @@
 \#
 .MAC DROPCAP_OFF END
 '    in \\n[#RESTORE_INDENT]u
+.    ch DROPCAP_OFF
 .END
 \#
 \# =====================================================================
@@ -3511,11 +3410,11 @@
 \#   \n[.sss] holds the current sentence space value.
 \#
 .MAC SS END
+.    ds $SS_VAR \\$1
 .    ie '\\$1'0' \{ .ss \\n[.ss] (\\n[.ss]-\\n[.ss]) \}
 .    el \{\
 .       ie '\\$1'DEFAULT' \{ .ss \\n[.ss] \}
 .       el \{\
-.          ds $SS_VAR \\$1
 .          ss \\n[.ss] (0\\*[$SS_VAR])
 .       \}
 .    \}
@@ -3626,6 +3525,7 @@
 .       in \\n[#L_INDENT]u
 .       ta \\n(.lu-\\n[#L_INDENT]u
 .    \}
+.    if \\n[#IN_ITEM] .nr #IN_ITEM_L_INDENT +(\\$1)
 .END
 \#
 \#
@@ -3635,7 +3535,7 @@
 .    if \\n[#INDENT_STYLE_BOTH] \{ .IBX \}
 .    nr #INDENT_STYLE_RIGHT   1
 .    nr #INDENT_ACTIVE        1
-.    nr #INDENT_RIGHT_ACTIVE 1
+.    nr #INDENT_RIGHT_ACTIVE  1
 .    ie '\\$1'' \{\
 .       br
 .       ie \\n[#TAB_ACTIVE] \{\
@@ -3735,9 +3635,12 @@
 \# +++INDENTS OFF+++
 \#
 .MAC ILX END
-.    br
-.    in 0
-.    rr #INDENT_LEFT_ACTIVE
+.    ie \\n[#IN_ITEM] \{ .nr #L_INDENT -\\n[#IN_ITEM_L_INDENT] \}
+.    el \{\
+.       br
+.       in 0
+.       rr #INDENT_LEFT_ACTIVE
+.    \}
 .    if '\\$1'CLEAR' \{\
 .       rr #L_INDENT
 .       rr #INDENT_STYLE_LEFT
@@ -4158,6 +4061,9 @@
 e\\R'#X_HEIGHT \\n[.cht]'
 y\\R'#DESCENDER \\n[.cdp]'
 .    br
+.    ds $CAP_HEIGHT \\n[#CAP_HEIGHT]u
+.    ds $X_HEIGHT \\n[#X_HEIGHT]u
+.    ds $DESCENDER \\n[#DESCENDER]u
 .    di
 .END
 \#
@@ -4288,6 +4194,8 @@
 .          nr #PRINT_STYLE 1
 .          if !\\n[#DOC_TYPE]=4 \{ .L_MARGIN 6P \}
 .          if !\\n[#DOC_TYPE]=4 \{ .R_MARGIN 6P \}
+.          ds $TYPEWRITER_FAM     C
+.          ds $TYPEWRITER_PS      12
 .          TYPEWRITER
 .          color 0
 .          ie '\\$2'SINGLESPACE' \{\
@@ -4323,6 +4231,8 @@
 .          nr #HEAD_UNDERLINE_WEIGHT 500
 .          char \(em --
 .          tr `'
+.          tr \(lq"
+.          tr \(rq"
 .       \}
 .       if '\\$1'TYPESET' \{\
 .          nr #PRINT_STYLE 2
@@ -4351,14 +4261,22 @@
 .END
 \#
 \#
-\# Macros to control behaviour of PRINTSTYLE TYPEWRITE
+\# PRINTSTYLE TYPEWRITE control.
 \#
-\# First, a little utility macro.
+.MAC TYPEWRITER_FAMILY END
+.    ds $TYPEWRITER_FAM \\$1
+.END
+\#
+.ALIAS TYPEWRITER_FAM TYPEWRITER_FAMILY
+\#
+.MAC TYPEWRITER_SIZE END
+.    ds $TYPEWRITER_PS \\$1
+.END
 \#
 .MAC TYPEWRITER END
-.    fam C
+.    fam \\*[$TYPEWRITER_FAM]
 .    ft  R
-.    ps  12
+.    ps  \\*[$TYPEWRITER_PS]
 .END
 \#
 \#
@@ -4382,7 +4300,7 @@
 .       rm PREV
 .       ds ROM  \EfR
 .       ds IT   \EfI
-.       ds PREV \EfR
+.       ds PREV \Ef[]
 .    \}
 .END
 \#
@@ -5092,9 +5010,29 @@
 .    br
 .    nr #CLOSING 1
 .    di CLOSING
-.    LEFT
 .END
 \#
+\# CLOSING INDENT
+\# --------------
+\# *Argument:
+\#   <amount to indent closing from left margin>
+\# *Function:
+\#   Defines string $CLOSE_INDENT for use in macro, ALL_DONE.
+\#
+.MAC CLOSING_INDENT END
+.    ds $CLOSE_INDENT \\$1
+.END
+\#
+\# SIGNATURE_SPACE
+\# ---------------
+\# *Argument:
+\#   <amount of space to leave for signature>
+\# *Function:
+\#   Defines string $SIG_SPACE for use in macro, ALL_DONE.
+\#
+.MAC SIGNATURE_SPACE END
+.    ds $SIG_SPACE \\$1
+.END
 \#
 \# NO SUITE
 \# --------
@@ -5122,7 +5060,7 @@
 \# the macro whose style is to be changed.
 \#
 .MAC _FAMILY END
-.    if '\\$0'AUTHOR_FAMILY'                  
+.    if '\\$0'AUTHOR_FAMILY'                  .ds $AUTHOR_FAM \\$1
 .    if '\\$0'BIBLIOGRAPHY_FAMILY'            .ds $BIB_FAM \\$1
 .    if '\\$0'BIBLIOGRAPHY_STRING_FAMILY'     .ds $BIB_STRING_FAM \\$1
 .    if '\\$0'BLOCKQUOTE_FAMILY'              .ds $BQUOTE_FAM \\$1
@@ -5134,6 +5072,7 @@
 .    if '\\$0'COVER_COPYRIGHT_FAMILY'         .ds $COVER_COPYRIGHT_FAM \\$1
 .    if '\\$0'COVER_DOCTYPE_FAMILY'           .ds $COVER_DOCTYPE_FAM \\$1
 .    if '\\$0'COVER_FAMILY'                   .ds $COVER_FAM \\$1
+.    if '\\$0'COVER_MISC_FAMILY'              .ds $COVER_MISC_FAM \\$1
 .    if '\\$0'COVER_SUBTITLE_FAMILY'          .ds $COVER_SUBTITLE_FAM \\$1
 .    if '\\$0'COVER_TITLE_FAMILY'             .ds $COVER_TITLE_FAM \\$1
 .    if '\\$0'DOC_COVER_AUTHOR_FAMILY'        .ds $DOC_COVER_AUTHOR_FAM \\$1
@@ -5141,6 +5080,7 @@
 .    if '\\$0'DOC_COVER_COPYRIGHT_FAMILY'     .ds $DOC_COVER_COPYRIGHT_FAM \\$1
 .    if '\\$0'DOC_COVER_DOCTYPE_FAMILY'       .ds $DOC_COVER_DOCTYPE_FAM \\$1
 .    if '\\$0'DOC_COVER_FAMILY'               .ds $DOC_COVER_FAM \\$1
+.    if '\\$0'DOC_COVER_MISC_FAMILY'          .ds $DOC_COVER_MISC_FAM \\$1
 .    if '\\$0'DOC_COVER_SUBTITLE_FAMILY'      .ds $DOC_COVER_SUBTITLE_FAM \\$1
 .    if '\\$0'DOC_COVER_TITLE_FAMILY'         .ds $DOC_COVER_TITLE_FAM \\$1
 .    if '\\$0'DOCHEADER_FAMILY'               .ds $DOCHEADER_FAM \\$1
@@ -5192,12 +5132,14 @@
 .    if '\\$0'COVER_CHAPTER_TITLE_FONT'     .ds $COVER_CHAPTER_TITLE_FT \\$1
 .    if '\\$0'COVER_COPYRIGHT_FONT'         .ds $COVER_COPYRIGHT_FT \\$1
 .    if '\\$0'COVER_DOCTYPE_FONT'           .ds $COVER_DOCTYPE_FT \\$1
+.    if '\\$0'COVER_MISC_FONT'              .ds $COVER_MISC_FT \\$1
 .    if '\\$0'COVER_SUBTITLE_FONT'          .ds $COVER_SUBTITLE_FT \\$1
 .    if '\\$0'COVER_TITLE_FONT'             .ds $COVER_TITLE_FT \\$1
 .    if '\\$0'DOC_COVER_AUTHOR_FONT'        .ds $DOC_COVER_AUTHOR_FT \\$1
 .    if '\\$0'DOC_COVER_CHAPTER_TITLE_FONT' .ds $DOC_COVER_CHAPTER_TITLE_FT \\$1
 .    if '\\$0'DOC_COVER_COPYRIGHT_FONT'     .ds $DOC_COVER_COPYRIGHT_FT \\$1
 .    if '\\$0'DOC_COVER_DOCTYPE_FONT'       .ds $DOC_COVER_DOCTYPE_FT \\$1
+.    if '\\$0'DOC_COVER_MISC_FONT'          .ds $DOC_COVER_MISC_FT \\$1
 .    if '\\$0'DOC_COVER_SUBTITLE_FONT'      .ds $DOC_COVER_SUBTITLE_FT \\$1
 .    if '\\$0'DOC_COVER_TITLE_FONT'         .ds $DOC_COVER_TITLE_FT \\$1
 .    if '\\$0'DOCTYPE_FONT'                 .ds $DOCTYPE_FT \\$1
@@ -5239,12 +5181,14 @@
 .    if '\\$0'COVER_CHAPTER_TITLE_SIZE'     .ds $COVER_CHAPTER_TITLE_SIZE_CHANGE \\$1
 .    if '\\$0'COVER_COPYRIGHT_SIZE'         .ds $COVER_COPYRIGHT_SIZE_CHANGE \\$1
 .    if '\\$0'COVER_DOCTYPE_SIZE'           .ds $COVER_DOCTYPE_SIZE_CHANGE \\$1
+.    if '\\$0'COVER_MISC_SIZE'              .ds $COVER_MISC_SIZE_CHANGE \\$1
 .    if '\\$0'COVER_SUBTITLE_SIZE'          .ds $COVER_SUBTITLE_SIZE_CHANGE \\$1
 .    if '\\$0'COVER_TITLE_SIZE'             .ds $COVER_TITLE_SIZE_CHANGE \\$1
 .    if '\\$0'DOC_COVER_AUTHOR_SIZE'        .ds $DOC_COVER_AUTHOR_SIZE_CHANGE \\$1
 .    if '\\$0'DOC_COVER_CHAPTER_TITLE_SIZE' .ds $DOC_COVER_CHAPTER_TITLE_SIZE_CHANGE \\$1
 .    if '\\$0'DOC_COVER_COPYRIGHT_SIZE'     .ds $DOC_COVER_COPYRIGHT_SIZE_CHANGE \\$1
 .    if '\\$0'DOC_COVER_DOCTYPE_SIZE'       .ds $DOC_COVER_DOCTYPE_SIZE_CHANGE \\$1
+.    if '\\$0'DOC_COVER_MISC_SIZE'          .ds $DOC_COVER_MISC_SIZE_CHANGE \\$1
 .    if '\\$0'DOC_COVER_SUBTITLE_SIZE'      .ds $DOC_COVER_SUBTITLE_SIZE_CHANGE \\$1
 .    if '\\$0'DOC_COVER_TITLE_SIZE'         .ds $DOC_COVER_TITLE_SIZE_CHANGE \\$1
 .    if '\\$0'DOCTYPE_SIZE'                 .ds $DOCTYPE_SIZE_CHANGE \\$1
@@ -5301,6 +5245,10 @@
 .       nr #CHAPTER_TITLE_COLOR 1
 .       ds $CHAPTER_TITLE_COLOR \\$1
 .    \}
+.    if '\\$0'CODE_COLOR' \{\
+.       nr #CODE_COLOR 1
+.       ds $CODE_COLOR \\$1
+.    \}
 .    if '\\$0'COVER_ATTRIBUTE_COLOR' \{\
 .       nr #COVER_ATTRIBUTE_COLOR 1
 .       ds $COVER_ATTRIBUTE_COLOR \\$1
@@ -5437,6 +5385,10 @@
 .       nr #QUOTE_COLOR 1
 .       ds $QUOTE_COLOR \\$1
 .    \}
+.    if '\\$0'SECTION_COLOR' \{\
+.       nr #LINEBREAK_COLOR 1
+.       ds $LINEBREAK_COLOR \\$1
+.    \}
 .    if '\\$0'SUBHEAD_COLOR' \{\
 .       nr #SH_COLOR 1
 .       ds $SH_COLOR \\$1
@@ -5464,8 +5416,11 @@
 .    if '\\$0'CITE_QUAD'                .ds $BQUOTE_QUAD \\$1
 .    if '\\$0'COVER_COPYRIGHT_QUAD'     .ds $COVER_COPYRIGHT_QUAD \\$1
 .    if '\\$0'COVER_MISC_QUAD'          .ds $COVER_MISC_QUAD \\$1
+.    if '\\$0'COVER_QUAD'               .ds $COVER_QUAD \\$1
 .    if '\\$0'DOC_COVER_COPYRIGHT_QUAD' .ds $DOC_COVER_COPYRIGHT_QUAD \\$1
 .    if '\\$0'DOC_COVER_MISC_QUAD'      .ds $DOC_COVER_MISC_QUAD \\$1
+.    if '\\$0'DOC_COVER_QUAD'           .ds $DOC_COVER_QUAD \\$1
+.    if '\\$0'DOCHEADER_QUAD'           .ds $DOCHEADER_QUAD \\$1
 .    if '\\$0'DOC_QUAD' \{\
 .        ds $DOC_QUAD \\$1
 .        QUAD \\*[$DOC_QUAD]
@@ -5539,7 +5494,7 @@
 .    if !r#FOOTER_MARGIN     \{ .FOOTER_MARGIN 3P \}
 .    if !r#FOOTER_GAP        \{ .FOOTER_GAP    3P \}
 .    if !r#B_MARGIN          \{ .B_MARGIN \\n[#FOOTER_MARGIN]u+\\n[#FOOTER_GAP]u \}
-.    if (\\n[#FOOTER_MARGIN]+\\n(.v)>\\n[#B_MARGIN] \{\
+.    if (\\n[#FOOTER_MARGIN]+\\n[.v]>=\\n[#B_MARGIN] \{\
 .       tm1 "[mom]: Your chosen bottom margin for running text is too close to the footer margin.
 .       tm1 "       No footers or bottom-of-page page numbers will be printed.
 .       tm1 "       Please reset B_MARGIN or FOOTER_MARGIN to allow enough space.
@@ -5606,15 +5561,18 @@
 .    if \\n[#HDRFTR_RIGHT_CAPS]=0 \{\
 .       if !d$HDRFTR_RIGHT_SIZE_CHANGE \{ .HDRFTR_RIGHT_SIZE +0 \}
 .    \}
-.    if !d$FN_FAM               \{ .FOOTNOTE_FAMILY \\*[$DOC_FAM]      \}
-.    if !d$FN_FT                \{ .FOOTNOTE_FONT R                    \}
-.    if !d$FN_QUAD              \{ .FOOTNOTE_QUAD \\*[$DOC_QUAD]       \}
-.    if !r#FN_RULE              \{ .FOOTNOTE_RULE                      \}
-.    if !r#FN_MARKERS           \{ .FOOTNOTE_MARKERS                   \}
+.    if !d$FN_FAM                 \{ .FOOTNOTE_FAMILY \\*[$DOC_FAM]   \}
+.    if !d$FN_FT                  \{ .FOOTNOTE_FONT R                 \}
+.    if !d$FN_QUAD                \{ .FOOTNOTE_QUAD \\*[$DOC_QUAD]    \}
+.    if !r#FN_RULE                \{ .FOOTNOTE_RULE                   \}
+.    if !r#FN_MARKERS             \{ .FOOTNOTE_MARKERS                \}
 .    if \\n[#FN_MARKERS]=1 \{\
-.       if !\\n[#FN_MARKER_STYLE] \{ .FOOTNOTE_MARKER_STYLE STAR       \}
+.       if \\n[#FN_REF]=1 \{\
+.          if !\\n[#FN_MARKER_STYLE] \{ .FOOTNOTE_MARKER_STYLE NUMBER \}
+.       \}
+.       if !\\n[#FN_MARKER_STYLE] \{ .FOOTNOTE_MARKER_STYLE STAR      \}
 .    \}
-.    if !\\n[#EN_MARKER_STYLE]  \{ .ENDNOTE_MARKER_STYLE NUMBER        \}
+.    if !r#EN_MARKER_STYLE      \{ .ENDNOTE_MARKER_STYLE SUPERSCRIPT   \}
 .    if !d$EN_PN_STYLE          \{ .ENDNOTES_PAGENUM_STYLE digit       \}
 .    if !d$EN_FAM               \{ .ENDNOTE_FAMILY \\*[$DOC_FAM]       \}
 .    if !d$EN_FT                \{ .ENDNOTE_FONT R                     \}
@@ -5637,16 +5595,19 @@
 .          \}
 .       el \{ .ENDNOTE_TITLE "\\*[$TITLE]" \}
 .    \}
-.    if !d$EN_TITLE_FAM          \{ .ENDNOTE_TITLE_FAMILY \\*[$EN_FAM]      \}
-.    if !d$EN_TITLE_QUAD         \{ .ENDNOTE_TITLE_QUAD LEFT                \}
-.    if !r#EN_TITLE_UNDERLINE    \{ .nr #EN_TITLE_UNDERLINE 1               \}
-.    if !d$EN_NUMBER_FAM         \{ .ENDNOTE_NUMBER_FAMILY \\*[$EN_FAM]     \}
-.    if !d$EN_LN_FAM             \{ .ENDNOTE_LINENUMBER_FAMILY \\*[$EN_FAM] \}
+.    if !d$EN_TITLE_FAM          \{ .ENDNOTE_TITLE_FAMILY \\*[$EN_FAM]        \}
+.    if !d$EN_TITLE_QUAD         \{ .ENDNOTE_TITLE_QUAD LEFT                  \}
+.    if !r#EN_TITLE_UNDERLINE    \{ .nr #EN_TITLE_UNDERLINE 1                 \}
+.    if !d$EN_NUMBER_FAM         \{ .ENDNOTE_NUMBER_FAMILY \\*[$EN_FAM]       \}
+.    if !d$EN_LN_FAM             \{ .ENDNOTE_LINENUMBER_FAMILY \\*[$EN_FAM]   \}
 .    if !r#EN_NUMBERS_ALIGN_LEFT \{\
-.       if !r#EN_NUMBERS_ALIGN_RIGHT \{ .ENDNOTE_NUMBERS_ALIGN_RIGHT 2  \}
+.       if !r#EN_NUMBERS_ALIGN_RIGHT \{\
+.          ie !\\n[#EN_MARKER_STYLE]=2  \{ .ENDNOTE_NUMBERS_ALIGN RIGHT 2 \}
+.          el \{ .ENDNOTE_NUMBERS_ALIGN RIGHT 4 \}
+.       \}
 .    \}
-.    if !d$EN_LN_GAP             \{ .ENDNOTE_LINENUMBER_GAP 1.5n        \}
-.    if !r#EN_ALLOWS_HEADERS     \{ .ENDNOTES_ALLOWS_HEADERS            \}
+.    if !r#EN_LN_GAP             \{ .ENDNOTE_LINENUMBER_GAP 1n                \}
+.    if !r#EN_ALLOWS_HEADERS     \{ .ENDNOTES_ALLOWS_HEADERS                  \}
 .    if !d$BIB_PN_STYLE          \{ .BIBLIOGRAPHY_PAGENUM_STYLE digit         \}
 .    if !d$BIB_FAM               \{ .BIBLIOGRAPHY_FAMILY \\*[$DOC_FAM]        \}
 .    if !d$BIB_FT                \{ .BIBLIOGRAPHY_FONT R                      \}
@@ -5692,11 +5653,12 @@
 .    if !r#COVER_UNDERLINE          \{ .COVER_UNDERLINE            \}
 .\" Defaults for printstyle TYPEWRITE
 .    if \\n[#PRINT_STYLE]=1 \{\
+.       SS DEFAULT
 .       if \\n[#UNDERLINE_QUOTES]=1 \{ .UNDERLINE_QUOTES         \}
 .       if \\n[#UNDERLINE_QUOTES]=0 \{ .UNDERLINE_QUOTES OFF     \}
 .\" +Quotes and blockquotes
 .       if !r#Q_OFFSET_VALUE \{\
-.          if '\\*[$Q_OFFSET_VALUE]'' \{ .QUOTE_INDENT 2 \}
+.          if '\\*[$Q_OFFSET_VALUE]'' \{ .QUOTE_INDENT 1 \}
 .       \}
 .\" +Epigraphs
 .       if !r#EPI_OFFSET_VALUE \{\
@@ -5712,7 +5674,7 @@
 .\" +Endnotes
 .       if !r#EN_PP_INDENT \{ .ENDNOTE_PARA_INDENT \\n[#PP_INDENT] \}
 .\" +Footnotes
-.       if !r#FN_RULE_ADJ           \{ .FOOTNOTE_RULE_ADJ  6p    \}
+.       if !r#FN_RULE_ADJ  \{ .FOOTNOTE_RULE_ADJ  6p \}
 .\" +Slant stuff
 .       if !r#SLANT_MEANS_SLANT \{\
 .          ie \\n[#UNDERLINE_SLANT]=1 \{ .UNDERLINE_SLANT \}
@@ -5767,9 +5729,14 @@
 .       \}
 .       if !d$COVER_COPYRIGHT_FT          \{ .COVER_COPYRIGHT_FONT R  \}
 .       if !d$COVER_COPYRIGHT_SIZE_CHANGE \{ .COVER_COPYRIGHT_SIZE -2 \}
+.\" (misc)
+.       if !d$COVER_MISC_FAM         \{ .COVER_MISC_FAMILY \\*[$DOC_FAM] \}
+.       if !d$COVER_MISC_FT          \{ .COVER_MISC_FONT R               \}
+.       if !d$COVER_MISC_SIZE_CHANGE \{ .COVER_MISC_SIZE -2              \}
+.       if !r#COVER_MISC_AUTOLEAD    \{ .COVER_MISC_AUTOLEAD 2           \}
 .\" +Doc cover
-.       if !d$DOC_COVER_LEAD_ADJ \{ .DOC_COVER_LEAD +0 \}
-.       if !d$DOC_COVER_FAM \{ .DOC_COVER_FAMILY \\*[$DOC_FAM] \}
+.       if !d$DOC_COVER_LEAD_ADJ \{ .DOC_COVER_LEAD +0              \}
+.       if !d$DOC_COVER_FAM      \{ .DOC_COVER_FAMILY \\*[$DOC_FAM] \}
 .\" (title)
 .       if !d$DOC_COVER_TITLE_FAM \{\
 .          ie !d$DOC_COVER_FAM \{ .DOC_COVER_TITLE_FAMILY \\*[$DOC_FAM] \}
@@ -5812,6 +5779,11 @@
 .       \}
 .       if !d$DOC_COVER_COPYRIGHT_FT          \{ .DOC_COVER_COPYRIGHT_FONT R  \}
 .       if !d$DOC_COVER_COPYRIGHT_SIZE_CHANGE \{ .DOC_COVER_COPYRIGHT_SIZE -2 \}
+.\" (misc)
+.       if !d$DOC_COVER_MISC_FAM         \{ .DOC_COVER_MISC_FAMILY \\*[$DOC_FAM] \}
+.       if !d$DOC_COVER_MISC_FT          \{ .DOC_COVER_MISC_FONT R               \}
+.       if !d$DOC_COVER_MISC_SIZE_CHANGE \{ .DOC_COVER_MISC_SIZE -2              \}
+.       if !r#DOC_COVER_MISC_AUTOLEAD    \{ .DOC_COVER_MISC_AUTOLEAD 2           \}
 .\" +Docheader
 .       if !d$DOCHEADER_FAM \{ .DOCHEADER_FAMILY \\*[$DOC_FAM] \}
 .       if !d$TITLE_FAM \{\
@@ -5881,6 +5853,7 @@
 .       if !d$PH_FT                     \{ .PARAHEAD_FONT      BI               \}
 .       if !d$PH_SIZE_CHANGE            \{ .PARAHEAD_SIZE      -.25             \}
 .       if !r#PH_INDENT                 \{ .PARAHEAD_INDENT \\n[#PP_INDENT]u/2u \}
+.       if !d$PH_SPACE                  \{ .PARAHEAD_SPACE .6m                  \}
 .\" +Quotes
 .       if !d$QUOTE_FAM                 \{ .QUOTE_FAMILY       \\*[$DOC_FAM]    \}
 .       if !d$QUOTE_FT                  \{ .QUOTE_FONT         I                \}
@@ -5912,15 +5885,17 @@
 .       if !d$FN_SIZE_CHANGE            \{ .FOOTNOTE_SIZE      -2               \}
 .       if !r#FN_AUTOLEAD               \{ .FOOTNOTE_AUTOLEAD  2                \}
 .\" +Endnotes
-.       if !r#EN_PS                     \{ .ENDNOTE_PT_SIZE (\\n[#DOC_PT_SIZE]u)\}
-.       if !d$EN_STRING_FT              \{ .ENDNOTE_STRING_FONT B               \}
-.       if !d$EN_STRING_SIZE_CHANGE     \{ .ENDNOTE_STRING_SIZE +1              \}
-.       if !d$EN_TITLE_FT               \{ .ENDNOTE_TITLE_FONT  B               \}
-.       if !d$EN_TITLE_SIZE_CHANGE      \{ .ENDNOTE_TITLE_SIZE  +0              \}
-.       if !d$EN_NUMBER_FT              \{ .ENDNOTE_NUMBER_FONT B               \}
-.       if !d$EN_LN_FT                  \{ .ENDNOTE_LINENUMBER_FONT R           \}
-.       if !d$EN_NUMBER_SIZE_CHANGE     \{ .ENDNOTE_NUMBER_SIZE +0              \}
-.       if !r#EN_PP_INDENT              \{ .ENDNOTE_PARA_INDENT 1.5m            \}
+.       if !r#EN_PS                     \{ .ENDNOTE_PT_SIZE (\\n[#DOC_PT_SIZE]u) \}
+.       if !d$EN_STRING_FT              \{ .ENDNOTE_STRING_FONT B                \}
+.       if !d$EN_STRING_SIZE_CHANGE     \{ .ENDNOTE_STRING_SIZE +1               \}
+.       if !d$EN_TITLE_FT               \{ .ENDNOTE_TITLE_FONT  B                \}
+.       if !d$EN_TITLE_SIZE_CHANGE      \{ .ENDNOTE_TITLE_SIZE  +0               \}
+.       if !d$EN_NUMBER_FT              \{ .ENDNOTE_NUMBER_FONT B                \}
+.       if !d$EN_LN_FT                  \{ .ENDNOTE_LINENUMBER_FONT R            \}
+.       if !d$EN_NUMBER_SIZE_CHANGE     \{ .ENDNOTE_NUMBER_SIZE +0               \}
+.       if !d$EN_LN_SIZE_CHANGE         \{ .ENDNOTE_LINENUMBER_SIZE +0           \}
+.       if !r#EN_PP_INDENT              \{ .ENDNOTE_PARA_INDENT 1.5m             \}
+.       if !d$EN_SPACE                  \{ .ENDNOTE_SPACING 0                    \}
 .\" +Bibliography
 .       if !r#BIB_LIST                  \{ .BIBLIOGRAPHY_TYPE LIST .                  \}
 .       if !r#BIB_PS                    \{ .BIBLIOGRAPHY_PT_SIZE (\\n[#DOC_PT_SIZE]u) \}
@@ -5929,7 +5904,7 @@
 .\" +Table of contents
 .       if !d$TOC_FAM                   \{ .TOC_FAMILY  \\*[$DOC_FAM]           \}
 .       if !r#TOC_PS                    \{ .TOC_PT_SIZE (\\n[#DOC_PT_SIZE]u)    \}
-.       if !r#TOC_LEAD                  \{ .TOC_LEAD    \\n[#DOC_LEAD]u ADJUST  \}
+.       if !d$TOC_LEAD                  \{ .TOC_LEAD \\n[#DOC_LEAD]u ADJUST     \}
 .       if !d$TOC_HEADER_FAM            \{ .TOC_HEADER_FAMILY \\*[$TOC_FAM]     \}
 .       if !d$TOC_HEADER_SIZE_CHANGE    \{ .TOC_HEADER_SIZE +4                  \}
 .       if !d$TOC_HEADER_FT             \{ .TOC_HEADER_FONT  B                  \}
@@ -5960,18 +5935,21 @@
 .    \}
 .\" +Refer support
 .    if !r#EN_REF \{ .nr #FN_REF 1 \}
-.    if '\\*[$REF_FN_INDENT]'' \{\
-.       if \\n[#PRINT_STYLE]=1 \{ .INDENT_REFS FOOTNOTE 2m   \}
-.       if \\n[#PRINT_STYLE]=2 \{ .INDENT_REFS FOOTNOTE 1.5m \}
-.    \}
-.    if '\\*[$REF_EN_INDENT]'' \{\
-.       if \\n[#PRINT_STYLE]=1 \{ .INDENT_REFS ENDNOTE 2m   \}
-.       if \\n[#PRINT_STYLE]=2 \{ .INDENT_REFS ENDNOTE 1.5m \}
-.    \}
-.    if '\\*[$REF_BIB_INDENT]'' \{\
-.       if \\n[#PRINT_STYLE]=1 \{ .INDENT_REFS BIBLIO 2m    \}
-.       if \\n[#PRINT_STYLE]=2 \{ .INDENT_REFS BIBLIO 1.5m  :\}
-.    \}
+.    if !d$REF_FN_INDENT \{\
+.       if \\n[#PRINT_STYLE]=1 \{ .INDENT_REFS FOOTNOTE .5i \}
+.       if \\n[#PRINT_STYLE]=2 \{ .INDENT_REFS FOOTNOTE 2m  \}
+.    \}
+.    if !d$REF_EN_INDENT \{\
+.       if \\n[#PRINT_STYLE]=1 \{ .INDENT_REFS ENDNOTE .5i  \}
+.       if \\n[#PRINT_STYLE]=2 \{ .INDENT_REFS ENDNOTE 2m   \}
+.    \}
+.    if !d$REF_BIB_INDENT \{\
+.       if \\n[#PRINT_STYLE]=1 \{ .INDENT_REFS BIBLIO .5i   \}
+.       if \\n[#PRINT_STYLE]=2 \{ .INDENT_REFS BIBLIO 2m    \}
+.    \}
+.\" Define strings for idem entries
+.    if \\n[#PRINT_STYLE]=1 .char \[idem] \[hy]\[hy]\[hy]
+.    if \\n[#PRINT_STYLE]=2 .char \[idem] \v'-.3m'\l'3m'\v'.3m'
 .\" Adjust doc leading for PRINTSTYLE TYPESET
 .    if \\n[#PRINT_STYLE]=2 \{\
 .       ie \\n[#ADJ_DOC_LEAD]=1 \{ .DOC_LEAD_ADJUST \}
@@ -5981,7 +5959,7 @@
 .    di NULL
 .       ev NULL
 .       if \\n[#PRINT_STYLE]=1 \{\
-.          ps 12
+.          ps \\*[$TYPEWRITER_PS]
 .          ie \\n[#SINGLE_SPACE]=1 \{ .vs \\n[#ORIGINAL_DOC_LEAD]u \}
 .          el \{ .vs \\n[#ORIGINAL_DOC_LEAD]u/2u \}
 .       \}
@@ -6006,24 +5984,21 @@
 .             BIBLIOGRAPHY_LEAD 12 ADJUST
 .          \}
 .          el \{\
-.             ie \\n[#EN_SINGLESPACE] \{ .ENDNOTE_LEAD 12 ADJUST \}
-.             el \{ .ENDNOTE_LEAD 24 ADJUST \}
-.             ie \\n[#BIB_SINGLESPACE] \{ .BIBLIOGRAPHY_LEAD 12 ADJUST \}
-.             el \{ .BIBLIOGRAPHY_LEAD 24 ADJUST \}
+.             ie \\n[#EN_SINGLESPACE] .ENDNOTE_LEAD 12 ADJUST
+.             el .ENDNOTE_LEAD 24 ADJUST
+.             ie \\n[#BIB_SINGLESPACE] .BIBLIOGRAPHY_LEAD 12 ADJUST
+.             el .BIBLIOGRAPHY_LEAD 24 ADJUST
 .          \}
 .       \}
 .       if \\n[#PRINT_STYLE]=2 \{\
-.          ie !d$EN_LEAD \{ .ENDNOTE_LEAD 14 ADJUST \}
-.          el \{ .ENDNOTE_LEAD \\*[$EN_LEAD] \\*[$ADJUST_EN_LEAD] \}
-.          ie !d$BIB_LEAD \{ .BIBLIOGRAPHY_LEAD 14 ADJUST \}
-.          el \{ .BIBLIOGRAPHY_LEAD \\*[$BIB_LEAD] \\*[$ADJUST_BIB_LEAD] \}
-.          ie !d$TOC_LEAD \{ .TOC_LEAD \\n[#RESTORE_DOC_LEAD]u \}
-.          el \{ .TOC_LEAD \\*[$TOC_LEAD] \\*[$ADJUST_TOC_LEAD] \}
-.          rm $ADJUST_EN_LEAD
-.          rm $ADJUST_BIB_LEAD
-.          rm $ADJUST_TOC_LEAD
+.          ie !d$EN_LEAD .ENDNOTE_LEAD \\n[#UNADJUSTED_DOC_LEAD]u ADJUST
+.          el .ENDNOTE_LEAD \\*[$EN_LEAD] \\*[$ADJUST_EN_LEAD]
+.          ie !d$BIB_LEAD .BIBLIOGRAPHY_LEAD \\n[#UNADJUSTED_DOC_LEAD]u ADJUST
+.          el .BIBLIOGRAPHY_LEAD \\*[$BIB_LEAD] \\*[$ADJUST_BIB_LEAD]
+.          ie !d$TOC_LEAD .TOC_LEAD \\n[#UNADJUSTED_DOC_LEAD]u \\*[$ADJUST_TOC_LEAD]
+.          el .TOC_LEAD \\*[$TOC_LEAD] \\*[$ADJUST_TOC_LEAD]
 .       \}
-.       ie !d$BIB_SPACE \{ .BIBLIOGRAPHY_SPACING 1v \}
+.       ie !d$BIB_SPACE \{ .BIBLIOGRAPHY_SPACING 0 \}
 .       el \{\
 .          if \\n[#DEFER_BIB_SPACING]=1 \{\
 .             BIBLIOGRAPHY_SPACING \\*[$BIB_SPACE]
@@ -6036,7 +6011,10 @@
 .    el \{\
 .       if \\n[#COLLATE] \{\
 .          if !\\n[#PRINT_STYLE]=1 \{\
-.             if \\n[#RERUN_TRAPS] \{ .TRAPS \}
+.             if \\n[#RERUN_TRAPS] \{\
+.                TRAPS
+.                rr #RERUN_TRAPS
+.             \}
 .          \}
 .       \}
 .    \}
@@ -6072,6 +6050,7 @@
 .ds $DOC_COVER_CHAPTER_TITLE_PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$DOC_COVER_CHAPTER_TITLE_SIZE_CHANGE]
 .ds $DOC_COVER_COPYRIGHT_PT_SIZE     \\n[#DOC_PT_SIZE]u\\*[$DOC_COVER_COPYRIGHT_SIZE_CHANGE]
 .ds $DOC_COVER_DOCTYPE_PT_SIZE       \\n[#DOC_PT_SIZE]u\\*[$DOC_COVER_DOCTYPE_SIZE_CHANGE]
+.ds $DOC_COVER_MISC_PT_SIZE          \\n[#DOC_PT_SIZE]u\\*[$DOC_COVER_MISC_SIZE_CHANGE]
 .ds $DOC_COVER_SUBTITLE_PT_SIZE      \\n[#DOC_PT_SIZE]u\\*[$DOC_COVER_SUBTITLE_SIZE_CHANGE]
 .ds $DOC_COVER_TITLE_PT_SIZE         \\n[#DOC_PT_SIZE]u\\*[$DOC_COVER_TITLE_SIZE_CHANGE]
 \# Cover
@@ -6079,6 +6058,7 @@
 .ds $COVER_CHAPTER_TITLE_PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$COVER_CHAPTER_TITLE_SIZE_CHANGE]
 .ds $COVER_COPYRIGHT_PT_SIZE     \\n[#DOC_PT_SIZE]u\\*[$COVER_COPYRIGHT_SIZE_CHANGE]
 .ds $COVER_DOCTYPE_PT_SIZE       \\n[#DOC_PT_SIZE]u\\*[$COVER_DOCTYPE_SIZE_CHANGE]
+.ds $COVER_MISC_PT_SIZE          \\n[#DOC_PT_SIZE]u\\*[$COVER_MISC_SIZE_CHANGE]
 .ds $COVER_SUBTITLE_PT_SIZE      \\n[#DOC_PT_SIZE]u\\*[$COVER_SUBTITLE_SIZE_CHANGE]
 .ds $COVER_TITLE_PT_SIZE         \\n[#DOC_PT_SIZE]u\\*[$COVER_TITLE_SIZE_CHANGE]
 \# Docheader
@@ -6091,22 +6071,26 @@
 \#
 \# Next, some utility macros for various routines to prevent repetition
 \#
-.    if '\\$1'DOC_COVER' \{\
-.       shift
-.       nr #AUTHOR_DOCCOVER_NUM 0 1
-.       while \\n[#NUM_ARGS]>\\n[#AUTHOR_DOCCOVER_NUM] \{\
-.       ds $AUTHOR_DOCCOVER_\\n+[#AUTHOR_DOCCOVER_NUM] \\$\\n[#AUTHOR_DOCCOVER_NUM]
-.\}
-.       return
-.    \}
-.    if '\\$1'COVER' \{\
-.       shift
-.       nr #AUTHOR_COVER_NUM 0 1
-.       while \\n[#NUM_ARGS]>\\n[#AUTHOR_COVER_NUM] \{\
-.       ds $AUTHOR_COVER_\\n+[#AUTHOR_COVER_NUM] \\$\\n[#AUTHOR_COVER_NUM]
-.\}
-.       return
+.MAC DOC_HEADER_QUAD END
+.    if '\\$0'DOC_HEADER_QUAD' .ds $CALLING_MACRO DOCHEADER
+.    if '\\$0'COVER_H_POS'     .ds $CALLING_MACRO COVER
+.    if '\\$0'DOC_COVER_H_POS' .ds $CALLING_MACRO DOC_COVER
+.    ie !'\\*[$\\*[$CALLING_MACRO]_QUAD]'' \{\
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'L'      \{ .LEFT   \}
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'LEFT'   \{ .LEFT   \}
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'R'      \{ .RIGHT  \}
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'RIGHT'  \{ .RIGHT  \}
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'C'      \{ .RIGHT  \}
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'CENTER' \{ .CENTER \}
+.       if '\\*[$\\*[$CALLING_MACRO]_QUAD]'CENTRE' \{ .CENTER \}
 .    \}
+.    el \{ .CENTER \}
+.END
+\#
+\# Aliases for DOC_HEADER_QUAD
+\#
+.ALIAS COVER_H_POS      DOC_HEADER_QUAD
+.ALIAS DOC_COVER_H_POS  DOC_HEADER_QUAD
 \#
 .MAC PRINT_AUTHORS END
 .    ie r#DOING_COVER \{\
@@ -6170,8 +6154,8 @@
 .END
 \#
 .MAC DEFAULT_DOCHEADER END
+.    DOC_HEADER_QUAD
 .    if !'\\*[$TITLE_1]'' \{\
-.       CENTER
 .       FAMILY  \\*[$TITLE_FAM]
 .       FT      \\*[$TITLE_FT]
 .       PT_SIZE \\*[$TITLE_PT_SIZE]
@@ -6216,7 +6200,7 @@
 \#
 \#
 .MAC CHAPTER_DOCHEADER END
-.    CENTER
+.    DOC_HEADER_QUAD
 .    FAMILY  \\*[$TITLE_FAM]
 .    FT      \\*[$TITLE_FT]
 .    PT_SIZE \\*[$TITLE_PT_SIZE]
@@ -6275,7 +6259,7 @@
 \#
 \#
 .MAC NAMED_DOCHEADER END
-.    CENTER
+.    DOC_HEADER_QUAD
 .    FAMILY  \\*[$TITLE_FAM]
 .    FT      \\*[$TITLE_FT]
 .    PT_SIZE \\*[$TITLE_PT_SIZE]
@@ -6472,6 +6456,17 @@
 .    \}
 .END
 \#
+\# MISCs get treated similarly to QUOTEs and BLOCKQUOTEs with respect to
+\# leading
+\#
+.MAC MISC_AUTOLEAD END
+.    if '\\$0'DOC_COVER_MISC_AUTOLEAD' \{ .nr #DOC_COVER_MISC_AUTOLEAD \\$1 \}
+.    if '\\$0'COVER_MISC_AUTOLEAD'     \{ .nr #COVER_MISC_AUTOLEAD \\$1 \}
+.END
+\#
+.ALIAS DOC_COVER_MISC_AUTOLEAD  MISC_AUTOLEAD
+.ALIAS COVER_MISC_AUTOLEAD      MISC_AUTOLEAD
+\#
 \#
 \# COVER PAGE START POSITION
 \# -------------------------
@@ -6517,6 +6512,7 @@
 .       if '\\$0'DOC_COVER_UNDERLINE'            \{ .nr #DOCCOVER_UNDERLINE   1 \}
 .       if '\\$0'DOCTYPE_UNDERLINE'              \{ .nr #DOCTYPE_UNDERLINE    1 \}
 .       if '\\$0'HEAD_UNDERLINE'                 \{ .nr #HEAD_UNDERLINE       1 \}
+.       if '\\$0'HEAD_UNDERSCORE'                \{ .nr #HEAD_UNDERLINE       1 \}
 .       if '\\$0'ENDNOTE_STRING_UNDERLINE'       \{ .nr #EN_STRING_UNDERLINE  1 \}
 .       if '\\$0'ENDNOTE_STRING_UNDERSCORE'      \{ .nr #EN_STRING_UNDERLINE  1 \}
 .       if '\\$0'ENDNOTE_TITLE_UNDERLINE'        \{ .nr #EN_TITLE_UNDERLINE   1 \}
@@ -6534,6 +6530,7 @@
 .                if '\\$0'DOC_COVER_UNDERLINE'            \{ .DOCCOVER_UNDERLINE_WEIGHT            \\$1 \}
 .                if '\\$0'DOCTYPE_UNDERLINE'              \{ .DOCTYPE_UNDERLINE_WEIGHT             \\$1 \}
 .                if '\\$0'HEAD_UNDERLINE'                 \{ .HEAD_UNDERLINE_WEIGHT                \\$1 \}
+.                if '\\$0'HEAD_UNDERSCORE'                \{ .HEAD_UNDERLINE_WEIGHT                \\$1 \}
 .                if '\\$0'ENDNOTE_STRING_UNDERLINE'       \{ .ENDNOTE_STRING_UNDERLINE_WEIGHT      \\$1 \}
 .                if '\\$0'ENDNOTE_STRING_UNDERSCORE'      \{ .ENDNOTE_STRING_UNDERLINE_WEIGHT      \\$1 \}
 .                if '\\$0'ENDNOTE_TITLE_UNDERLINE'        \{ .ENDNOTE_TITLE_UNDERLINE_WEIGHT       \\$1 \}
@@ -6553,6 +6550,7 @@
 .             if '\\$0'DOC_COVER_UNDERLINE'      \{ .nr #DOCCOVER_UNDERLINE  0 \}
 .             if '\\$0'DOCTYPE_UNDERLINE'        \{ .nr #DOCTYPE_UNDERLINE   0 \}
 .             if '\\$0'HEAD_UNDERLINE'           \{ .nr #HEAD_UNDERLINE      0 \}
+.             if '\\$0'HEAD_UNDERSCORE'          \{ .nr #HEAD_UNDERLINE      0 \}
 .             if '\\$0'ENDNOTE_STRING_UNDERLINE' \{\
 .                ie '\\$1'DOUBLE' \{ .nr #EN_STRING_UNDERLINE 2 \}
 .                el \{ .nr #EN_STRING_UNDERLINE 0 \}
@@ -6613,6 +6611,11 @@
 .                HEAD_UNDERLINE_WEIGHT  \\$1
 .                ds $HEAD_UNDERLINE_GAP \\$2
 .             \}
+.             if '\\$0'HEAD_UNDERSCORE' \{\
+.                nr #HEAD_UNDERLINE 1
+.                HEAD_UNDERLINE_WEIGHT  \\$1
+.                ds $HEAD_UNDERLINE_GAP \\$2
+.             \}
 \# ENDNOTE_STRING_UNDERLINE and ENDNOTE_STRING_UNDERSCORE are identical;
 \# the _UNDERSCORE version is left in for backward compatibility.
 .             if '\\$0'ENDNOTE_STRING_UNDERLINE' \{\
@@ -6666,6 +6669,7 @@
 .ALIAS DOC_COVER_UNDERLINE            _UNDERLINE
 .ALIAS DOCTYPE_UNDERLINE              _UNDERLINE
 .ALIAS HEAD_UNDERLINE                 _UNDERLINE
+.ALIAS HEAD_UNDERSCORE                _UNDERLINE
 .ALIAS ENDNOTE_STRING_UNDERLINE       _UNDERLINE
 .ALIAS ENDNOTE_STRING_UNDERSCORE      _UNDERLINE
 .ALIAS ENDNOTE_TITLE_UNDERLINE        _UNDERLINE
@@ -6768,7 +6772,7 @@
 \m[\\*[$DOC_COVER_COLOR]]
 .          EOL
 .       \}
-.       CENTER
+.       DOC_COVER_H_POS
 .       FAMILY  \\*[$DOC_COVER_TITLE_FAM]
 .       FT      \\*[$DOC_COVER_TITLE_FT]
 .       PT_SIZE \\*[$DOC_COVER_TITLE_PT_SIZE]
@@ -6882,9 +6886,9 @@
 .                if \\n[#SINGLE_SPACE]=0 \{ .vs \\n[#DOC_LEAD]u \}
 .             \}
 .             el \{\
-.                FAMILY  \\*[$DOC_COVER_CHAPTER_TITLE_FAM]
-.                FT      \\*[$DOC_COVER_CHAPTER_TITLE_FT]
-.                PT_SIZE \\*[$DOC_COVER_CHAPTER_TITLE_PT_SIZE]
+.                fam \\*[$DOC_COVER_CHAPTER_TITLE_FAM]
+.                ft  \\*[$DOC_COVER_CHAPTER_TITLE_FT]
+.                ps  \\*[$DOC_COVER_CHAPTER_TITLE_PT_SIZE]
 .                nr #ARG_NUM 0 1
 .                ALD \\n[.v]u/4u \"Put a little space before the chapter title
 .                while \\n[#CHAPTER_TITLE_NUM]>=\\n+[#ARG_NUM] \{\
@@ -6917,9 +6921,9 @@
 .       \}
 .       if !\\n[#DOC_TYPE]=2 \{\
 .          if \\n[#DOC_COVER_SUBTITLE]=1 \{\
-.             FAMILY  \\*[$DOC_COVER_SUBTITLE_FAM]
-.             FT      \\*[$DOC_COVER_SUBTITLE_FT]
-.             PT_SIZE \\*[$DOC_COVER_SUBTITLE_PT_SIZE]
+.             fam \\*[$DOC_COVER_SUBTITLE_FAM]
+.             ft  \\*[$DOC_COVER_SUBTITLE_FT]
+.             ps  \\*[$DOC_COVER_SUBTITLE_PT_SIZE]
 .             if \\n[#PRINT_STYLE]=1 \{\
 .                TYPEWRITER
 .                ie \\n[#SINGLE_SPACE]=0 \{ .vs \\n[#DOC_LEAD]u/2u \}
@@ -6957,9 +6961,9 @@
 .          \}
 .       \}
 .       if \\n[#DOC_COVER_AUTHOR]=1 \{\
-.          FAMILY  \\*[$DOC_COVER_AUTHOR_FAM]
-.          FT      \\*[$DOC_COVER_AUTHOR_FT]
-.          PT_SIZE \\*[$DOC_COVER_AUTHOR_PT_SIZE]
+.          fam \\*[$DOC_COVER_AUTHOR_FAM]
+.          ft  \\*[$DOC_COVER_AUTHOR_FT]
+.          ps  \\*[$DOC_COVER_AUTHOR_PT_SIZE]
 .          if \\n[#PRINT_STYLE]=1 \{\
 .             TYPEWRITER
 .             ie \\n[#SINGLE_SPACE]=1 \{ .vs \\n[#DOC_LEAD]u \}
@@ -6982,9 +6986,9 @@
 .          \}
 .          PRINT_AUTHORS
 .       \}
-.       FAMILY  \\*[$DOC_COVER_DOCTYPE_FAM]
-.       FT      \\*[$DOC_COVER_DOCTYPE_FT]
-.       PT_SIZE \\*[$DOC_COVER_DOCTYPE_PT_SIZE]
+.       fam \\*[$DOC_COVER_DOCTYPE_FAM]
+.       ft  \\*[$DOC_COVER_DOCTYPE_FT]
+.       ps  \\*[$DOC_COVER_DOCTYPE_PT_SIZE]
 .       SP
 .       if \\n[#DOC_TYPE]=3 \{\
 .          if \\n[#DOC_COVER_DOCTYPE]=1 \{\
@@ -7015,10 +7019,10 @@
 .          el \{ .vs \\n[#DOC_LEAD]u/2u \}
 .       \}
 .       el \{\
-.          FAMILY  \\*[$DOC_COVER_COPYRIGHT_FAM]
-.          FT      \\*[$DOC_COVER_COPYRIGHT_FT]
-.          AUTOLEAD 2
+.          fam \\*[$DOC_COVER_COPYRIGHT_FAM]
+.          ft  \\*[$DOC_COVER_COPYRIGHT_FT]
 .          PT_SIZE \\*[$DOC_COVER_COPYRIGHT_PT_SIZE]
+.          AUTOLEAD \\n[#DOC_COVER_MISC_AUTOLEAD]
 .       \}
 .       if \\n[#DOC_COVER_COPYRIGHT]=1 \{\
 .          if !'\\*[$COPYRIGHT_DOCCOVER]'' \{\
@@ -7032,12 +7036,17 @@
 .          el \{ .PRINT \\*[$COPYRIGHT] \}
 .          ds $COPYRIGHT \\*[$SAVED_COPYRIGHT]
 .       \}
-.       sp |\\n[#VISUAL_B_MARGIN]u+\\n[#DOC_LEAD]u
+.       br
 .       if \\n[#DOC_COVER_MISC]=1 \{\
+.          if \\n[#PRINT_STYLE]=2 \{\
+.             fam \\*[$DOC_COVER_MISC_FAM]
+.             ft  \\*[$DOC_COVER_MISC_FT]
+.             PT_SIZE \\*[$DOC_COVER_MISC_PT_SIZE]
+.          \}
 .          QUAD \\*[$DOC_COVER_MISC_QUAD]
 .          ie !'\\*[$MISC_DOCCOVER_1]'' \{\
 .             nr #MISCS \\n[#MISC_DOCCOVER_NUM]
-.             sp -\\n[#MISCS]+1
+.             sp -\\n[#MISCS]
 .             nr #NEXT_MISC 0 1
 .             while \\n[#MISCS]>\\n[#NEXT_MISC] \{\
 .                ie \\n[#DOC_COVER_MISC_COLOR]=1 \{\
@@ -7057,7 +7066,7 @@
 .          \}
 .          el \{\
 .             nr #MISCS \\n[#MISC_NUM]
-.             sp -\\n[#MISCS]+1
+.             sp -\\n[#MISCS]
 .             nr #NEXT_MISC 0 1
 .             while \\n[#MISCS]>\\n[#NEXT_MISC] \{\
 .                ie \\n[#DOC_COVER_MISC_COLOR]=1 \{\
@@ -7071,7 +7080,6 @@
 .\}
 .          \}
 .       \}
-.       if \\n[#DOCCOVERS_COUNT]=1 \{ .nr #PAGE_NUM_ADJ +1 \}
 .       nr #DOCCOVER_END 1
 .       END_COVER
 .    \}
@@ -7093,13 +7101,12 @@
 .       if \\n[#COVER_COLOR]=1 \{\
 .          nf
 \m[\\*[$COVER_COLOR]]
-.          EOL
 .       \}
-.       CENTER
-.       FAMILY  \\*[$COVER_TITLE_FAM]
-.       FT      \\*[$COVER_TITLE_FT]
-.       PT_SIZE \\*[$COVER_TITLE_PT_SIZE]
-.       LS      \\n[#COVER_LEAD]u
+.       COVER_H_POS
+.       fam \\*[$COVER_TITLE_FAM]
+.       ft  \\*[$COVER_TITLE_FT]
+.       ps  \\*[$COVER_TITLE_PT_SIZE]
+.       vs      \\n[#COVER_LEAD]u
 .       if \\n[#PRINT_STYLE]=1 \{ .TYPEWRITER \}
 .       if \\n[#COVER_TITLE]=1 \{\
 .          ie \\n[#PRINT_STYLE]=1 \{\
@@ -7209,9 +7216,9 @@
 .                if \\n[#SINGLE_SPACE]=0 \{ .vs \\n[#DOC_LEAD]u \}
 .             \}
 .             el \{\
-.                FAMILY  \\*[$COVER_CHAPTER_TITLE_FAM]
-.                FT      \\*[$COVER_CHAPTER_TITLE_FT]
-.                PT_SIZE \\*[$COVER_CHAPTER_TITLE_PT_SIZE]
+.                fam \\*[$COVER_CHAPTER_TITLE_FAM]
+.                ft  \\*[$COVER_CHAPTER_TITLE_FT]
+.                ps  \\*[$COVER_CHAPTER_TITLE_PT_SIZE]
 .                ALD \\n[.v]u/4u \"Put a little space before the chapter title
 .                nr #ARG_NUM 0 1
 .                while \\n[#CHAPTER_TITLE_NUM]>=\\n+[#ARG_NUM] \{\
@@ -7244,9 +7251,9 @@
 .       \}
 .       if !\\n[#DOC_TYPE]=2 \{\
 .          if \\n[#COVER_SUBTITLE]=1 \{\
-.             FAMILY  \\*[$COVER_SUBTITLE_FAM]
-.             FT      \\*[$COVER_SUBTITLE_FT]
-.             PT_SIZE \\*[$COVER_SUBTITLE_PT_SIZE]
+.             fam \\*[$COVER_SUBTITLE_FAM]
+.             ft  \\*[$COVER_SUBTITLE_FT]
+.             ps  \\*[$COVER_SUBTITLE_PT_SIZE]
 .             if \\n[#PRINT_STYLE]=1 \{\
 .                TYPEWRITER
 .                if \\n[#PRINT_STYLE]=1 \{\
@@ -7287,9 +7294,9 @@
 .          \}
 .       \}
 .       if \\n[#COVER_AUTHOR]=1 \{\
-.          FAMILY  \\*[$COVER_AUTHOR_FAM]
-.          FT      \\*[$COVER_AUTHOR_FT]
-.          PT_SIZE \\*[$COVER_AUTHOR_PT_SIZE]
+.          fam \\*[$COVER_AUTHOR_FAM]
+.          ft  \\*[$COVER_AUTHOR_FT]
+.          ps  \\*[$COVER_AUTHOR_PT_SIZE]
 .          if \\n[#PRINT_STYLE]=1 \{\
 .             TYPEWRITER
 .             ie \\n[#SINGLE_SPACE]=1 \{ .vs \\n[#DOC_LEAD]u \}
@@ -7312,9 +7319,9 @@
 .          \}
 .          PRINT_AUTHORS
 .       \}
-.       FAMILY  \\*[$COVER_DOCTYPE_FAM]
-.       FT      \\*[$COVER_DOCTYPE_FT]
-.       PT_SIZE \\*[$COVER_DOCTYPE_PT_SIZE]
+.       fam \\*[$COVER_DOCTYPE_FAM]
+.       ft  \\*[$COVER_DOCTYPE_FT]
+.       ps  \\*[$COVER_DOCTYPE_PT_SIZE]
 .       SP
 .       if \\n[#DOC_TYPE]=3 \{\
 .          if \\n[#COVER_DOCTYPE]=1 \{\
@@ -7345,10 +7352,10 @@
 .          el \{ .vs \\n[#DOC_LEAD]u/2u \}
 .       \}
 .       el \{\
-.          FAMILY  \\*[$COVER_COPYRIGHT_FAM]
-.          FT      \\*[$COVER_COPYRIGHT_FT]
-.          AUTOLEAD 2
+.          fam  \\*[$COVER_COPYRIGHT_FAM]
+.          ft      \\*[$COVER_COPYRIGHT_FT]
 .          PT_SIZE \\*[$COVER_COPYRIGHT_PT_SIZE]
+.          AUTOLEAD \\n[#COVER_MISC_AUTOLEAD]
 .       \}
 .       if \\n[#COVER_COPYRIGHT]=1 \{\
 .          if !'\\*[$COPYRIGHT_COVER]'' \{\
@@ -7362,12 +7369,17 @@
 .          el \{ .PRINT \\*[$COPYRIGHT] \}
 .          ds $COPYRIGHT \\*[$SAVED_COPYRIGHT]
 .       \}
-.       sp |\\n[#VISUAL_B_MARGIN]u+\\n[#DOC_LEAD]u
+.       br
 .       if \\n[#COVER_MISC]=1 \{\
 .          QUAD \\*[$COVER_MISC_QUAD]
+.          if \\n[#PRINT_STYLE]=2 \{\
+.             fam \\*[$COVER_MISC_FAM]
+.             ft  \\*[$COVER_MISC_FT]
+.             PT_SIZE \\*[$COVER_MISC_PT_SIZE]
+.          \}
 .          ie !'\\*[$MISC_COVER_1]'' \{\
 .             nr #MISCS \\n[#MISC_COVER_NUM]
-.             sp -\\n[#MISCS]+1
+.             sp -\\n[#MISCS]
 .             nr #NEXT_MISC 0 1
 .             while \\n[#MISCS]>\\n[#NEXT_MISC] \{\
 .                ie \\n[#COVER_MISC_COLOR]=1 \{\
@@ -7382,7 +7394,7 @@
 .          \}
 .          el \{\
 .             nr #MISCS \\n[#MISC_NUM]
-.             sp -\\n[#MISCS]+1
+.             sp -\\n[#MISCS]
 .             nr #NEXT_MISC 0 1
 .             while \\n[#MISCS]>\\n[#NEXT_MISC] \{\
 .                ie \\n[#COVER_MISC_COLOR]=1 \{\
@@ -7396,7 +7408,6 @@
 .\}
 .          \}
 .       \}
-.       if \\n[#COVERS_COUNT]=1 \{ .nr #PAGE_NUM_ADJ +1 \}
 .       nr #COVER_END 1
 .       END_COVER
 .    \}
@@ -7455,7 +7466,7 @@
 \# Macro to begin document processing
 \#
 .MAC START END
-.    nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap'
+.    if !n \{ .nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap' \}
 .    if !\\n[#PRINT_STYLE] \{\
 .       PRINTSTYLE TYPEWRITE
 .       PRINT \&
@@ -7559,9 +7570,9 @@
 .       ev TOC_EV
 .       da TOC_ENTRIES
 .       if \\n[#PRINT_STYLE]=1 \{\
-\!.        fam C
+\!.        fam \\*[$TYPEWRITER_FAM]
 \!.        ft  R
-\!.        ps  12
+\!.        ps  \\*[$TYPEWRITER_PS]
 .       \}
 .       if \\n[#PRINT_STYLE]=2 \{\
 \!.        FAMILY  \\*[$TOC_TITLE_FAM]
@@ -7843,48 +7854,10 @@
 \#
 .MAC CLEANUP_DEFAULTS END
 .    nr #START 1
-.\" Family strings for docheader
-.    rm $AUTHOR_FAM
-.    rm $CHAPTER_TITLE_FAM
-.    rm $DOCTYPE_FAM
-.    rm $SUBTITLE_FAM
-.    rm $TITLE_FAM
-.\" Family strings for cover
-.    rm $COVER_AUTHOR_FAM
-.    rm $COVER_CHAPTER_TITLE_FAM
-.    rm $COVER_COPYRIGHT_FAM
-.    rm $COVER_DOCTYPE_FAM
-.    rm $COVER_LEAD_ADJ
-.    rm $COVER_SUBTITLE_FAM
-.    rm $COVER_TITLE_FAM
-.\" Family strings for doc cover
-.    rm $DOC_COVER_AUTHOR_FAM
-.    rm $DOC_COVER_CHAPTER_TITLE_FAM
-.    rm $DOC_COVER_COPYRIGHT_FAM
-.    rm $DOC_COVER_DOCTYPE_FAM
-.    rm $DOC_COVER_LEAD_ADJ
-.    rm $DOC_COVER_SUBTITLE_FAM
-.    rm $DOC_COVER_TITLE_FAM
-.\" Quad args to copyright and misc
-.    rm $COVER_COPYRIGHT_QUAD
-.    rm $COVER_MISC_QUAD
-.    rm $DOC_COVER_COPYRIGHT_QUAD
-.    rm $DOC_COVER_MISC_QUAD
-.\" Miscellaneous strings
 .    rm $TOC_TITLE_ITEM
 .    rm $DOCHEADER_LEAD_ADJ
 .\" Various registers
-.    rr #ADJ_DOC_LEAD
-.    rr #ADVANCE_FROM_TOP
-.    rr #COVER_LEAD
-.    rr #DEPTH_1
-.    rr #DEPTH_2
-.    rr #DOC_COVER_LEAD
 .    if \\n[#DOC_HEADER]=1 \{ .nr #DOC_HEADER 2 \}
-.    rr #DOCHEADER_ADVANCE
-.    rr #DOCHEADER_EXTRA_SPACE
-.    rr #DOCHEADER_LEAD
-.    rr #DOCHEADER_SPACE_ADJ
 .    rr #MISC_NUM
 .    rr #MISCS
 .    rr #NEXT_AUTHOR
@@ -8234,9 +8207,7 @@
 \#   Default is "END".
 \#
 .MAC FINIS_STRING END
-\#.    if \\n[#FINIS_STRING_CAPS]=1 \{ .CAPS \}
 .    ds $FINIS_STRING \\$1
-\#.    if \\n[#FINIS_STRING_CAPS]=1 \{ .CAPS OFF \}
 .END
 \#
 .MAC FINIS_STRING_CAPS END
@@ -8356,12 +8327,12 @@
 .       \}
 .       CENTER
 .       if \\n[#PRINT_STYLE]=1 \{\
-.          fam C
+.          fam \\*[$TYPEWRITER_FAM]
 .          ft  R
 .          if '\\*[$EPI_FT]'I' \{\
 .             FT I
 .          \}
-.          ps  12
+.          ps  \\*[$TYPEWRITER_PS]
 .          ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u \}
 .          el \{ .vs  \\n[#DOC_LEAD]u/2u \}
 .          nr #EPI_LEAD      \\n[#LEAD]
@@ -8430,12 +8401,12 @@
 .             CHECK_INDENT
 .          \}
 .          if \\n[#PRINT_STYLE]=1 \{\
-.             fam C
+.             fam \\*[$TYPEWRITER_FAM]
 .             ft  R
 .             if '\\*[$EPI_FT]'I' \{\
 .                FT I
 .             \}
-.             ps  12
+.             ps  \\*[$TYPEWRITER_PS]
 .             ie \\n[#SINGLE_SPACE] \{ .vs \\n[#DOC_LEAD]u \}
 .             el \{ .vs  \\n[#DOC_LEAD]u/2u \}
 .             QUAD LEFT
@@ -9026,7 +8997,6 @@
 .       \}
 .    \}
 .    if '\\$0'HEADER_RULE' \{\
-.       nr #HEADERS_ON  1
 .       ie '\\$1'' \{\
 .          nr #HEADER_RULE 1
 .          nr #HDRFTR_RULE 1
@@ -9037,7 +9007,6 @@
 .       \}
 .    \}
 .    if '\\$0'FOOTER_RULE' \{\
-.       nr #FOOTERS_ON  1
 .       ie '\\$1'' \{\
 .          nr #FOOTER_RULE 1
 .          nr #HDRFTR_RULE 1
@@ -9137,8 +9106,13 @@
 .    if '\\$1'R'      \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 3 \}
 .    if '\\$1'RIGHT'  \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 3 \}
 .    shift
-.    if '\\$1'CAPS' \{ .nr #HDRFTR_RECTO_CAPS 1 \}
-.    ds $USERDEF_HDRFTR_RECTO \\$2
+.    ie '\\$1'CAPS' \{\
+.       nr #HDRFTR_RECTO_CAPS 1
+.       ds $USERDEF_HDRFTR_RECTO \\$2
+.    \}
+.    el \{\
+.       ds $USERDEF_HDRFTR_RECTO \\$1
+.    \}
 .END
 \#
 \#
@@ -9164,8 +9138,13 @@
 .    if '\\$1'R'      \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 3 \}
 .    if '\\$1'RIGHT'  \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 3 \}
 .    shift
-.    if '\\$1'CAPS' \{ .nr #HDRFTR_VERSO_CAPS 1 \}
-.    ds $USERDEF_HDRFTR_VERSO \\$2
+.    ie '\\$1'CAPS' \{\
+.       nr #HDRFTR_VERSO_CAPS 1
+.       ds $USERDEF_HDRFTR_VERSO \\$2
+.    \}
+.   el \{\
+.      ds $USERDEF_HDRFTR_VERSO \\$1
+.   \}
 .END
 \#
 \# PRINT FOOTER ON FIRST PAGE
@@ -9601,9 +9580,9 @@
 .    ll \\n[#DOC_L_LENGTH]u
 .    ta \\n(.lu
 .    if \\n[#PRINT_STYLE]=1 \{\
-.       fam C
+.       fam \\*[$TYPEWRITER_FAM]
 .       ft  R
-.       ps  12\\*[$HDRFTR_SIZE_CHANGE]
+.       ps  \\*[$TYPEWRITER_PS]\\*[$HDRFTR_SIZE_CHANGE]
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 .      fam \\*[$HDRFTR_FAM]
@@ -9616,10 +9595,6 @@
 .       nr #CAPS_WAS_ON 1
 .       CAPS OFF
 .    \}
-.    if \\n[#UNDERLINE_ON] \{\
-.       nr #UNDERLINE_WAS_ON 1
-.       UNDERLINE OFF
-.    \}
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       if \\n[#ENDNOTES]=1 \{\
 .\" Single-spaced endotes have a different lead
@@ -9629,7 +9604,7 @@
 .          \}
 .       \}
 .    \}
-.    nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap'
+.    if !n \{ .nop \X'ps: exec 0 setlinejoin'\X'ps: exec 0 setlinecap' \}
 .    RLD 1v
 .    ie \\n[#HEADERS_ON] \{\
 .       PRINT_HDRFTR
@@ -9663,10 +9638,6 @@
 .       CAPS
 .       rr #CAPS_WAS_ON
 .    \}
-.    if \\n[#UNDERLINE_WAS_ON] \{\
-.       UNDERLINE
-.       rr #UNDERLINE_WAS_ON
-.    \}
 .    if \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \}
 .    if \\n[#QUOTE] \{\
 .       ie \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \}
@@ -9679,7 +9650,7 @@
 .          \}
 .          po \\n[#Q_OFFSET]u
 .       \}
-.       if \\n[#PRINTSTYLE]=2 \{ .ALD \\n[#Q_LEAD_DIFF]u \}
+.       if \\n[#PRINT_STYLE]=2 \{ .ALD \\n[#Q_LEAD_DIFF]u \}
 .    \}
 .    if \\n[#EPIGRAPH] \{\
 .       ie \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \}
@@ -9747,14 +9718,6 @@
 .       rm FN_IN_DIVER
 .       if dRUNON_FN_IN_DIVER \{ .rm RUNON_FN_IN_DIVER \}
 .    \}
-.    if \\n[#PRINT_STYLE]=1 \{\
-.       if \\n[#SLANT_ON] \{\
-.          if \\n[#UNDERLINE_SLANT] \{ .UNDERLINE \}
-.       \}
-.       if \\n[#UNDERLINE_ON]=1 \{\
-.          if \\n[#UNDERLINE_ITALIC] \{ .UNDERLINE \}
-.       \}
-.    \}
 .    rr #FROM_HEADER
 .    rr #DEFER_SPACE_ADDED
 .    if !\\n[#FN_DEPTH] \{\
@@ -9779,6 +9742,21 @@
 .    rr #MN_OVERFLOW_RIGHT
 .    rr #no-repeat-MN-right
 .    if \\n[#PRE_COLLATE]=1 \{ .rr #PRE_COLLATE \}
+.    if \\n[#UNDERLINE_WAS_ON]=1 \{\
+.       vs 0
+.       ie !n \{\
+.          nop \R'#UNDERLINE_ON 1'\X'ps: exec \\n[_w] \\n[_d] decorline' \}
+.       \}
+.       el \{\
+.          ul 1000
+.       \}
+.          rr #UNDERLINE_WAS_ON
+.       br
+.    \}
+.   if \\n[#RESTORE_PAGINATION] \{\
+.      PAGINATE
+.      rr #RESTORE_PAGINATION
+.   \}
 .END
 \#
 \# ====================================================================
@@ -9852,7 +9830,14 @@
 \#   FINAL respects PAGENUMBER.
 \#
 .MAC FOOTER END
+.    nr #SAVED_LEAD \\n(.v
 .    ev PAGE_TRANSITION
+.    ie !n \{ .nop \X'ps: exec decornone' \}
+.    el \{ .ul 0 \}
+.    br
+.    if \\n[#UNDERLINE_ON]=1 \{\
+.       nr #UNDERLINE_WAS_ON 1
+.    \}
 .    if \\n[MN-left]>0 \{\
 .       if !\\n[#no-repeat-MN-left]=1 \{\
 .          MNbottom-left
@@ -9877,7 +9862,6 @@
 .       \}
 .    \}
 .    ch MN_OVERFLOW_TRAP
-.    nr #SAVED_LEAD \\n(.v
 .    nr #L_MARGIN_DIFF \\n[#L_MARGIN]-\\n[#DOC_L_MARGIN]
 .    if !\\n[#FN_DEFER] \{\
 .       nr #DIVER_DEPTH 0
@@ -9895,7 +9879,7 @@
 .          nf
 .          FOOTNOTES
 .          rm FOOTNOTES
-.          if dRUNON_FOOTNOTES \{ .rm RUNON_FOOTNOTES \}
+.          if d RUNON_FOOTNOTES \{ .rm RUNON_FOOTNOTES \}
 .          if \\n[#PRINT_STYLE]=1 \{ .vs \\n[#SAVED_LEAD]u \}
 .          if \\n[#PRINT_STYLE]=2 \{ .LS \\n[#SAVED_LEAD]u \}
 .          if '\\n(.z'FN_OVERFLOW' \{\
@@ -9993,7 +9977,9 @@
 .       ns
 .       rr #DIVERTED
 .    \}
-.    el \{ .DO_FOOTER \}
+.    el \{\
+.       DO_FOOTER
+.    \}
 .END
 \#
 \#
@@ -10006,21 +9992,37 @@
 \#   Resets CAPS and UNDERLINE if they were on.
 \#
 .MAC DO_FOOTER END
+.\" Part of workaround for refer spitting out a blank page if the
+.\" last reference falls on the bottom line.
+.    if \\n[num*refs] \{\
+.       if \\n[ref*num]=\\n[num*refs] \{\
+.          PRINT_FOOTER
+.          return
+.       \}
+.    \}
+.    PRINT_FOOTER
+.    bp
+.\" .bp springs the header trap; this pops the PAGE_TRANSITION ev
+.    ev
+.END
+\#
+.MAC PRINT_FOOTER END
 .\" Have to change position of FN_OVERFLOW_TRAP or it screws up the
 .\" placement of page numbers (or footers).  It's reset to its original
 .\" position at the end of the macro.
 .    if r#SAVED_FOOTER_POS \{ .ch FOOTER \\n[#SAVED_FOOTER_POS]u \}
 .    rr #SAVED_FOOTER_POS
-.    ie (\\n[#FOOTER_MARGIN]+\\n(.v)>\\n[#B_MARGIN] \{\
+.    ie (\\n[#FOOTER_MARGIN]+\\n[.v]>\\n[#B_MARGIN] \{\
 .       nr #SKIP_FOOTER 1
 .    \}
 .    el \{\
+.       ev FOOTER
 .       vpt 0
+.       vs  12
 .       sp |\\n[#PAGE_LENGTH]u-\\n[#FOOTER_MARGIN]u-1v
 .       mk y
-.       vpt 1
 .    \}
-.    ev FOOTER
+.    UNDERLINE OFF
 .    po \\n[#DOC_L_MARGIN]u
 .    ll \\n[#DOC_L_LENGTH]u
 .    ta \\n(.lu
@@ -10032,16 +10034,11 @@
 .       ft      R
 .       ps \\n[#DOC_PT_SIZE]u\\*[$HDRFTR_SIZE_CHANGE]
 .    \}
-.    vs \\n[#SAVED_LEAD]u
 .    nr #HDRFTR_PT_SIZE \\n[#PT_SIZE]
 .    if \\n[#CAPS_ON] \{\
 .       nr #CAPS_WAS_ON 1
 .       CAPS OFF
 .    \}
-.    if \\n[#UNDERLINE_ON] \{\
-.       nr #UNDERLINE_WAS_ON 1
-.       UNDERLINE OFF
-.    \}
 .    ie \\n[#FOOTERS_ON] \{\
 .       if !\\n[#SKIP_FOOTER]=1 \{ .PRINT_HDRFTR \}
 .    \}
@@ -10057,16 +10054,9 @@
 .       CAPS
 .       rr #CAPS_WAS_ON
 .    \}
-.    if \\n[#UNDERLINE_WAS_ON] \{\
-.       UNDERLINE
-.       rr #UNDERLINE_WAS_ON
-.    \}
 .    ev
 .    rr #SAVED_LEAD
-.    bp
-.\" This ev pops the PAGE_TRANSITION environment still active at the
-.\" end of HEADER
-.    ev
+.    vpt 1
 .END
 \#
 \# ====================================================================
@@ -10129,13 +10119,13 @@
 .   if \\\\n[#HDRFTR_BOTH]=1 \{\
 .      if \\n[#FOOTERS_ON]=1 \{\
 .         if !\\\\n[#COLLATE]=1 \{\
-.         HEADER_RECTO \\*[$HDR_RECTO_QUAD] "\\*[$HDR_RECTO_STRING]"
-.         HEADER_VERSO \\*[$HDR_VERSO_QUAD] "\\*[$HDR_VERSO_STRING]"
-.         rr #FOOTERS_ON
-.         nr #HEADERS_ON 1
-.         ie \\\\n[#HEADER_RULE]=1 \{ .HEADER_RULE \}
-.         el \{ .HEADER_RULE OFF \}
-.      \}
+.            HEADER_RECTO \\*[$HDR_RECTO_QUAD] "\\*[$HDR_RECTO_STRING]"
+.            HEADER_VERSO \\*[$HDR_VERSO_QUAD] "\\*[$HDR_VERSO_STRING]"
+.            rr #FOOTERS_ON
+.            nr #HEADERS_ON 1
+.            ie \\\\n[#HEADER_RULE]=1 \{ .HEADER_RULE \}
+.            el \{ .HEADER_RULE OFF \}
+.         \}
 .      \}
 .      if \\n[#HEADERS_ON]=1 \{\
 .         FOOTER_RECTO \\*[$FTR_RECTO_QUAD] "\\*[$FTR_RECTO_STRING]"
@@ -10396,6 +10386,7 @@
 \#   each line of text.
 \#
 .MAC HEAD END
+.    if \\n[#UNDERLINE_ON]=1 .UNDERLINE OFF
 .    br
 .    if \\n[#PRINT_STYLE]=1 \{ .ne \\n[#NUM_ARGS]+2 \}
 .    if \\n[#PRINT_STYLE]=2 \{\
@@ -10433,9 +10424,9 @@
 .    ev TOC_EV
 .    da TOC_ENTRIES
 .    if \\n[#PRINT_STYLE]=1 \{\
-\!.     fam C
+\!.     fam \\*[$TYPEWRITER_FAM]
 \!.     ft  R
-\!.     ps  12
+\!.     ps  \\*[$TYPEWRITER_PS]
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 \!.     FAMILY  \\*[$TOC_HEAD_FAM]
@@ -10482,7 +10473,6 @@
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       TYPEWRITER
 .       vs  \\n[#DOC_LEAD]u
-.       UNDERLINE OFF
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 .       FAMILY  \\*[$HEAD_FAM]
@@ -10628,6 +10618,7 @@
 \#   each line of text.
 \#
 .MAC SUBHEAD END
+.    if \\n[#UNDERLINE_ON]=1 .UNDERLINE OFF
 .    br
 .    ne \\n[#NUM_ARGS]+2
 .\" Collect subhead for TOC.
@@ -10660,9 +10651,9 @@
 .    ev TOC_EV
 .    da TOC_ENTRIES
 .    if \\n[#PRINT_STYLE]=1 \{\
-\!.     fam C
+\!.     fam \\*[$TYPEWRITER_FAM]
 \!.     ft  R
-\!.     ps  12
+\!.     ps  \\*[$TYPEWRITER_PS]
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 \!.     FAMILY  \\*[$TOC_SH_FAM]
@@ -10711,7 +10702,6 @@
 .       TYPEWRITER
 .       vs  \\n[#DOC_LEAD]u
 .       QUAD   \\*[$SH_QUAD]
-.       UNDERLINE OFF
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 .       FAMILY  \\*[$SH_FAM]
@@ -10882,6 +10872,19 @@
 .    nr #PH_INDENT (\\$1)
 .END
 \#
+\# PARAHEAD SPACE
+\# --------------
+\# *Argument:
+\#   <amount of horizontal space between parahead and paragraph text>
+\# *Function:
+\#   Creates or modifies string $PH_SPACE.
+\# *Notes:
+\#   Default is .6m for TYPESET and \0 (1 digit space) for TYPEWRITE.
+\#
+.MAC PARAHEAD_SPACE END
+.    ds $PH_SPACE \\$1
+.END
+\#
 \#
 \# PARAHEAD
 \# --------
@@ -10894,6 +10897,7 @@
 \#   PARAHEAD *must* come after PP.
 \#
 .MAC PARAHEAD END
+.    if \\n[#UNDERLINE_ON]=1 .UNDERLINE OFF
 .\" Collect parahead for TOC.
 .    nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ]
 .    ie \\n[#NUMBER_PH] \{\
@@ -10906,9 +10910,9 @@
 .    ev TOC_EV
 .    da TOC_ENTRIES
 .    if \\n[#PRINT_STYLE]=1 \{\
-\!.       fam C
+\!.       fam \\*[$TYPEWRITER_FAM]
 \!.       ft  R
-\!.       ps  12
+\!.       ps  \\*[$TYPEWRITER_PS]
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 \!.     FAMILY  \\*[$TOC_PH_FAM]
@@ -10948,10 +10952,18 @@
 .    \}
 .    ie \\n[#PP]=1 \{\
 .       if \\n[#INDENT_FIRST_PARAS] \{\
+.          vpt 0
+.          if \\n[#PRINT_STYLE]=1 \{ .sp -1v \}
 .          ti \\n[#PH_INDENT]u
+.          vpt
 .       \}
 .    \}
-.    el \{ .ti \\n[#PH_INDENT]u \}
+.    el \{\
+.       vpt 0
+.       if \\n[#PRINT_STYLE]=1 \{ .sp -1v \}
+.       ti \\n[#PH_INDENT]u
+.       vpt
+.    \}
 .    ie \\n[#PREFIX_CH_NUM]=1 \{\
 .       ds $CH_NUM \\n[#CH_NUM].
 .    \}
@@ -10960,7 +10972,6 @@
 .    \}
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       TYPEWRITER
-.       UNDERLINE OFF
 .       ie \\n[#NUMBER_PH] \{\
 .          if \\n[#NUMBER_HEAD] \{\
 .             ie \\n[#NUMBER_SH] \{\
@@ -11000,7 +11011,7 @@
 .    if \\n[#PRINT_STYLE]=2 \{\
 .       FAM     \\*[$PH_FAM]
 .       FT      \\*[$PH_FT]
-.       PT_SIZE \\*[$PH_SIZE_CHANGE]
+.       PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$PH_SIZE_CHANGE]
 .       if \\n[#PH_COLOR]=1 \{ .COLOR \\*[$PH_COLOR] \}
 .          ie \\n[#NUMBER_PH] \{\
 .             ie \\n[#PREFIX_CH_NUM]=1 \{\
@@ -11011,25 +11022,25 @@
 .             \}
 .             if \\n[#NUMBER_HEAD] \{\
 .                ie \\n[#NUMBER_SH] \{\
-.                   PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'.6m'\c"
+.                   PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c"
 .                \}
 .                el \{\
-.                   PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#PH_NUM].\0\\$1\h'.6m'\c"
+.                   PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c"
 .                \}
 .             \}
 .             ie \\n[#NUMBER_SH] \{\
 .                if !\\n[#NUMBERED] \{\
-.                   PRINT "\\*[$CH_NUM]\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'.6m'\c"
+.                   PRINT "\\*[$CH_NUM]\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c"
 .                \}
 .             \}
 .             el \{\
 .                if !\\n[#NUMBERED] \{\
-.                   PRINT "\\*[$CH_NUM]\\n+[#PH_NUM].\0\\$1\h'.6m'\c"
+.                   PRINT "\\*[$CH_NUM]\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c"
 .                \}
 .             \}
 .          \}
 .          el \{\
-.             PRINT "\\$1\h'.6m'\c"
+.             PRINT "\\$1\h'\\*[$PH_SPACE]'\c"
 .          \}
 .       \}
 .    FAMILY  \\*[$DOC_FAM]
@@ -11128,11 +11139,10 @@
 \#   Affects all paragraphs.
 \#
 .MAC PP_FONT END
-.    if \n[#PRINT_STYLE]=1 \{\
-.       ie \n[#ITALIC_MEANS_ITALIC] \{ .nop \}
+.    if \\n[#PRINT_STYLE]=1 \{\
+.       ie \\n[#ITALIC_MEANS_ITALIC] \{ .nop \}
 .       el \{ .return \}
 .    \}
-.    br
 .    if \\n[#COLLATE]=1 \{\
 .       if !'\\*[$SAVED_PP_FT]'' \{ .rm $SAVED_PP_FT \}
 .    \}
@@ -11254,7 +11264,6 @@
 .          ie \\n[#ENDNOTE] \{ .vs \\n[#EN_LEAD]u \}
 .          el \{ .vs \\n[#DOC_LEAD]u \}
 .          QUAD \\*[$DOC_QUAD]
-.          UNDERLINE OFF
 .          if \\n[#SLANT_ON] \{\
 .             if \\n[#UNDERLINE_SLANT] \{ .UNDERLINE \}
 .          \}
@@ -11376,13 +11385,14 @@
 .       \}
 .    nr #Q_PP +1
 .    \}
-\# This takes care of multi-paragraph dialogue, where each para
-\# is introduced by an open quote whereas the previous para has
-\# no close quote.
+.\" This takes care of multi-paragraph dialogue, where each para
+.\" is introduced by an open quote whereas the previous para has
+.\" no close quote.
 .    if \\n[#OPEN_CLOSE]=1 \{\
 .       nr #OPEN_CLOSE 0
 .    \}
 .    nr #PP_ACTIVE 1
+.    UNDERLINE OFF
 .END
 \#
 \# ====================================================================
@@ -11581,47 +11591,68 @@
 \# *Arguments:
 \#   <none [ BR | BREAK | SPREAD ]> | <anything [ BR | BREAK | SPREAD ]>
 \# *Function:
-\#   Takes care of admistrivia associated with setting code snippets.
+\#   Takes care of administrivia associated with setting code snippets.
 \#
 .MAC CODE END
 \c
 .    if '\\$1'BR' \{\
 .       br
 .       shift
-.     \}
+.    \}
 .    if '\\$1'BREAK' \{\
 .       br
 .       shift
-.     \}
+.    \}
 .    if '\\$1'SPREAD' \{\
 .       brp
 .       shift
-.     \}
+.    \}
 .    ie '\\$1'' \{\
-.       ds $PRE_CODE_FAM \\n[.fam]
-.       ds $PRE_CODE_FT \\n[.sty]
-.       if !\\n[#PRINT_STYLE]=1 \{\
-.          ie \\n[#CODE_FAM]=1 \{ .fam \\*[$CODE_FAM] \}
-.          el \{ .fam C \}
-.       \}
-.       ft  R
-.       if \\n[#UNDERLINE_QUOTES]=1 \{\
-.           nr #RESTORE_UNDERLINE 1
-.           UNDERLINE_QUOTES OFF
-.           FT R
-.       \}
-.       if \\n[#PRINT_STYLE]=2 \{\
-.          tr `'
+.       ie \\n[#PRINT_STYLE]=1 \{\
+.          CODE_FAMILY C
+.          ie \\n[#CODE_FT]=1 \{ .ft \\*[$CODE_FT] \}
+.          el \{\
+.             CODE_FONT R
+.             ft R
+.             char ' \[aq]
+.          \}
+.          if \\n[#UNDERLINE_QUOTES]=1 \{\
+.             nr #RESTORE_UNDERLINE 1
+.             UNDERLINE_QUOTES OFF
+.             FT \\*[$CODE_FT]
+.             char ' \[aq]
+.          \}
 .       \}
-.       if \\n[#RESTORE_SQ]=1 \{\
-.          nr #SQ_WAS_ON 1
-.          SMARTQUOTES OFF
+.       el \{\
+.          ie \\n[#CODE_FAM]=1 \{ .fam \\*[$CODE_FAM] \}
+.          el \{\
+.             CODE_FAMILY C
+.             fam \\*[$CODE_FAM]
+.          \}
+.          ie \\n[#CODE_FT]=1 \{ .ft \\*[$CODE_FT] \}
+.          el \{\
+.             CODE_FONT R
+.             ft \\*[CODE_FT]
+.          \}
+.          if \\n[#CODE_COLOR]=1 \{\
+.             COLOR \\*[$CODE_COLOR]
+.          \}
+.          char ' \[aq]
+.          if !\\n[#CODE_SIZE_ADJ]=0 \{\
+.          ps \\n[#PT_SIZE]u*\\n[#CODE_SIZE_ADJ]u/100u
+.          \}
+.          if \\n[#RESTORE_SQ]=1 \{\
+.             nr #SQ_WAS_ON 1
+.             SMARTQUOTES OFF
+.          \}
 .       \}
 .    \}
 .    el \{\
-.       fam \\*[$PRE_CODE_FAM]
-.       ft  \\*[$PRE_CODE_FT]
-.       rr $RESTORE_FT
+.       fam
+.       ft
+.       ps
+.       rchar '
+.       gcolor
 .       if \\n[#RESTORE_UNDERLINE]=1 \{\
 .          rr #RESTORE_UNDERLINE
 .          UNDERLINE_QUOTES
@@ -11630,9 +11661,7 @@
 .          rr #SQ_WAS_ON
 .          SMARTQUOTES
 .       \}
-.       if \\n[#PRINT_STYLE]=2 \{\
-.          tr ``
-.       \}
+.       if \\n[#QUOTE] \{ .RLD 1v \}
 .    \}
 .    if \\n[#NUM_ARGS]=2 \{\
 .       if '\\$2'BR'     \{ .br  \}
@@ -11653,6 +11682,30 @@
 .    ds $CODE_FAM \\$1
 .END
 \#
+\# CODE_FONT
+\# ---------
+\# *Arguments:
+\#   <font>
+\# *Function:
+\#   Creates register #CODE_FT and string $CODE_FT for use by CODE.
+\#
+.MAC CODE_FONT END
+.    nr #CODE_FT 1
+.    ds $CODE_FT \\$1
+.END
+\#
+\# CODE_SIZE
+\# ---------
+\# *Arguments:
+\#   <percentage to zoom code font>
+\# *Function:
+\#   Creates register #CODE_SIZE_ADJ, used in CODE to zoom the
+\#   CODE_FONT to a percentage of the current point size.
+\#
+.MAC CODE_SIZE END
+. nr #CODE_SIZE_ADJ \\$1
+.END
+\#
 \#
 \# ---Blockquotes---
 \#
@@ -11669,7 +11722,7 @@
 \#   how much space to put before and after.
 \#
 \#   .PP after blockquote is optional if there's only one para,
-\#   but REQUIRED if there's more than one.
+\#   but required if there's more than one.
 \#
 .MAC BLOCKQUOTE END
 .    br
@@ -11909,6 +11962,12 @@
 .       nf
 .       B_QUOTE
 .    \}
+.    if \\n[#UNDERLINE_ON] \{\
+.       vpt 0
+.       sp -1v
+.       UNDERLINE OFF
+.       vpt
+.    \}
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       ALD \\n[#DOC_LEAD]u
 .       if !\\n[.v]=\\n[#DOC_LEAD] \{ .SHIM \}
@@ -11986,17 +12045,9 @@
 .       \}
 .    \}
 .    ie !\\n[#ENDNOTE] \{\
-.       nr #RESET_PP_INDENT \\n[#PP_INDENT]
-.       PARA_INDENT 0
-.       PP
-.       PARA_INDENT \\n[#RESET_PP_INDENT]u
 .       QUAD \\*[$DOC_QUAD]
 .    \}
 .    el \{\
-.       nr #RESET_EN_PP_INDENT \\n[#EN_PP_INDENT]
-.       ENDNOTE_PARA_INDENT 0
-.       PP
-.       ENDNOTE_PARA_INDENT \\n[#RESET_EN_PP_INDENT]u
 .       QUAD \\*[EN_QUAD]
 .    \}
 .    if r#DELAY_SHIM \{\
@@ -12159,7 +12210,9 @@
 .    nr #END_QUOTE 1
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       if \\n[#UNDERLINE_QUOTES] \{\
+.          ev 1
 .          UNDERLINE OFF
+.          ev
 .       \}
 .    \}
 .    po \\n[#L_MARGIN]u
@@ -12484,6 +12537,8 @@
 .          return
 .       \}
 .       nr #FN_MARKER_STYLE 2
+.       shift
+.       if '\\$1'NO_SUPERSCRIPT' \{ .nr #NO_SUPERSCRIPT 1 \}
 .       if \\n[#NEWPAGE]=1 \{ .rr #NEWPAGE \}
 .       FOOTNOTE_MARKERS
 .    \}
@@ -12497,13 +12552,29 @@
 .END
 \#
 \#
+\# FOOTNOTE NUMBER PLACEHOLDERS
+\# ----------------------------
+\# *Argument:
+\#   <number of placeholders>
+\# *Function:
+\#   Sets register #FN_NUMBER_PLACEHOLDERS, used to establish whether to
+\#   right pad a footnote number (in the footnote itself, not body copy).
+\# *Notes:
+\#   No default is set for this; user must determine if, and where, it's
+\#   required
+\#
+.MAC FOOTNOTE_NUMBER_PLACEHOLDERS END
+.    nr #FN_NUMBER_PLACEHOLDERS \\$1
+.END
+\#   
+\#   
 \# FOOTNOTE LINENUMBER MARK
 \# ------------------------
 \# *Function:
 \#   This string, when called inline, stores the current output line
 \#   number in register #FN_MARK for use with FOOTNOTE.
 \#
-.ds FN-MARK \R'#FN_MARK \En(ln'
+.ds FN_MARK \R'#FN_MARK \En(ln'
 \#
 \#
 \# FOOTNOTE LINENUMBER SEPARATOR
@@ -12652,8 +12723,8 @@
 \#   Default is no space.
 \#
 .MAC FOOTNOTE_SPACING END
-.    ie \B'\\$1' \{ .nr #FN_SPACE (\\$1) \}
-.    el \{ .nr #FN_SPACE 0 \}
+.    ie \B'\\$1' .ds $FN_SPACE \\$1
+.    el \{ .rm $FN_SPACE \}
 .END
 \#
 \#
@@ -12728,6 +12799,10 @@
 \#
 .MAC FOOTNOTE END
 .    ie '\\$1'' \{\
+.       if \\n[#UNDERLINE_ON] \{\
+.          UNDERLINE OFF
+.          nr #UNDERLINE_WAS_ON_FN 1
+.       \}
 .       if \\n[#FN_MARKER_STYLE]=3 \{\
 .          if !\\n[#LINENUMBERS] \{\
 .             tm1 "[mom]: Line numbering must be enabled with NUMBER_LINES when
@@ -12841,12 +12916,6 @@
 .\" Housekeeping
 .          if \\n[#CONDENSE] \{ \*[CONDX]\c \}
 .          if \\n[#EXTEND]   \{ \*[EXTX]\c  \}
-.          if \\n[#PRINT_STYLE]=1 \{\
-.             if \\n[#UNDERLINE_ON] \{\
-.                nr #UNDERLINE_WAS_ON 1
-.                UNDERLINE OFF
-.             \}
-.          \}
 .\" Add footnote markers to running text...
 .          if !\\n[#NO_FN_MARKER] \{\
 .\" ...but not if TERMINATE has not been called
@@ -13012,30 +13081,36 @@
 .          if !\\n[#DONT_RULE_ME]=1 \{\
 .             if !\\n[#FN_DEPTH] \{\
 .                if \\n[#PRINT_STYLE]=1 \{\
-.                   if !\\n[#RUN_ON] \{ .ALD \\n[#DOC_LEAD]u \}
+.                   if !\\n[#RUN_ON] \{ .sp \\n[#DOC_LEAD]u \}
 .                \}
 .                ie \\n[#FN_RULE]=1 \{\
-.                   if !\\n[#RUN_ON] \{ .PRINT_FOOTNOTE_RULE \}
+.                   if !\\n[#RUN_ON] \{\
+.                      if \\n[#SINGLE_SPACE] \{ .sp \\n[#DOC_LEAD]u \}
+.                      PRINT_FOOTNOTE_RULE
+.                      if !'\\*[$FN_SPACE]'' \{ .sp -\\*[$FN_SPACE] \}
+.                   \}
 .                \}
-.                el \{ .ALD 1v \}
+.                el \{ .sp 1v \}
 .                nr #RULED 1
 .             \}
 .          \}
 .       \}
 .       rr #DONT_RULE_ME
+.       ds $RESTORE_SS_VAR \\*[$SS_VAR]
+.       SS 0
 .\" Add footnote markers to footnote text...
 .       ie \\n[#FN_MARKERS] \{\
-.          if \\n[#FN_SPACE]>0 \{\
+.          if !'\\*[$FN_SPACE]'' \{\
 .             if \\n[#FN_COUNT]>0 \{\
-.                ALD \\n[#FN_SPACE]u
+.                ALD \\*[$FN_SPACE]
 .             \}
 .          \}
 .          if !\\n[#NO_FN_MARKER] \{\
 .\" ...but not if TERMINATE has been called.
 .             if !r#TERMINATE \{\
 .                if \\n[#REF]=1 \{\
-\!.                 in +\\*[$REF_FN_INDENT]
-\!.                 ti -\\*[$REF_FN_INDENT]
+.                   nr #REF_FN_INDENT (u;\\*[$REF_FN_INDENT])
+.                   ti \\n[#REF_FN_INDENT]u
 .                \}
 .                if \\n[#FN_MARKER_STYLE]=1 \{\
 .                   ie \\n[#COLUMNS]=1 \{\
@@ -13065,6 +13140,8 @@
 .                   \}
 .                \}
 .                if \\n[#FN_MARKER_STYLE]=2 \{\
+.                   ds $FN_NUMBER \\n[#FN_NUMBER]
+.                   length #FN_NUMBER_LENGTH \\*[$FN_NUMBER]
 .                   if \\n[#COLUMNS]=1 \{\
 .                      \\n+[#FN_COUNT_FOR_COLS]
 .                   \}
@@ -13072,8 +13149,32 @@
 .                      nr #FN_NUMBER 1 1
 .                      rr #NOT_YET_ADJUSTED
 .                   \}
-.                   if \\n[#PRINT_STYLE]=1 \{ .PRINT "(\\n[#FN_NUMBER])\c" \}
-.                   if \\n[#PRINT_STYLE]=2 \{ .PRINT "\*[SUP]\\n[#FN_NUMBER]\*[SUPX]\*[FU 2]\c" \}
+.                   if \\n[#PRINT_STYLE]=1 \{\
+.                      ie \\n[#NO_SUPERSCRIPT] \{\
+.                         ie \\n[#FN_NUMBER_LENGTH]<\\n[#FN_NUMBER_PLACEHOLDERS] \{\
+.                            PRINT "\0(\\n[#FN_NUMBER])\|\c"
+.                         \}
+.                         el \{\
+.                            PRINT "(\\n[#FN_NUMBER])\|\c"
+.                         \}
+.                      \}
+.                      el \{\
+.                         ie \\n[#FN_NUMBER_LENGTH]<\\n[#FN_NUMBER_PLACEHOLDERS] \{\
+.                            PRINT "\s-2\v'-\\n[.v]u/5u'\0\\n[#FN_NUMBER]\|\v'+\\n[.v]u/5u'\s+2\|\c"
+.                         \}
+.                         el \{\
+.                            PRINT "\s-2\v'-\\n[.v]u/5u'\\n[#FN_NUMBER]\|\v'+\\n[.v]u/5u'\s+2\|\c"
+.                         \}
+.                      \}
+.                   \}
+.                   if \\n[#PRINT_STYLE]=2 \{\
+.                      ie \\n[#FN_NUMBER_LENGTH]<\\n[#FN_NUMBER_PLACEHOLDERS] \{\
+.                         PRINT "\*[SUP]\0\\n[#FN_NUMBER]\*[SUPX]\*[FU 3]\c"
+.                      \}
+.                      el \{\
+.                         PRINT "\*[SUP]\\n[#FN_NUMBER]\*[SUPX]\*[FU 3]\c"
+.                      \}
+.                   \}
 .                \}
 .             \}
 .          \}
@@ -13090,17 +13191,16 @@
 .             \}
 .             if \\n[#REF]=1 \{\
 .                if !\\n[#RUN_ON]=1 \{\
-\!.                 in +\\*[$REF_FN_INDENT]
-\!.                 ti -\\*[$REF_FN_INDENT]
+\!.                 ti +\\n[#REF_FN_INDENT]u
 .                \}
 .             \}
 .             ie \\n[#FN_LN_BRACKETS]=1 \{\
 .                ds $FN_LINENUMBER \v'-.085m'\\*[$FN_OPEN_BRACKET]\v'.085m'
 .                ie \\n[#FN_MARK_2]=\\n[#FN_MARK] \{\
-.                   as $FN_LINENUMBER \\n[#FN_MARK]\v'-.085m'\\*[$FN_CLOSE_BRACKET]\v'.085m' \"
+.                   as $FN_LINENUMBER \\n[#FN_MARK]\v'-.085m'\\*[$FN_CLOSE_BRACKET]\v'.085m'\h'.25m'
 .                \}
 .                el \{\
-.                   as $FN_LINENUMBER \\n[#FN_MARK]\v'-.1m'-\v'.1m'\\n[#FN_MARK_2]\v'-.085m'\\*[$FN_CLOSE_BRACKET]\v'.085m' \"
+.                   as $FN_LINENUMBER \\n[#FN_MARK]\v'-.1m'-\v'.1m'\\n[#FN_MARK_2]\v'-.085m'\\*[$FN_CLOSE_BRACKET]\v'.085m'\h'.25m'
 .                \}
 .             \}
 .             el \{\
@@ -13165,18 +13265,16 @@
 .\" More housekeeping
 .\" Turn off indent possibly set by FOOTNOTE INDENT
 .          in 0
+.          ev
+.          if \\n[#UNDERLINE_WAS_ON_FN] \{\
+.             UNDERLINE
+.             rr #UNDERLINE_WAS_ON_FN
+.          \}
 .\" Restore sentence spacing
 .          if \\n[#PRINT_STYLE]=2 \{\
-.             if d$RESTORE_SS_VAR \{ .SS \\*[$RESTORE_SS_VAR] \}
+.             if d $RESTORE_SS_VAR \{ .SS \\*[$RESTORE_SS_VAR] \}
 .             rm $RESTORE_SS_VAR
 .          \}
-.          if \\n[#PRINT_STYLE]=1 \{\
-.             if \\n[#UNDERLINE_WAS_ON] \{\
-.                UNDERLINE
-.                rr #UNDERLINE_WAS_ON
-.             \}
-.          \}
-.          ev
 .          rr #FN_R_INDENT
 .          rr #FN_BR_INDENT
 .          nr #PP_STYLE \\n[#PP_STYLE_PREV]
@@ -13369,7 +13467,6 @@
 .\" current page position.  Leaving it in anyway, commented out, in
 .\" case the logic and the conditions under which it should
 .\" apply reveal themselves.
-\#.                    nr #VARIABLE_FOOTER_POS -\\n[#VFP_DIFF]
 .                      nr #FN_DEPTH \\n[#SAVED_FN_DEPTH_1]+\\n[#VFP_DIFF]
 .                   \}
 .                   el \{\
@@ -13753,35 +13850,37 @@
 .END
 \#
 \#
-\# ENDNOTE LEAD
-\# ------------
+\# ENDNOTES, BIBLIOGRAPHY and TOC LEADING
+\# --------------------------------------
 \# *Argument:
-\#   <base leading to use in endnotes> [ ADJUST ]
+\#   <leading> [ ADJUST ]
 \# *Function:
-\#   Creates or modifies register #EN_LEAD.  Creates or removes
-\#   register #ADJ_EN_LEAD.  Stores arguments in strings if ENDNOTE_LEAD
-\#   set before START.
-\# *Notes:
-\#   Default is 14 points for TYPESET, adjusted; 24 for TYPEWRITE.
-\#
-.MAC ENDNOTE_LEAD END
+\#   Depending on the name by which it's called, creates or modifies
+\#   register #<type>_LEAD, where <type> is BIB, EN, or TOC.  Creates or removes
+\#   register #ADJ_<type>_LEAD.  Stores arguments in strings if BIB,
+\#   EN, or TOC leading are set before START.
+\# *Notes:
+\#   Default is same as doc lead for TYPESET, adjusted; 24 for TYPEWRITE.
+\#
+.MAC _LEAD END
+.    if '\\$0'BIBLIOGRAPHY_LEAD' .ds $SECTION BIB
+.    if '\\$0'ENDNOTE_LEAD'      .ds $SECTION EN
+.    if '\\$0'TOC_LEAD'          .ds $SECTION TOC
+.    ds $\\*[$SECTION]_LEAD \\$1
+.    ds $ADJUST_\\*[$SECTION]_LEAD \\$2
 .    if !\\n[#OK_PROCESS_LEAD] \{\
-.       ds $EN_LEAD \\$1
-.       if !'\\$2'' \{\
-.           ds $ADJUST_EN_LEAD \\$2
-.       \}
 .       return
 .    \}
-.    rr #ADJ_EN_LEAD
-.    nr #EN_LEAD (p;\\$1)
+.    nr #\\*[$SECTION]_LEAD (p;\\$1)
+.    rr #ADJ_\\*[$SECTION]_LEAD
 .    if '\\$2'ADJUST' \{\
 .       nr #ORIG_DOC_LEAD \\n[#DOC_LEAD]
 .       nr #RESTORE_ADJ_DOC_LEAD \\n[#ADJ_DOC_LEAD]
 .       nr #ADJ_DOC_LEAD 1
-.       nr #ADJ_EN_LEAD 1
+.       nr #ADJ_\\*[$SECTION]_LEAD 1
 .       nr #NO_TRAP_RESET 1
-.       DOC_LEAD \\n[#EN_LEAD]u ADJUST
-.       nr #EN_LEAD \\n[#DOC_LEAD]
+.       DOC_LEAD \\n[#\\*[$SECTION]_LEAD]u ADJUST
+.       nr #\\*[$SECTION]_LEAD \\n[#DOC_LEAD]
 .       DOC_LEAD \\n[#ORIG_DOC_LEAD]u
 .       rr #NO_TRAP_RESET
 .       nr #ADJ_DOC_LEAD \\n[#RESTORE_ADJ_DOC_LEAD]
@@ -13789,6 +13888,24 @@
 .    \}
 .END
 \#
+.ALIAS BIBLIOGRAPHY_LEAD _LEAD
+.ALIAS ENDNOTE_LEAD _LEAD
+.ALIAS TOC_LEAD _LEAD
+\#
+\# ENDNOTE SPACING
+\# ----------------
+\# *Arguments:
+\#   <per item endnote spacing> | <anything>
+\# *Function:
+\#   Enables space between endnotes items.
+\# *Notes:
+\#   Default is no space.
+\#
+.MAC ENDNOTE_SPACING END
+.    ie \B'\\$1' .ds $EN_SPACE \\$1
+.    el \{ .rm $EN_SPACE \}
+.END
+\#
 \#
 \# ENDNOTES_HDRFTR_CENTER
 \# ----------------------
@@ -13865,7 +13982,7 @@
 \# ENDNOTE MARKER STYLE
 \# --------------------
 \# *Arguments:
-\#   NUMBER | LINE
+\#   NUMBER | LINE | SUPERSCRIPT
 \# *Function:
 \#   Sets register #EN_MARKER_STYLE, used in ENDNOTE to determine
 \#   the style of endnote markers (labels).
@@ -13874,15 +13991,14 @@
 \#   Default is NUMBER.
 \#
 .MAC ENDNOTE_MARKER_STYLE END
-.    if '\\$1'NUMBER' \{\
-.       nr #EN_MARKER_STYLE 1
-.    \}
+.    if '\\$1'NUMBER' \{ .nr #EN_MARKER_STYLE 1 \}
 .    if '\\$1'LINE' \{\
 .       nr #EN_MARKER_STYLE 2
 .       if !\\n[#EN_LN_SEP] \{\
 .          if !\\n[#EN_LN_BRACKETS] \{ .ENDNOTE_LINENUMBER_BRACKETS SQUARE \}
 .       \}
 .    \}
+.    if '\\$1'SUPERSCRIPT' \{ .nr #EN_MARKER_STYLE 3 \}
 .END
 \#
 \#
@@ -13892,7 +14008,7 @@
 \#   This string, when called inline, stores the current output line
 \#   number in register #EN_MARK for use with ENDNOTE.
 \#
-.ds EN-MARK \R'#EN_MARK \En(ln'
+.ds EN_MARK \R'#EN_MARK \En(ln'
 \#
 \#
 \# ENDNOTE LINENUMBER SEPARATOR
@@ -13960,40 +14076,30 @@
 \#   labels in ENDNOTE.
 \#
 .MAC ENDNOTE_LINENUMBER_GAP END
-.    ds $EN_LN_GAP \\$1
+.    nr #EN_LN_GAP (u;\\$1)
 .END
 \#
 \#
-\# ENDNOTE NUMBERS ALIGN RIGHT
-\# ---------------------------
+\# ENDNOTE NUMBERS ALIGNMENT
+\# -------------------------
 \# *Argument:
-\#   <max. number of digit placeholders that will appear in endnotes>
+\#   LEFT | RIGHT <max. number of digit placeholders that will appear in endnotes>
 \# *Function:
-\#   Toggles register #EN_NUMBERS_ALIGN_RIGHT on; creates register
+\#   Creates registers for _LEFT or _RIGHT; creates register
 \#   #EN_NUMBER_PLACEHOLDERS.
 \# *Notes:
-\#   Default is for footnote numbers to be right aligned to 2 placeholders.
-\#
-.MAC ENDNOTE_NUMBERS_ALIGN_RIGHT END
-.    rr #EN_NUMBERS_ALIGN_LEFT
-.    nr #EN_NUMBERS_ALIGN_RIGHT 1
-.    nr #EN_NUMBER_PLACEHOLDERS \\$1
-.END
-\#
+\#   Default is for endnote numbers to be right aligned to 2 placeholders.
 \#
-\# ENDNOTE NUMBERS ALIGN LEFT
-\# --------------------------
-\# *Argument:
-\#   none
-\# *Function:
-\#   Toggles register #EN_NUMBERS_ALIGN_LEFT on.
-\# *Notes:
-\#   Default is for footnote numbers to be right aligned to 2 placeholders
-\#   (i.e. not left aligned).
-\#
-.MAC ENDNOTE_NUMBERS_ALIGN_LEFT END
-.    rr #EN_NUMBERS_ALIGN_RIGHT
-.    nr #EN_NUMBERS_ALIGN_LEFT 1
+.MAC ENDNOTE_NUMBERS_ALIGN END
+.    if '\\$1'LEFT' \{\
+.       rr #EN_NUMBERS_ALIGN_RIGHT
+.       nr #EN_NUMBERS_ALIGN_LEFT 1
+.    \}
+.    if '\\$1'RIGHT' \{\
+.       rr #EN_NUMBERS_ALIGN_LEFT
+.       nr #EN_NUMBERS_ALIGN_RIGHT 1
+.    \}
+.    nr #EN_NUMBER_PLACEHOLDERS \\$2
 .END
 \#
 \#
@@ -14180,27 +14286,29 @@
 .MAC ENDNOTE END
 .    ie '\\$1'' \{\
 .       nr #ENDNOTE 1
-.       if \\n[#EN_MARKER_STYLE]=1 \{\
-.          if \\n[#CONDENSE] \{ \*[CONDX]\c \}
-.          if \\n[#EXTEND]   \{ \*[EXTX]\c  \}
-.          if \\n[#PRINT_STYLE]=1 \{\
+.       ie !\\n[#EN_MARKER_STYLE]=2 \{\
+.          if \\n[#CONDENSE] \{ .nop \*[CONDX]\c \}
+.          if \\n[#EXTEND]   \{ .nop \*[EXTX]\c  \}
 .             if \\n[#UNDERLINE_ON] \{\
 .                nr #UNDERLINE_WAS_ON 1
 .                UNDERLINE OFF
 .             \}
+.          if \\n[#PRINT_STYLE]=1 \{\
 .             if \\n[#SLANT_ON] \{\
 .                 nr #SLANT_WAS_ON 1
-\*[SLANTX]\c
+.                 nop \*[SLANTX]\c
 .             \}
+.\" Vertical raise amount here is more than when the same string is printed in
+.\" the endnotes so bottom of number aligns with top of bowl.
 .             PRINT "\s-2\v'-\\n[#DOC_LEAD]u/5u'\\n+[#EN_NUMBER]\v'+\\n[#DOC_LEAD]u/5u'\s+2\c"
 .          \}
 .          if \\n[#PRINT_STYLE]=2 \{\
 .             PRINT \*[SUP]\\n+[#EN_NUMBER]\*[SUPX]\c
 .          \}
 .       \}
-.       if \\n[#EN_MARKER_STYLE]=2 \{\
-.           ie r#EN_NUMBER \{ \\n+[#EN_NUMBER] \}
-.           el \{ .nr #EN_NUMBER 1 1 \}
+.       el \{\
+.          ie r#EN_NUMBER \{ .nr #EN_NUMBER \\n[#EN_NUMBER]+1 \}
+.          el \{ .nr #EN_NUMBER 1 1 \}
 .          if !\\n[#LINENUMBERS] \{\
 .             tm1 "[mom]: Line numbering must be enabled with NUMBER_LINES when
 .             tm1 "       ENDNOTE_MARKER_STYLE is LINE.
@@ -14208,7 +14316,7 @@
 .          \}
 .          if \\n[#EN_MARK]=0 \{ .nr #EN_MARK \\n(ln \}
 .          nr #EN_MARK_2 \\n(ln
-.          if '\\n(.z'P_QUOTE' \{\
+.          if '\\n[.z]'P_QUOTE' \{\
 .             nr #EN_MARK -1
 .             nr #EN_MARK_2 -1
 .          \}
@@ -14226,9 +14334,10 @@
 .          el \{ .LL \\n[#COL_L_LENGTH]u \}
 .          ta \\n(.lu
 .       \}
+.       ENDNOTE_LEAD \\*[$EN_LEAD] \\*[$ADJUST_EN_LEAD]
 .       vs \\n[#EN_LEAD]u
+.\" Print page header title
 .       if \\n[#EN_NUMBER]=1 \{\
-\!.        ne 3
 .          if \\n[#PRINT_STYLE]=1 \{\
 .             TYPEWRITER
 .          \}
@@ -14256,11 +14365,14 @@
 .             \}
 .          \}
 .       \}
+.\" Get indent from endnotes point size; convert string to reg in
+.\" case indent string is, e.g., m or n
+.       ps \\n[#EN_PS]u
+.       nr #REF_EN_INDENT (u;\\*[$REF_EN_INDENT])
 .       if \\n[#PRINT_STYLE]=1 \{\
 .          TYPEWRITER
-.          if \\n[#EN_NUMBER]=1 \{\
-.             if \\n[#SINGLE_SPACE]=1 \{ .sp \}
-.          \}
+.          if \\n[#EN_NUMBER]=1 \{ .sp \}
+.          if \\n[#EN_MARKER_STYLE]=3 \{ .PT_SIZE -2 \}
 .       \}
 .       if \\n[#PRINT_STYLE]=2 \{\
 .          if \\n[#EN_NUMBER]=1 \{\
@@ -14276,16 +14388,21 @@
 .             FT      \\*[$EN_LN_FT]
 .             PT_SIZE \\n[#EN_PS]u\\*[$EN_LN_SIZE_CHANGE]
 .          \}
+.          if \\n[#EN_MARKER_STYLE]=3 \{\
+.             FAMILY  \\*[$EN_NUMBER_FAM]
+.             FT      \\*[$EN_NUMBER_FT]
+.             PT_SIZE \\n[#PT_SIZE_IN_UNITS]u*6u/10u
+.          \}
 .       \}
+.\" Build string for line-numbered endnotes
 .       if \\n[#EN_MARKER_STYLE]=2 \{\
-.          ENDNOTE_NUMBERS_ALIGN_LEFT
 .          ie \\n[#EN_LN_BRACKETS]=1 \{\
 .             ds $EN_LINENUMBER \v'-.085m'\\*[$EN_OPEN_BRACKET]\v'.085m'
 .             ie \\n[#EN_MARK_2]=\\n[#EN_MARK] \{\
-.                as $EN_LINENUMBER \\n[#EN_MARK]\v'-.085m'\\*[$EN_CLOSE_BRACKET]\v'.085m' \"
+.                as $EN_LINENUMBER \\n[#EN_MARK]\v'-.085m'\\*[$EN_CLOSE_BRACKET]\v'.085m'\"
 .             \}
 .             el \{\
-.                as $EN_LINENUMBER \\n[#EN_MARK]\v'-.1m'-\v'.1m'\\n[#EN_MARK_2]\v'-.085m'\\*[$EN_CLOSE_BRACKET]\v'.085m' \"
+.                as $EN_LINENUMBER \\n[#EN_MARK]\v'-.1m'-\v'.1m'\\n[#EN_MARK_2]\v'-.085m'\\*[$EN_CLOSE_BRACKET]\v'.085m'\"
 .             \}
 .          \}
 .          el \{\
@@ -14299,37 +14416,56 @@
 .          nr #EN_MARK 0
 .       \}
 \!.     TRAP OFF
-.       nr #RESET_L_LENGTH \\n(.l
-.       ie \\n[#EN_NUMBERS_ALIGN_RIGHT] \{\
+.       ie \\n[#EN_NUMBERS_ALIGN_RIGHT] \{ .RIGHT \}
+.       el \{ .LEFT \}
+.       if \\n[#EN_MARKER_STYLE]=1 \{\
 .          nr #EN_NUMBER_L_LENGTH \w'\0'*\\n[#EN_NUMBER_PLACEHOLDERS]+\w'.'
+.       \}
+.       if \\n[#EN_MARKER_STYLE]=2 \{\
+.          ie \\n[#EN_LN_BRACKETS]=1 \{ .nr #EN_NUMBER_L_LENGTH (\w'\0'*(\\n[#EN_NUMBER_PLACEHOLDERS]*2))+\w'-[]' \}
+.          el \{ .nr #EN_NUMBER_L_LENGTH (\w'\0'*(\\n[#EN_NUMBER_PLACEHOLDERS]*2))+\w'-\\*[$EN_LN_SEP]' \}
 .          RIGHT
 .       \}
-.       el \{\
-.          nr #EN_NUMBER_L_LENGTH \w'\En[#EN_NUMBER].\0'
-.          LEFT
+.       if \\n[#EN_MARKER_STYLE]=3 \{\
+.          nr #EN_NUMBER_L_LENGTH \w'\0'*\\n[#EN_NUMBER_PLACEHOLDERS]
+.          RIGHT
 .       \}
-.       if \\n[#EN_MARKER_STYLE]=2 \{\
-.          if !\\n[#EN_NUMBERS_ALIGN_RIGHT] \{\
-.             nr #EN_NUMBER_L_LENGTH \w'\\*[$EN_LINENUMBER]'+\\*[$EN_LN_GAP]
-.             LEFT
-.          \}
+.       ie \\n[#REF]=1 \{\
+.          ll \\n[#EN_NUMBER_L_LENGTH]u+\\n[#REF_EN_INDENT]u
 .       \}
-.       ll \\n[#EN_NUMBER_L_LENGTH]u
+.       el \{ .ll \\n[#EN_NUMBER_L_LENGTH]u \}
 .       if \\n[#EN_MARKER_STYLE]=1 \{\
-\En[#EN_NUMBER].
+.          if \\n[#REF]=1 \{ .ti \\n[#REF_EN_INDENT]u \}
+.          nop \En[#EN_NUMBER].
 .       \}
 .       if \\n[#EN_MARKER_STYLE]=2 \{\
-\\*[$EN_LINENUMBER]
+.          nop \\*[$EN_LINENUMBER]
 .          rm $EN_LINENUMBER
 .       \}
+.       if \\n[#EN_MARKER_STYLE]=3 \{\
+.          PT_SIZE \" Reset ps changed to get width of s-script numbers
+.          ie \\n[#PRINT_STYLE]=1 \{\
+.\" Vertical raise amount here is less than when the same string is printed in
+.\" the body of the text because number precedes a cap.
+.             nop \s-2\v'-\\n[#DOC_LEAD]u/7u'\\n[#EN_NUMBER]\|\v'+\\n[#DOC_LEAD]u/7u'\s+2
+.          \}
+.          el \{ .nop \E*[SUP]\\n[#EN_NUMBER]\E*[SUPX] \}
+.       \}
 .       EOL
-.       ll \\n[#RESET_L_LENGTH]u
-.       nr #EN_FIGURE_SPACE \w'\0.'
-.       ie \\n[#EN_NUMBERS_ALIGN_RIGHT] \{\
-.          in \\n[#EN_NUMBER_L_LENGTH]u+\\n[#EN_FIGURE_SPACE]u
+\!.     TRAP OFF
+.       ll
+.       nr #EN_FIGURE_SPACE \w'\0'
+.       if \\n[#EN_MARKER_STYLE]=1 \{\
+.          ie \\n[#REF]=1 \{ .ti \\n[#EN_NUMBER_L_LENGTH]u+\\n[#REF_EN_INDENT]u+\\n[#EN_FIGURE_SPACE]u \}
+.          el \{ .in \\n[#EN_NUMBER_L_LENGTH]u+\\n[#EN_FIGURE_SPACE]u \}
 .       \}
-.       el \{\
-.          ti \\n[#EN_NUMBER_L_LENGTH]u
+.       if \\n[#EN_MARKER_STYLE]=2 \{\
+.          ie \\n[#REF]=1 \{ .ti \\n[#EN_NUMBER_L_LENGTH]u+\\n[#REF_EN_INDENT]u+\\n[#EN_LN_GAP]u \}
+.          el \{ .ti \\n[#EN_NUMBER_L_LENGTH]u+\\n[#EN_LN_GAP]u \}
+.       \}
+.       if \\n[#EN_MARKER_STYLE]=3 \{\
+.          ie \\n[#REF]=1 \{ .ti \\n[#EN_NUMBER_L_LENGTH]u+\\n[#REF_EN_INDENT]u+\w'\|'u \}
+.          el \{ .in \\n[#EN_NUMBER_L_LENGTH]u \}
 .       \}
 .       nr #EN_TEXT_INDENT \\n(.i
 .       QUAD \\*[$EN_QUAD]
@@ -14342,51 +14478,30 @@
 .          FT      \\*[$EN_FT]
 .          PT_SIZE \\n[#EN_PS]u
 .       \}
-.       if \\n[#REF]=1 \{\
-.          ie !\\n[#EN_MARKER_STYLE]=2 \{\
-.             if \\n[#EN_NUMBERS_ALIGN_LEFT] \{\
-.                in \\*[$REF_EN_INDENT]
-.                ti -(\\*[$REF_EN_INDENT]-\\n[#EN_NUMBER_L_LENGTH]u)
-.             \}
-.             if \\n[#EN_NUMBERS_ALIGN_RIGHT] \{\
-\#.                in \\*[$REF_EN_INDENT]
-\#.                ti -(\\*[$REF_EN_INDENT]-\\n[#EN_NUMBER_L_LENGTH]u-\\n[#EN_FIGURE_SPACE]u)
-\#.                in \\*[$REF_EN_INDENT]+\\n[#EN_NUMBER_L_LENGTH]u
-\#.                ti -(\\*[$REF_EN_INDENT]-\\n[#EN_NUMBER_L_LENGTH]u+\\n[#EN_FIGURE_SPACE]u)
-.                in +\\*[$REF_EN_INDENT]
-.                ti -\\*[$REF_EN_INDENT]
-.             \}
-.          \}
-.          el \{\
-.             if \\n[#EN_NUMBERS_ALIGN_LEFT] \{\
-.                in \\*[$REF_EN_INDENT]
-.                ti -(\\*[$REF_EN_INDENT]-\\n[#EN_NUMBER_L_LENGTH]u)
-.             \}
-.          \}
-.       \}
 .    \}
 .    el \{\
-.       sp
+\!.     ie \\n[#EN_NUMBER]=\\\\n[#LAST_EN] \{ .vpt 0 \}
+\!.     el \{ .br \}
+.       ALD \\*[$EN_SPACE]
 .       in 0
 .       if \\n[#EN_MARKER_STYLE]=2 \{\
 \!.        in 0
 .       \}
-.       di
+.       da
 .\" Restore sentence spacing
 .       if \\n[#PRINT_STYLE]=2 \{\
 .          if d$RESTORE_SS_VAR \{ .SS \\*[$RESTORE_SS_VAR] \}
 .          rm $RESTORE_SS_VAR
 .       \}
 .       ev
+.\" Restore lead -- need 
 .       nr #PP_STYLE \\n[#PP_STYLE_PREV]
 .       if !\\n[#INDENT_FIRSTS] \{ .INDENT_FIRST_PARAS OFF \}
 .       rr #INDENT_FIRSTS
 .       rr #ENDNOTE
-.       if \\n[#PRINT_STYLE]=1 \{\
-.          if \\n[#UNDERLINE_WAS_ON] \{\
-.             rr #UNDERLINE_WAS_ON
-.             UNDERLINE
-.          \}
+.       if \\n[#UNDERLINE_WAS_ON] \{\
+.          rr #UNDERLINE_WAS_ON
+.          UNDERLINE
 .       \}
 .       if \\n[#SLANT_WAS_ON] \{\
 .          rr #SLANT_WAS_ON
@@ -14410,6 +14525,7 @@
 \#   with endnotes, then outputs diversion END_NOTES.
 \#
 .MAC ENDNOTES END
+.    nr #LAST_EN \\n[#EN_NUMBER]
 .    nr #ENDNOTES 1
 .    nr #EN_FIRST_PAGE 1
 .    nr #HEADER_STATE \\n[#HEADERS_ON]
@@ -14570,11 +14686,11 @@
 .    CAPS OFF
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       ie \\n[#SINGLE_SPACE]=1 \{\
-.          ALD \\n[#EN_LEAD]u*2u
+.          sp
 .       \}
 .       el \{\
 .          ie \\n[#EN_SINGLESPACE]=1 \{\
-.              ALD \\n[#EN_LEAD]u*2
+.             sp
 .          \}
 .          el \{\
 .
@@ -14583,9 +14699,9 @@
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{ .ALD \\n[#EN_LEAD]u \}
 .    QUAD \\*[$EN_QUAD]
+.    chop END_NOTES
 .    nf
 .    END_NOTES
-.    br
 .    ev
 .    rm END_NOTES
 .    if \\n[#PRINT_STYLE]=1 \{ .vs \\n[#DOC_LEAD]u \}
@@ -14602,6 +14718,7 @@
 .       NUMBER_LINES RESUME
 .       nr #LINENUMBERS 1
 .    \}
+.    PRINT_FOOTER
 .    rr #ENDNOTES
 .END
 \#
@@ -14626,37 +14743,13 @@
 \# Because the bibliography control macros all have endnotes
 \# equivalents, refer to the appropriate, similar endnote macro for
 \# Arguments, Function and Notes.
+\#
 \# Bibliography control macros
 \#
 .MAC BIBLIOGRAPHY_PT_SIZE END
 .    nr #BIB_PS (p;\\$1)
 .END
 \#
-.MAC BIBLIOGRAPHY_LEAD END
-.    if !\\n[#OK_PROCESS_LEAD] \{\
-.       ds $BIB_LEAD \\$1
-.       if !'\\$2'' \{\
-.           ds $ADJUST_BIB_LEAD \\$2
-.       \}
-.       return
-.    \}
-.    rr #ADJ_BIB_LEAD
-.    nr #BIB_LEAD (p;\\$1)
-.    if '\\$2'ADJUST' \{\
-.       nr #ORIG_DOC_LEAD \\n[#DOC_LEAD]
-.       nr #RESTORE_ADJ_DOC_LEAD \\n[#ADJ_DOC_LEAD]
-.       nr #ADJ_DOC_LEAD 1
-.       nr #ADJ_BIB_LEAD 1
-.       nr #NO_TRAP_RESET 1
-.       DOC_LEAD \\n[#BIB_LEAD]u ADJUST
-.       nr #BIB_LEAD \\n[#DOC_LEAD]
-.       DOC_LEAD \\n[#ORIG_DOC_LEAD]u
-.       rr #NO_TRAP_RESET
-.       nr #ADJ_DOC_LEAD \\n[#RESTORE_ADJ_DOC_LEAD]
-.       rr #ORIG_DOC_LEAD
-.    \}
-.END
-\#
 .MAC BIBLIOGRAPHY_HDRFTR_CENTER END
 .    ie '\\$1'' \{ .nr #BIB_HDRFTR_CENTER 1 \}
 .    el         \{ .rr #BIB_HDRFTR_CENTER   \}
@@ -14666,9 +14759,13 @@
 .    ds $BIB_STRING \\$1
 .END
 \#
+.MAC BIBLIOGRAPHY_STRING_ADVANCE END
+.    nr #BIB_STRING_ADVANCE (\\$1)
+.END
+\#
 .MAC BIBLIOGRAPHY_STRING_CAPS END
 .   ie '\\$1'' \{ .nr #BIB_STRING_CAPS 1 \}
-.   el \{ .rr #BIB_STRING_CAPS \}
+.   el \{ .nr #BIB_STRING_CAPS 0 \}
 .END
 \#
 .MAC BIBLIOGRAPHY_NO_COLUMNS END
@@ -14797,205 +14894,223 @@
 \#   Bibliography pages are set up almost identically to endnotes pages.
 \#
 .MAC BIBLIOGRAPHY END
-.    nr #BIBLIOGRAPHY 1
-.    nr #BIB_FIRST_PAGE 1
-.    nr #HEADER_STATE \\n[#HEADERS_ON]
-.    ds $RESTORE_PAGENUM_STYLE \\*[$PAGENUM_STYLE]
-.    if \\n[#LINENUMBERS]=1 \{\
-.       NUMBER_LINES OFF
-.       nr #LINENUMBERS 2
-.    \}
-.    if \\n[#HEADERS_ON]=1 \{\
-.       if !\\n[#BIB_ALLOWS_HEADERS_ALL] \{ .HEADERS OFF \}
-.    \}
-.    if \\n[#HEADER_STATE]=1 \{\
-.       ie \\n[#BIB_HDRFTR_CENTER]=1 \{ . \}
-.       el \{ .rm $HDRFTR_CENTER  \}
-.    \}
-.    ie !\\n[#SUSPEND_PAGINATION] \{\
-.       if \\n[#PAGINATE]=1 \{\
-.          if \\n[#PAGE_NUM_V_POS]=1 \{\
-.             PAGENUM_STYLE \\*[$BIB_PN_STYLE]
-.             if \\n[#BIB_FIRST_PN] \{ .PAGENUMBER \\n[#BIB_FIRST_PN]-1 \}
-.             if r#BIB_NO_FIRST_PN \{ .nr #PAGINATE 0 \}
+.    ie '\\$1'' \{\
+.       rr #FN_REF
+.       rr #EN_REF
+.       REF_STYLE BIBLIO
+.       nr #BIBLIOGRAPHY 1
+.       nr #BIB_FIRST_PAGE 1
+.       nr #HEADER_STATE \\n[#HEADERS_ON]
+.       ds $RESTORE_PAGENUM_STYLE \\*[$PAGENUM_STYLE]
+.       if \\n[#LINENUMBERS]=1 \{\
+.          NUMBER_LINES OFF
+.          nr #LINENUMBERS 2
+.       \}
+.       if \\n[#HEADERS_ON]=1 \{\
+.          if !\\n[#BIB_ALLOWS_HEADERS_ALL] \{ .HEADERS OFF \}
+.       \}
+.       if \\n[#HEADER_STATE]=1 \{\
+.          ie \\n[#BIB_HDRFTR_CENTER]=1 \{ . \}
+.          el \{ .rm $HDRFTR_CENTER  \}
+.       \}
+.       ie !\\n[#SUSPEND_PAGINATION] \{\
+.          if \\n[#PAGINATE]=1 \{\
+.             if \\n[#PAGE_NUM_V_POS]=1 \{\
+.                PAGENUM_STYLE \\*[$BIB_PN_STYLE]
+.                if \\n[#BIB_FIRST_PN] \{ .PAGENUMBER \\n[#BIB_FIRST_PN]-1 \}
+.                if r#BIB_NO_FIRST_PN \{ .nr #PAGINATE 0 \}
+.             \}
 .          \}
 .       \}
-.    \}
-.    el \{\
-.       ie \\n[#PAGE_NUM_V_POS]=2 \{ .nr #PAGINATE 1 \}
-.       el \{ .nr #PAGINATE 0 \}
-.    \}
-.    if \\n[#FOOTERS_ON]=1 \{\
-.       if !'\\*[$HDRFTR_CENTER_OLD]'' .ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_OLD]
-.    \}
-.    NEWPAGE
-.    if \\n[#FOOTERS_ON]=1 \{\
-.       ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_NEW]
-.       rm $HDRFTR_CENTER_OLD
-.       rm $HDRFTR_CENTER_NEW
-.    \}
-.    ie !\\n[#SUSPEND_PAGINATION] \{\
-.       if \\n[#PAGE_NUM_V_POS]=1 \{\
-.          if r#BIB_NO_FIRST_PN \{\
-.             if \\n[#PAGINATION_STATE]=1 \{\
-.                nr #PAGINATE 1
+.       el \{\
+.          ie \\n[#PAGE_NUM_V_POS]=2 \{ .nr #PAGINATE 1 \}
+.          el \{ .nr #PAGINATE 0 \}
+.       \}
+.       if \\n[#FOOTERS_ON]=1 \{\
+.          if !'\\*[$HDRFTR_CENTER_OLD]'' .ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_OLD]
+.       \}
+.       BIBLIOGRAPHY_LEAD \\*[$BIB_LEAD] \\*[$ADJUST_BIB_LEAD]
+.       DOC_LEAD \\n[#BIB_LEAD]u
+.       NEWPAGE
+.       if \\n[#FOOTERS_ON]=1 \{\
+.          ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_NEW]
+.          rm $HDRFTR_CENTER_OLD
+.          rm $HDRFTR_CENTER_NEW
+.       \}
+.       ie !\\n[#SUSPEND_PAGINATION] \{\
+.          if \\n[#PAGE_NUM_V_POS]=1 \{\
+.             if r#BIB_NO_FIRST_PN \{\
+.                if \\n[#PAGINATION_STATE]=1 \{\
+.                   nr #PAGINATE 1
+.                \}
 .             \}
 .          \}
 .       \}
-.    \}
-.    el \{\
-.       if \\n[#PAGE_NUM_V_POS]=2 \{ .nr #PAGINATE 0 \}
-.    \}
-.    rr #PAGINATION_STATE
-.    PAGENUM_STYLE \\*[$BIB_PN_STYLE]
-.    if \\n[#BIB_FIRST_PN] \{ .PAGENUMBER \\n[#BIB_FIRST_PN] \}
-.    if \\n[#HEADER_STATE]=1 \{\
-.       if \\n[#BIB_ALLOWS_HEADERS] \{ .HEADERS \}
-.    \}
-.\" Collect bibliography title string for TOC
-.    nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ]
-.    af #TOC_ENTRY_PN \\g[#PAGENUMBER]
-.    ds $TOC_TITLE_ITEM \\*[$BIB_STRING]\\|
-.    ev TOC_EV
-.    da TOC_ENTRIES
-.    if \\n[#PRINT_STYLE]=1 \{\
-.       TYPEWRITER
-.    \}
-.    if \\n[#PRINT_STYLE]=2 \{\
-\!.     FAMILY  \\*[$TOC_TITLE_FAM]
-\!.     FT      \\*[$TOC_TITLE_FT]
-\!.     PT_SIZE \\n[#TOC_PS]u\\*[$TOC_TITLE_SIZE_CHANGE]
-.    \}
-\!.  TRAP OFF
-.    ie \\n[#PRINT_STYLE]=1 \{\
-\!.     PAD "\\*[$TOC_TITLE_ITEM]\\*[$TOC_PN_TYPEWRITE]"
-.    \}
-.    el \{\
-\!.     PAD "\\h'\\n[#TOC_TITLE_INDENT]u'\\*[$TOC_TITLE_ITEM]\\*[$TOC_PN]"
-.    \}
-\!.  EOL
-\!.  ST 100 L
-\!.  ST 101 R
-.    if \\n[#PRINT_STYLE]=2 \{\
-\!.     FAMILY  \\*[$TOC_PN_FAM]
-\!.     FT      \\*[$TOC_PN_FT]
-\!.     PT_SIZE \\n[#TOC_PS]u\\*[$TOC_PN_SIZE_CHANGE]
-.    \}
-\!.  TAB 100
-\!.  PRINT \\*[LEADER]
-\!.  TN
-\!.  TRAP
-\!.  PRINT \\n[#TOC_ENTRY_PN]
-\!.  TQ
-.    di
-.    ev
-.\" End collection of bibliography title string for TOC
-.\" Process bibliography
-.    if \\n[#PRINT_STYLE]=1 \{ .vs \\n[#BIB_LEAD]u \}
-.    if \\n[#PRINT_STYLE]=2 \{\
-.       if \\n[#BIB_NO_COLS] \{\
-.          if \\n[#COLUMNS] \{ .nr #COLUMNS_WERE_ON 1 \}
-.          nr #COLUMNS 0
+.       el \{\
+.          if \\n[#PAGE_NUM_V_POS]=2 \{ .nr #PAGINATE 0 \}
 .       \}
-.       nr #RESTORE_DOC_LEAD \\n[#DOC_LEAD]
-.       ie \\n[#ADJ_BIB_LEAD] \{\
-.          nr #DOC_LEAD \\n[#BIB_LEAD]
+.       rr #PAGINATION_STATE
+.       PAGENUM_STYLE \\*[$BIB_PN_STYLE]
+.       if \\n[#BIB_FIRST_PN] \{ .PAGENUMBER \\n[#BIB_FIRST_PN] \}
+.       if \\n[#HEADER_STATE]=1 \{\
+.          if \\n[#BIB_ALLOWS_HEADERS] \{ .HEADERS \}
 .       \}
-.       el \{ .DOC_LEAD \\n[#BIB_LEAD]u \}
-.    \}
-.    PRINT \&
-.    ie r#BIB_TITLE_SPACE \{ .sp |\\n[#BIB_TITLE_SPACE]u \}
-.    el \{ .sp |\\n[#T_MARGIN]u \}
-.    mk ec
-.    if \\n[#SLANT_ON] \{\
-\*[SLANTX]\c
-.    \}
-.    if !'\\*[$BIB_STRING]'' \{\
+.\" Collect bibliography title string for TOC
+.       nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ]
+.       af #TOC_ENTRY_PN \\g[#PAGENUMBER]
+.       ds $TOC_TITLE_ITEM \\*[$BIB_STRING]\\|
+.       ev TOC_EV
+.       da TOC_ENTRIES
 .       if \\n[#PRINT_STYLE]=1 \{\
 .          TYPEWRITER
-.          vs \\n[#BIB_LEAD]u
 .       \}
 .       if \\n[#PRINT_STYLE]=2 \{\
-.          LL \\n[#DOC_L_LENGTH]u
-.          ta \\n(.lu
-.          if \\n[#COLUMNS] \{\
-.             ie \\n[#BIB_NO_COLS] \{ .LL \\n[#DOC_L_LENGTH]u \}
-.             el \{ .LL \\n[#COL_L_LENGTH]u \}
-.             ta \\n(.lu
-.          \}
-.          FAMILY  \\*[$BIB_STRING_FAM]
-.          FT      \\*[$BIB_STRING_FT]
-.          PT_SIZE \\n[#BIB_PS]u\\*[$BIB_STRING_SIZE_CHANGE]
-.          vs      \\n[#BIB_LEAD]u
-.       \}
-.       if '\\*[$BIB_STRING_QUAD]'L'      \{ .LEFT   \}
-.       if '\\*[$BIB_STRING_QUAD]'LEFT'   \{ .LEFT   \}
-.       if '\\*[$BIB_STRING_QUAD]'C'      \{ .CENTER \}
-.       if '\\*[$BIB_STRING_QUAD]'CENTER' \{ .CENTER \}
-.       if '\\*[$BIB_STRING_QUAD]'CENTRE' \{ .CENTER \}
-.       if '\\*[$BIB_STRING_QUAD]'R'      \{ .RIGHT  \}
-.       if '\\*[$BIB_STRING_QUAD]'RIGHT'  \{ .RIGHT  \}
-.       EOL
-.       if \\n[#BIB_STRING_CAPS] \{ .CAPS \}
-.       ie \\n[#BIB_STRING_UNDERLINE] \{\
-.          nr #FROM_BIB_STRING 1
-.          ie \\n[#BIB_STRING_UNDERLINE]=2 \{\
-.             UNDERSCORE2 "\\*[$BIB_STRING]"
-.          \}
-.          el \{\
-.             UNDERSCORE "\\*[$BIB_STRING]"
-.          \}
-.          rr #FROM_BIB_STRING
+\!.        FAMILY  \\*[$TOC_TITLE_FAM]
+\!.        FT      \\*[$TOC_TITLE_FT]
+\!.        PT_SIZE \\n[#TOC_PS]u\\*[$TOC_TITLE_SIZE_CHANGE]
+.       \}
+\!.     TRAP OFF
+\!.     PAD_MARKER ^
+.       ie \\n[#PRINT_STYLE]=1 \{\
+\!.        PAD "\\*[$TOC_TITLE_ITEM]\\*[$TOC_PN_TYPEWRITE]"
 .       \}
 .       el \{\
-.          PRINT "\\*[$BIB_STRING]"
+\!.        PAD "\\h'\\n[#TOC_TITLE_INDENT]u'\\*[$TOC_TITLE_ITEM]\\*[$TOC_PN]"
 .       \}
-.    \}
-.    CAPS OFF
-.    FAMILY \\*[$BIB_FAMILY]
-.    FT \\*[$BIB_FT]
-.    PT_SIZE -\\*[$BIB_STRING_SIZE_CHANGE]
-.    if \\n[#PRINT_STYLE]=1 \{\
-.       ie \\n[#SINGLE_SPACE]=1 \{\
-.          ALD \\n[#BIB_LEAD]*3u
+\!.     PAD_MARKER #
+\!.     EOL
+\!.     ST 100 L
+\!.     ST 101 R
+.       if \\n[#PRINT_STYLE]=2 \{\
+\!.        FAMILY  \\*[$TOC_PN_FAM]
+\!.        FT      \\*[$TOC_PN_FT]
+\!.        PT_SIZE \\n[#TOC_PS]u\\*[$TOC_PN_SIZE_CHANGE]
+.       \}
+\!.     TAB 100
+\!.     PRINT \\*[LEADER]
+\!.     TN
+\!.     TRAP
+\!.     PRINT \\n[#TOC_ENTRY_PN]
+\!.     TQ
+.       di
+.       ev
+.\" End collection of bibliography title string for TOC
+.\" Process bibliography
+.       if \\n[#PRINT_STYLE]=1 \{ .vs \\n[#BIB_LEAD]u \}
+.       if \\n[#PRINT_STYLE]=2 \{\
+.          if \\n[#BIB_NO_COLS] \{\
+.             if \\n[#COLUMNS] \{ .nr #COLUMNS_WERE_ON 1 \}
+.             nr #COLUMNS 0
+.          \}
+.          nr #RESTORE_DOC_LEAD \\n[#DOC_LEAD]
+.          ie \\n[#ADJ_BIB_LEAD] \{\
+.             nr #DOC_LEAD \\n[#BIB_LEAD]
+.          \}
+.          el \{ .DOC_LEAD \\n[#BIB_LEAD]u \}
 .       \}
-.       el \{\
-.          ie \\n[#BIB_SINGLESPACE]=1 \{\
-.             ALD \\n[#BIB_LEAD]u*3u
+.       PRINT \&
+.       ie r#BIB_STRING_ADVANCE \{ .sp |\\n[#BIB_STRING_ADVANCE]u \}
+.       el \{ .sp |\\n[#T_MARGIN]u \}
+.       mk ec
+.       if \\n[#SLANT_ON] \{\
+\*[SLANTX]\c
+.       \}
+.       if !'\\*[$BIB_STRING]'' \{\
+.          if \\n[#PRINT_STYLE]=1 \{\
+.             TYPEWRITER
+.             vs \\n[#BIB_LEAD]u
+.          \}
+.          if \\n[#PRINT_STYLE]=2 \{\
+.             LL \\n[#DOC_L_LENGTH]u
+.             ta \\n(.lu
+.             if \\n[#COLUMNS] \{\
+.                ie \\n[#BIB_NO_COLS] \{ .LL \\n[#DOC_L_LENGTH]u \}
+.                el \{ .LL \\n[#COL_L_LENGTH]u \}
+.                ta \\n(.lu
+.             \}
+.             FAMILY  \\*[$BIB_STRING_FAM]
+.             FT      \\*[$BIB_STRING_FT]
+.             PT_SIZE \\n[#BIB_PS]u\\*[$BIB_STRING_SIZE_CHANGE]
+.             vs      \\n[#BIB_LEAD]u
+.          \}
+.          if '\\*[$BIB_STRING_QUAD]'L'      \{ .LEFT   \}
+.          if '\\*[$BIB_STRING_QUAD]'LEFT'   \{ .LEFT   \}
+.          if '\\*[$BIB_STRING_QUAD]'C'      \{ .CENTER \}
+.          if '\\*[$BIB_STRING_QUAD]'CENTER' \{ .CENTER \}
+.          if '\\*[$BIB_STRING_QUAD]'CENTRE' \{ .CENTER \}
+.          if '\\*[$BIB_STRING_QUAD]'R'      \{ .RIGHT  \}
+.          if '\\*[$BIB_STRING_QUAD]'RIGHT'  \{ .RIGHT  \}
+.          EOL
+.          if \\n[#BIB_STRING_CAPS] \{ .CAPS \}
+.          ie \\n[#BIB_STRING_UNDERLINE] \{\
+.             nr #FROM_BIB_STRING 1
+.             ie \\n[#BIB_STRING_UNDERLINE]=2 \{\
+.                UNDERSCORE2 "\\*[$BIB_STRING]"
+.             \}
+.             el \{\
+.                UNDERSCORE "\\*[$BIB_STRING]"
+.             \}
+.             rr #FROM_BIB_STRING
 .          \}
 .          el \{\
-.             ALD \\n[#BIB_LEAD]u
+.             PRINT "\\*[$BIB_STRING]"
 .          \}
 .       \}
-.    \}
-.    if \\n[#PRINT_STYLE]=2 \{ .ALD \\n[#BIB_LEAD]u*2u \}
-.    QUAD \\*[$BIB_QUAD]
-.    if \\n[#PRINT_STYLE]=1 \{\
-.       ie \\n[#SINGLE_SPACE]=1 \{\
-.          vs \\n[#BIB_LEAD]u
+.       CAPS OFF
+.       FAMILY \\*[$BIB_FAMILY]
+.       FT \\*[$BIB_FT]
+.       PT_SIZE -\\*[$BIB_STRING_SIZE_CHANGE]
+.       if \\n[#PRINT_STYLE]=1 \{\
+.          ie \\n[#SINGLE_SPACE]=1 \{\
+.             ALD \\n[#BIB_LEAD]*3u
+.          \}
+.          el \{\
+.             ie \\n[#BIB_SINGLESPACE]=1 \{\
+.                ALD \\n[#BIB_LEAD]u*3u
+.             \}
+.             el \{\
+.                ALD \\n[#BIB_LEAD]u
+.             \}
+.          \}
 .       \}
-.       el \{\
-.          ie \\n[#BIB_SINGLESPACE]=1 \{\
+.       if \\n[#PRINT_STYLE]=2 \{ .ALD \\n[#BIB_LEAD]u*2u \}
+.       QUAD \\*[$BIB_QUAD]
+.       if \\n[#PRINT_STYLE]=1 \{\
+.          ie \\n[#SINGLE_SPACE]=1 \{\
 .             vs \\n[#BIB_LEAD]u
 .          \}
 .          el \{\
-.             vs \\n[#BIB_LEAD]u
+.             ie \\n[#BIB_SINGLESPACE]=1 \{\
+.                vs \\n[#BIB_LEAD]u
+.             \}
+.             el \{\
+.                vs \\n[#BIB_LEAD]u
+.             \}
 .          \}
 .       \}
-.    \}
-.    if \\n[#PRINT_STYLE]=2 \{\
-.       ie \\n[#ADJ_BIB_LEAD] \{\
-.          nr #DOC_LEAD \\n[#RESTORE_DOC_LEAD]
+.       if \\n[#PRINT_STYLE]=2 \{\
+.          ie \\n[#ADJ_BIB_LEAD] \{\
+.             nr #DOC_LEAD \\n[#RESTORE_DOC_LEAD]
+.          \}
+.          el \{ .DOC_LEAD \\n[#RESTORE_DOC_LEAD]u \}
+.          rr #RESTORE_DOC_LEAD
 .       \}
-.       el \{ .DOC_LEAD \\n[#RESTORE_DOC_LEAD]u \}
-.       rr #RESTORE_DOC_LEAD
+.       if \\n[#COLUMNS_WERE_ON] \{ .nr #COLUMNS 1 \}
+.       if \\n[#HEADER_STATE]=1 \{ .HEADERS \}
+.       if \\n[#LINENUMBERS]=2 \{\
+.          NUMBER_LINES RESUME
+.          nr #LINENUMBERS 1
+.       \}
+.       di BIB
 .    \}
-.    if \\n[#COLUMNS_WERE_ON] \{ .nr #COLUMNS 1 \}
-.    if \\n[#HEADER_STATE]=1 \{ .HEADERS \}
-.    rr #BIBLIOGRAPHY
-.    if \\n[#LINENUMBERS]=2 \{\
-.       NUMBER_LINES RESUME
-.       nr #LINENUMBERS 1
+.    el \{\
+.       br
+.       di
+.\" Part of workaround for refer spitting out a blank page if the
+.\" last ref falls on the bottom line.
+.       nr num*refs \\n[ref*num*first-pass]
+.       nf
+.       BIB
 .    \}
 .END
 \#
@@ -15060,44 +15175,6 @@
 .END
 \#
 \#
-\# TOC LEADING
-\# -----------
-\# *Argument:
-\#   <leading for toc pages> [ADJUST]
-\# *Function:
-\#   Creates or modifies register #TOC_LEAD. If optional ADJUST
-\#   given, adjusts lead to fill page.  If #OK_PROCESS_LEAD doesn't
-\#   exist, stores arguments for when it's okay to run the macro.
-\# *Notes:
-\#   No unit of measure required (points assumed).
-\#
-\#   Default is same as DOC_LEAD.
-\#
-.MAC TOC_LEAD END
-.    if !\\n[#OK_PROCESS_LEAD] \{\
-.       ds $TOC_LEAD \\$1
-.       if !'\\$2'' \{\
-.           ds $ADJUST_TOC_LEAD \\$2
-.       \}
-.       return
-.    \}
-.    rr #ADJ_TOC_LEAD
-.    nr #TOC_LEAD (p;\\$1)
-.    if '\\$2'ADJUST' \{\
-.       nr #ORIG_DOC_LEAD \\n[#DOC_LEAD]
-.       nr #RESTORE_ADJ_DOC_LEAD \\n[#ADJ_DOC_LEAD]
-.       nr #ADJ_DOC_LEAD 1
-.       nr #ADJ_TOC_LEAD 1
-.       nr #NO_TRAP_RESET 1
-.       DOC_LEAD \\n[#TOC_LEAD]u ADJUST
-.       nr #TOC_LEAD \\n[#DOC_LEAD]
-.       DOC_LEAD \\n[#ORIG_DOC_LEAD]u
-.       rr #NO_TRAP_RESET
-.       nr #ADJ_DOC_LEAD \\n[#RESTORE_ADJ_DOC_LEAD]
-.       rr #ORIG_DOC_LEAD
-.    \}
-.END
-\#
 \#
 \# TOC PAGES PAGE-NUMBERING STYLE
 \# ------------------------------
@@ -15233,6 +15310,19 @@
 .    \}
 .    if \\n[#FOOTERS_WERE_ON] \{ .FOOTERS OFF \} \" But have to turn FOOTERS off again so they don't print when FINIS was called
 .    COLLATE
+.    if \\n[#PRINT_STYLE]=1 \{\
+.       rr #IGNORE
+.       DOC_LEAD 24 ADJUST
+.       nr #IGNORE 1
+.    \}
+.    if \\n[#PRINT_STYLE]=2 \{\
+.       ie r#ADJ_TOC_LEAD \{\
+.          nr #NO_TRAP_RESET 1
+.          DOC_LEAD \\n[#TOC_LEAD]u ADJUST
+.          rr #NO_TRAP_RESET
+.       \}
+.       el \{ .DOC_LEAD \\n[#TOC_LEAD]u \}
+.    \}
 .    if \\n[#FINIS] \{\
 .       if \\n[#FOOTERS_WERE_ON] \{ .FOOTERS \} \" Finally, turn footers on if they were on
 .       rr #FOOTERS_WERE_ON
@@ -15252,23 +15342,10 @@
 .    rr #COLLATED_DOC
 .    DOCHEADER OFF
 .    PAGENUMBER 1
-.    if \\n[#PRINT_STYLE]=1 \{\
-.       rr #IGNORE
-.       DOC_LEAD 24 ADJUST
-.       nr #IGNORE 1
-.    \}
 .    if \\n[#LINENUMBERS]=2 \{ .nr #LINENUMBERS 3 \}
 .    START
 .    PP
 .    nr #COLUMNS 0
-.    if \\n[#PRINT_STYLE]=2 \{\
-.       ie r#ADJ_TOC_LEAD \{\
-.          nr #NO_TRAP_RESET 1
-.          DOC_LEAD \\n[#TOC_LEAD]u ADJUST
-.          rr #NO_TRAP_RESET
-.       \}
-.       el \{ .DOC_LEAD \\n[#TOC_LEAD]u \}
-.    \}
 .    sp |\\n[#T_MARGIN]u-\\n[#DOC_LEAD]u
 .    if \\n[#SLANT_ON] \{\
 \*[SLANTX]\c
@@ -15662,7 +15739,9 @@
 .       nr #KERN_WAS_ON 1
 .       KERN OFF
 .    \}
+.    rr #IN_ITEM
 .    IL
+.    nr #IN_ITEM 1
 .    ll \\n[#CURRENT_L_LENGTH]u \" Set ll again because IL turns IB off.
 .    TRAP OFF
 .    HI \\n[#HL_INDENT\\n[#DEPTH]]u
@@ -15774,8 +15853,8 @@
 .    rr #SEP_TYPE
 .    EOL
 .    if \\n[#REF]=1 \{\
-.       IL +\\*[$REF_BIB_INDENT]
-.       ti \\n[#L_INDENT]u-\\*[$REF_BIB_INDENT]
+.       IL +\\n[#REF_BIB_INDENT]u
+.       ti \\n[#L_INDENT]u-\\n[#REF_BIB_INDENT]u
 .    \}
 .    TRAP
 .    if \\n[#KERN_WAS_ON]=1 \{\
@@ -16071,6 +16150,8 @@
 .   rr #RESTORE_PREV_INDENT
 .   rr #ORIG_L_LENGTH
 .   rr #CURRENT_L_LENGTH
+.   rr #IN_ITEM
+.   rr #IN_ITEM_L_INDENT
 .END
 \#
 \#
@@ -16333,18 +16414,23 @@
 \# OUTPUT BLANK PAGES
 \# ------------------
 \# *Argument:
-\#   <number of blank pages to output> [ NULL ]
+\#   <number of blank pages to output> [ DIVIDER [ NULL ] ]
 \# *Function:
 \#   Outputs blank pages.
 \# *Notes:
 \#   If recto/verso, each page is recto/verso, even if there's
 \#   nothing on it.
 \#
-\#   The argument to BLANKPAGE is non-optional.
+\#   The 1st argument to BLANKPAGE is non-optional.  DIVIDER is for
+\#   blank pages before endnotes, bibliographies, tocs, new chapters.
 \#
 .MAC BLANKPAGE END
 .    nr #HOW_MANY \\$1
 .    nr #PAGES 0 1
+.    if \\n[#LINENUMBERS] \{\
+.       nr #LINENUMBERS_WERE_ON 1
+.       NUMBER_LINES OFF
+.    \}
 .    while \\n+[#PAGES]<=\\n[#HOW_MANY] \{\
 .       if \\n[#HEADERS_ON]=1 \{\
 .          nr #HEADERS_WERE_ON 1
@@ -16369,14 +16455,37 @@
 .          if \\n[#PAGINATE_WAS_ON] \{ .PAGINATE \}
 .       \}
 .\}
-.    NEWPAGE
-.    if \\n[#FOOTERS_WERE_ON] \{ .FOOTERS \}
-.    if \\n[#PAGE_NUM_V_POS]=2 \{\
-.       if \\n[#PAGINATE_WAS_ON] \{ .PAGINATE \}
+.    shift
+.    ie '\\$1'DIVIDER' \{\
+.       if \\n[#FOOTERS_WERE_ON] \{ .FOOTERS \}
+.       if \\n[#PAGE_NUM_V_POS]=2 \{\
+.          if \\n[#PAGINATE_WAS_ON] \{\
+.             nr #RESTORE_PAGINATION 1
+.          \}
+.       \}
+.       shift
+.       if '\\$1'NULL' \{ .nr #PAGE_NUM_ADJ -\\n[#HOW_MANY] \}
+.    \}
+.    el \{\
+.       if '\\$1'' \{\
+.          NEWPAGE
+.          if \\n[#FOOTERS_WERE_ON] \{ .FOOTERS \}
+.          if \\n[#PAGE_NUM_V_POS]=2 \{\
+.             if \\n[#PAGINATE_WAS_ON] \{ .PAGINATE \}
+.          \}
+.       \}
+.       if '\\$1'NULL' \{\
+.          NEWPAGE
+.          if \\n[#FOOTERS_WERE_ON] \{ .FOOTERS \}
+.          if \\n[#PAGE_NUM_V_POS]=2 \{\
+.             if \\n[#PAGINATE_WAS_ON] \{ .PAGINATE \}
+.          \}
+.       \}
 .    \}
 .    if \\n[#PAGINATE]=1 \{\
-.       if '\\$2'NULL' \{ .nr #PAGE_NUM_ADJ -\\n[#HOW_MANY] \}
+.       if '\\$1'NULL' \{ .nr #PAGE_NUM_ADJ -\\n[#HOW_MANY] \}
 .    \}
+.    if \\n[#LINENUMBERS_WERE_ON] \{ .NUMBER_LINES RESUME \}
 .    rr #HOW_MANY
 .    rr #HEADERS_WERE_ON
 .    rr #FOOTERS_WERE_ON
@@ -16412,7 +16521,7 @@
 .    ie \\n[#ADJ_DOC_LEAD]=1 \{\
 .       nr #LINES_PER_PAGE 0 1
 .       nr #DOC_LEAD_ADJ 0 1
-.       nr #DEPTH_TO_B_MARGIN \\n[#PAGE_LENGTH]-\\n[#ORIGINAL_B_MARGIN]-1v
+.       nr #DEPTH_TO_B_MARGIN \\n[#PAGE_LENGTH]-\\n[#ORIGINAL_B_MARGIN]-\\n[.v]
 .\" Get the number of unadjusted lines that fit on the page; always a
 .\" bit short of the bottom margin
 .       while \\n[#T_MARGIN]+(\\n[#DOC_LEAD]*\\n+[#LINES_PER_PAGE])<\\n[#DEPTH_TO_B_MARGIN] \{\
@@ -16421,9 +16530,10 @@
 .       nr #LINES_PER_PAGE -1
 .\" Add machine units, 1 at a time, increasing the leading until the
 .\" new leading fills the page properly
-.       while \\n[#T_MARGIN]+(\\n[#DOC_LEAD]+\\n+[#DOC_LEAD_ADJ]*\\n[#LINES_PER_PAGE])<\\n[#DEPTH_TO_B_MARGIN] \{\
+.       while \\n[#T_MARGIN]+(\\n[#DOC_LEAD]+\\n+[#DOC_LEAD_ADJ]*\\n[#LINES_PER_PAGE])<=\\n[#DEPTH_TO_B_MARGIN] \{\
 .
 .\}
+.       nr #UNADJUSTED_DOC_LEAD \\n[#DOC_LEAD]
 .       DOC_LEAD \\n[#DOC_LEAD]u+\\n[#DOC_LEAD_ADJ]u
 .\" The "visual" bottom margin is what \n(nl would report on the
 .\" last line before the FOOTER trap is sprung
@@ -16533,7 +16643,7 @@
 .END
 \#
 \#
-\# This .em (for all DOC_TYPEs except 4 [LETTER]) ensures that
+\# This .em (for all DOC_TYPEs, except 4 [LETTER]) ensures that
 \# deferred footnotes that happen on the 2nd to last page get
 \# output.
 \#
@@ -16573,21 +16683,23 @@
 .    FOOTERS OFF
 .    PAGINATION OFF
 .    if \\n[#DOC_TYPE]=4 \{\
-.       br
-.       if !'\\n(.z'' \{ .di \}
+.       if !'\\n(.z'' \{\
+.          br
+.          di
+.       \}
 .       IQ CLEAR
 .       TQ
-.       TAB_SET 1 \\n[#DOC_L_LENGTH]u/2u \\n[#DOC_L_LENGTH]u/2u LEFT
-.       ALD \\n[#DOC_LEAD]u*2u
-.       TAB 1
+.       ie !'\\*[$CLOSE_INDENT]'' \{ .IL \\*[$CLOSE_INDENT] \}
+.       el \{ .IL \\n[#DOC_L_LENGTH]u/2u \}
+.       SP
 .       if \\n[#CLOSING] \{\
-.          nf
 .          CLOSING
+.          br
 .       \}
-.       ALD \\n[#DOC_LEAD]u*3u
+.       ie !'\\*[$SIG_SPACE]'' \{ .ALD \\*[$SIG_SPACE] \}
+.       el \{ .SP 3v \}
 .       PRINT \\*[$AUTHOR_1]
 .    \}
-.    DO_FOOTER
 .END
 \#
 \# Set up a default papersize of US letter
@@ -17004,6 +17116,7 @@
 .ALIAS   COVER_COPYRIGHT_FAMILY           _FAMILY
 .ALIAS   COVER_DOCTYPE_FAMILY             _FAMILY
 .ALIAS   COVER_FAMILY                     _FAMILY
+.ALIAS   COVER_MISC_FAMILY                _FAMILY
 .ALIAS   COVER_SUBTITLE_FAMILY            _FAMILY
 .ALIAS   COVER_TITLE_FAMILY               _FAMILY
 .ALIAS   DOC_COVER_AUTHOR_FAMILY          _FAMILY
@@ -17011,6 +17124,7 @@
 .ALIAS   DOC_COVER_COPYRIGHT_FAMILY       _FAMILY
 .ALIAS   DOC_COVER_DOCTYPE_FAMILY         _FAMILY
 .ALIAS   DOC_COVER_FAMILY                 _FAMILY
+.ALIAS   DOC_COVER_MISC_FAMILY            _FAMILY
 .ALIAS   DOC_COVER_SUBTITLE_FAMILY        _FAMILY
 .ALIAS   DOC_COVER_TITLE_FAMILY           _FAMILY
 .ALIAS   DOCHEADER_FAMILY                 _FAMILY
@@ -17052,12 +17166,14 @@
 .ALIAS   COVER_CHAPTER_TITLE_FONT       _FONT
 .ALIAS   COVER_COPYRIGHT_FONT           _FONT
 .ALIAS   COVER_DOCTYPE_FONT             _FONT
+.ALIAS   COVER_MISC_FONT                _FONT
 .ALIAS   COVER_SUBTITLE_FONT            _FONT
 .ALIAS   COVER_TITLE_FONT               _FONT
 .ALIAS   DOC_COVER_AUTHOR_FONT          _FONT
 .ALIAS   DOC_COVER_CHAPTER_TITLE_FONT   _FONT
 .ALIAS   DOC_COVER_COPYRIGHT_FONT       _FONT
 .ALIAS   DOC_COVER_DOCTYPE_FONT         _FONT
+.ALIAS   DOC_COVER_MISC_FONT            _FONT
 .ALIAS   DOC_COVER_SUBTITLE_FONT        _FONT
 .ALIAS   DOC_COVER_TITLE_FONT           _FONT
 .ALIAS   DOCTYPE_FONT                   _FONT
@@ -17094,12 +17210,14 @@
 .ALIAS   COVER_CHAPTER_TITLE_SIZE       _SIZE
 .ALIAS   COVER_COPYRIGHT_SIZE           _SIZE
 .ALIAS   COVER_DOCTYPE_SIZE             _SIZE
+.ALIAS   COVER_MISC_SIZE                _SIZE
 .ALIAS   COVER_SUBTITLE_SIZE            _SIZE
 .ALIAS   COVER_TITLE_SIZE               _SIZE
 .ALIAS   DOC_COVER_AUTHOR_SIZE          _SIZE
 .ALIAS   DOC_COVER_CHAPTER_TITLE_SIZE   _SIZE
 .ALIAS   DOC_COVER_COPYRIGHT_SIZE       _SIZE
 .ALIAS   DOC_COVER_DOCTYPE_SIZE         _SIZE
+.ALIAS   DOC_COVER_MISC_SIZE            _SIZE
 .ALIAS   DOC_COVER_SUBTITLE_SIZE        _SIZE
 .ALIAS   DOC_COVER_TITLE_SIZE           _SIZE
 .ALIAS   DOCTYPE_SIZE                   _SIZE
@@ -17132,6 +17250,7 @@
 .ALIAS   AUTHOR_COLOR                    _COLOR
 .ALIAS   BLOCKQUOTE_COLOR                _COLOR
 .ALIAS   CHAPTER_TITLE_COLOR             _COLOR
+.ALIAS   CODE_COLOR                      _COLOR
 .ALIAS   COVER_ATTRIBUTE_COLOR           _COLOR
 .ALIAS   COVER_AUTHOR_COLOR              _COLOR
 .ALIAS   COVER_CHAPTER_TITLE_COLOR       _COLOR
@@ -17166,6 +17285,7 @@
 .ALIAS   PAGENUM_COLOR                   _COLOR
 .ALIAS   PARAHEAD_COLOR                  _COLOR
 .ALIAS   QUOTE_COLOR                     _COLOR
+.ALIAS   SECTION_COLOR                   _COLOR
 .ALIAS   SUBHEAD_COLOR                   _COLOR
 .ALIAS   SUBTITLE_COLOR                  _COLOR
 .ALIAS   TITLE_COLOR                     _COLOR
@@ -17175,8 +17295,11 @@
 .ALIAS   BLOCKQUOTE_QUAD            _QUAD
 .ALIAS   COVER_COPYRIGHT_QUAD       _QUAD
 .ALIAS   COVER_MISC_QUAD            _QUAD
+.ALIAS   COVER_QUAD                 _QUAD
 .ALIAS   DOC_COVER_COPYRIGHT_QUAD   _QUAD
 .ALIAS   DOC_COVER_MISC_QUAD        _QUAD
+.ALIAS   DOC_COVER_QUAD             _QUAD
+.ALIAS   DOCHEADER_QUAD             _QUAD
 .ALIAS   DOC_QUAD                   _QUAD
 .ALIAS   ENDNOTE_QUAD               _QUAD
 .ALIAS   ENDNOTE_STRING_QUAD        _QUAD
@@ -17189,18 +17312,19 @@
 \#
 \# Support aliases
 \#
-.ALIAS   COL_BREAK             COL_NEXT
-.ALIAS   DOC_COVER_ADVANCE     COVER_ADVANCE
-.ALIAS   DOC_COVER             COVER
-.ALIAS   DOC_COVERS            COVERS
-.ALIAS   DOC_COVER_LEAD        COVER_LEAD
-.ALIAS   DOC_COVERTITLE        COVERTITLE
-.ALIAS   DO_DOC_COVER          DO_COVER
-.ALIAS   PRINT_FOOTNOTE_RULE   FOOTNOTE_RULE
+.ALIAS   COL_BREAK               COL_NEXT
+.ALIAS   DOC_COVER_ADVANCE       COVER_ADVANCE
+.ALIAS   DOC_COVER               COVER
+.ALIAS   DOC_COVER_COUNTS_PAGES  COVER_COUNTS_PAGES
+.ALIAS   DOC_COVERS              COVERS
+.ALIAS   DOC_COVER_LEAD          COVER_LEAD
+.ALIAS   DOC_COVERTITLE          COVERTITLE
+.ALIAS   DO_DOC_COVER            DO_COVER
+.ALIAS   PRINT_FOOTNOTE_RULE     FOOTNOTE_RULE
 \#
 \# Miscellaneous aliases
-.ALIAS  SECTION       LINEBREAK
-.ALIAS  SECTION_CHAR  LINEBREAK_CHAR
+.ALIAS   SECTION        LINEBREAK
+.ALIAS   SECTION_CHAR   LINEBREAK_CHAR
 \#
 \# Miscellaneous macros to take care of backward compatibility
 \# -----------------------------------------------------------
@@ -17226,8 +17350,12 @@
 \#   Instruct REF to put references in footnotes.
 \#
 .MAC FOOTNOTE_REFS END
-.    if r#EN_REF \{ .rr #EN_REF \}
-.    nr #FN_REF 1
+.    ie !'\\$1'' \{ .rr #FN_REF \}
+.    el \{\
+.       if r#EN_REF \{ .rr #EN_REF \}
+.       nr #FN_REF 1
+.    \}
+.    REF_STYLE NOTE
 .END
 \#
 \# Endnote references
@@ -17236,8 +17364,13 @@
 \#   Instruct REF to collect references for endnotes output.
 \#
 .MAC ENDNOTE_REFS END
-.    if r#FN_REF \{ .rr #FN_REF \}
-.    nr #EN_REF 1
+.    ie !'\\$1'' \{ .rr #EN_REF \}
+.    el \{\
+.       if r#FN_REF \{ .rr #FN_REF \}
+.       nr #EN_REF 1
+.       if !r#EN_MARKER_STYLE \{ .ENDNOTE_MARKER_STYLE SUPERSCRIPT \}
+.    \}
+.    REF_STYLE NOTE
 .END
 \#
 \# Prepare mom for a reference
@@ -17283,6 +17416,8 @@
 \# -------------------------------------------
 \#
 .MAC REF_BRACKETS_START END
+.    if \\n[#FN_REF]=1 \{ .nr #FN_REF 2 \}
+.    if \\n[#EN_REF]=1 \{ .nr #EN_REF 2 \}
 .    ds $CURRENT_EV \\n[.ev]
 .    ev REFERENCE
 .    evc  \\*[$CURRENT_EV]
@@ -17298,32 +17433,49 @@
 .    if '\\$0'REF)' \{ .nop (\\*[REFERENCE]) \}
 .    if '\\$0'REF]' \{ .nop [\\*[REFERENCE]] \}
 .    if '\\$0'REF}' \{ .nop {\\*[REFERENCE]} \}
+.    if '\\$0'REF>' \{ .nop <\\*[REFERENCE]> \}
+.    if \\n[#FN_REF]=2 \{ .nr #FN_REF 1 \}
+.    if \\n[#EN_REF]=2 \{ .nr #EN_REF 1 \}
 .END
 \#
-\# These three pairs of aliases allow users to embed references in
-\# text and have them surrounded by (), [] or {}.
+\# These four pairs of aliases allow users to embed references in
+\# text and have them surrounded by (), [], {} or <>.
 \#
 .ALIAS REF( REF_BRACKETS_START
 .ALIAS REF) REF_BRACKETS_END
 \#
 .ALIAS REF[ REF_BRACKETS_START
-.ALIAS REF{ REF_BRACKETS_START
+.ALIAS REF] REF_BRACKETS_END
 \#
+.ALIAS REF{ REF_BRACKETS_START
 .ALIAS REF} REF_BRACKETS_END
-.ALIAS REF] REF_BRACKETS_END
 \#
-\# Second-line indent for refs
-\# ---------------------------
+.ALIAS REF< REF_BRACKETS_START
+.ALIAS REF> REF_BRACKETS_END
+\#
+.MAC REF_STYLE END
+.    if '\\$1'NOTE' \{\
+.       ds $REF_STYLE NOTE
+.    \}
+.    if '\\$1'BIBLIO' \{\
+.       ds $REF_STYLE BIBLIO
+.    \}
+.END
+\#
+\# Refer indenting
+\# ---------------
 \# *Argument:
 \#   FOOTNOTE | ENDNOTE | BIBLIO <indent for 2nd and subsequent lines of discrete reference entries>
 \# *Function:
-\#   Sets strings $REF_FN_INDENT, $REF_EN_INDENT or $REF_BIB_INDENT.
+\#   Sets registers #REF_FN_INDENT, #REF_EN_INDENT or #REF_BIB_INDENT.
 \# *Notes:
-\#   Indent value requires a unit of measure.
+\#   Indent value requires a unit of measure.  If refs are going
+\#   into footnotes or endnotes, first lines get indented; if going
+\#   into a bibliography, second lines get indented
 \#
 .MAC INDENT_REFS END
-.    if '\\$1'FOOTNOTE' .ds $REF_FN_INDENT \\$2
-.    if '\\$1'ENDNOTE'  .ds $REF_EN_INDENT \\$2
+.    if '\\$1'FOOTNOTE' .ds $REF_FN_INDENT  \\$2
+.    if '\\$1'ENDNOTE'  .ds $REF_EN_INDENT  \\$2
 .    if '\\$1'BIBLIO'   .ds $REF_BIB_INDENT \\$2
 .END
 \#
@@ -17344,40 +17496,57 @@
 \# The remainder of the definitions in this section are modified
 \# versions of the definitions found in the refer module of s.tmac.
 \#
-\# This one is directly from s.tmac.
-\#
 .de @error
 .tm \\n(.F:\\n(.c: macro error: \\$*
 ..
 \#
+\# Underlining unavoidably turns off sentence spacing.
+\#
+.de ref*restore-ss
+\c
+.SS \\*[$SAVED_SS_VAR]
+.if '\\n[.z]'END_NOTES' \{\
+\c
+\E*[PREV]\c
+.\}
+..
 \# The following strings define the order of entries for different
 \# types of references.  Each letter in the string refers to a database
 \# field (A for author, T1/T2 for article and book titles, etc).
-\# Mom is set up for MLA-style bibliographies.  Other styles can be
-\# implemented here by re-ordering the fields.
 \#
-\# Book - type 2
-.ds ref*spec!2 Q A T1 d t l r E S e V a C I D P O
-\# Article within book - type 3
-.ds ref*spec!3 Q A T2 B d t l r E S e V a C I D P O
-\# Journal article - type 1
-.ds ref*spec!1 Q A T2 J S N D P O
-\# Tech report - type 4
-.ds ref*spec!4 Q A T1 R G C I D P O
-\# Internet site - type 0
-.ds ref*spec!0 Q A T2 s E c d o a u O
+.de ref*specs
+.if \\n[#PRINT_STYLE]=1 \{\
+.   char '     \[aq]
+.   char \[oq] \[aq]
+.\}
+.\" Internet site - type 0
+.ds ref*spec!0 i Q A m p T2 s o D c a u n 
+.\" Journal article - type 1
+.ds ref*spec!1 i Q A m p T2 q O J V S N D P n
+.\" Book - type 2
+.ds ref*spec!2 i Q A m p T1 q b d l r E S e V O C I D P t n
+.\" Article within book - type 3
+.ds ref*spec!3 i Q A m p T2 B b d l r E S e V O C I D P t n
+.\" Tech report - type 4
+.ds ref*spec!4 i Q A m p T1 R G O C I D P n
+.\" Magazine or newspaper article - type 5
+.ds ref*spec!5 i Q A m p T2 O M V S N D P n
+..
 \#
 \# Refer's "1st" macro.  Since it is possible to define database
 \# fields using any single letter, we remove all possible string
-\# definitions of the form [X and [x
+\# definitions of the form [X and [x.  Also, reset ref*spec!<n>
+\# strings to their defaults.
 \#
 .de ]-
+.ref*specs
 .rm [A [B [C [D [E [F [G [H [I [J [K [L [M \
     [N [O [P [Q [R [S [T [U [V [W [X [Y [Z \
-.   [a [b [c [d [e [f [g [h [i [j [k [l [m \
+    [a [b [c [d [e [f [g [h [i [j [k [l [m \
     [n [o [p [q [r [s [t [u [v [w [x [y [z
-.rm ref*string
+.if r [e .rr [e \" [e persists if %e field is last
 .rr ref*type
+.rm ref*string
 ..
 \#
 \# Refer's "2nd" macro; builds up a reference with ref*build, and
@@ -17385,14 +17554,24 @@
 \#
 .de ][
 .nr ref*type \\$1
+.if \\n[ref*type]=0 \{\
+.   ie d [C \{\
+.      if !d [I \{\
+.         nr pre-1900 1 \" If pre-1900, MLA allows excluding publisher
+.         nr ref*type 2
+.      \}
+.   \}
+.   el .nr ref*type 2
+.   if d [q .nr ref*type 2
+.\}
 .if \\n[ref*type]=3 \{\
 .   if !'\\*([R'' \{\
 .      nr ref*type 4
-.      ds ref*spec!4 Q A T2 B R C I D P O
+.      ds ref*spec!4 i Q A m p T2 B R O C I D P n
 .   \}
 .   if !'\\*([G'' \{\
 .      nr ref*type 4
-.      ds ref*spec!4 Q A T2 B G C I D P O
+.      ds ref*spec!4 i A m p T2 B G O C I D P O n
 .   \}
 .\}
 .if r [T \{\
@@ -17449,15 +17628,18 @@
 .de ref*end-print
 .\" 10 is abritrary
 .nn 10
+.nr #REF_BIB_INDENT (u;\\*[$REF_BIB_INDENT])
 .ie \\n[#BIB_LIST]=0 \{\
-.in +\\*[$REF_BIB_INDENT]
-.ti -\\*[$REF_BIB_INDENT]
+.   in +\\n[#REF_BIB_INDENT]u
+.   ti -\\n[#REF_BIB_INDENT]u
 .\}
 .el .ITEM
-\\*[ref*string]
+.\" Part of workaround for refer spitting out a blank page if the
+.\" last ref falls on the bottom line.
+\\*[ref*string]\R'ref*num*first-pass +1'\?\R'ref*num +1'\?
 .sp \\n[#BIB_SPACE]u
 .ie \\n[#BIB_LIST]=0 .in
-.el .IL -\\*[$REF_BIB_INDENT]u
+.el .IL -\\n[#REF_BIB_INDENT]u
 .nn 0
 ..
 \#
@@ -17475,11 +17657,9 @@
 .de ref*build
 .if \\n[#PRINT_STYLE]=2 \{\
 .   ds $RESTORE_SS_VAR \\*[$SS_VAR]
-.   SS +4
+.   SS +8
 .\}
-\#.rm ref*string ref*post-punct
 .rm ref*string
-.nr ref*suppress-period 1
 .while \\n[.$] \{\
 .   if d [\\$1 \{\
 .      ie d ref*add-\\$1 .ref*add-\\$1
@@ -17511,23 +17691,112 @@
 \#
 \# %A Author(s)
 .de ref*add-A
-.ref*field A ,
-.if r [A .nr ref*suppress-period \\n([A
+.ds eval*[A \\*([A
+.substring eval*[A -1
+.if '\\*[eval*[A]'.' \{\
+.   if !'\\*[$REF_STYLE]'NOTE' .chop [A
+.\}
+.\" Per MLA, NOTE should not use idem, therefore if %i contains other than
+.\" idem (eg. ed., trans.), transpose it to after author's name
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie !'\\*[idem]'' .ref*field A "" "" ", \\*[idem]"
+.   el .ref*field A
+.   rm idem
+.el .ref*field A
+.\}
+.if \\n([A .nr ref*suppress-period 1
+..
+\# %i Idem.  BIBLIO: In all instances, removes %A field and replaces
+\# it with a dash; if %i field contains other than the word, idem,
+\# appends it to the dash
+.de ref*add-i
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie '\\*([i'idem' .rm [i
+.   el .ds idem \\*([i
+.\}
+.el \{\
+.   ie '\\*([i'idem' \{\
+.      rm [A
+.      rm [i
+.      ref*field i "" \[idem] "" " "
+.   \}
+.   el \{\
+.      ds eval*[i \\*([i
+.      substring eval*[i -1
+.      if '\\*[eval*[i]'.' \{\
+.         chop [i
+.         ds idem \\*([i
+.      \}
+.      rm [i
+.      rm [A
+.      ref*field i "" \[idem] ", \\*[idem]" " "
+.   \}
+.\}
+..
+\# %m Multiple authors (et al.)
+.de ref*add-m
+.if !'\\*[$REF_STYLE]'NOTE' \{\
+.   ds eval*[m \\*([m
+.   substring eval*[m -1
+.   if '\\*[eval*[m]'.' .chop [m
+.\}
+.ref*field m ,
+..
+\# %p Post-author string (eg. Preface, Foreword, etc)
+.de ref*add-p
+.\" Convert first letter to uppercase, per MLA, if BIBLIO
+.if '\\*[$REF_STYLE]'BIBLIO' \{\
+.   ds initial*cap \\*([p
+.   substring initial*cap 0 0
+.   ds [p*string \\*([p
+.   substring [p*string 1
+.   ds [p \E*[UC]\\*[initial*cap]\E*[LC]\\*[[p*string]
+.\}
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field p ,
+.el .ref*field p . " "
+..
+\# %Q Author(s) when author is not a person
+.de ref*add-Q
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field Q
+.el .ref*field Q
 ..
 \# %T Title (generic)
 .de ref*add-T1
-.ref*field T . " \E*[IT]" "" \E*[PREV]
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field T , \E*[IT] \E*[ref*restore-ss]
+.el \{\
+.   ie !'\\*([A'' .ref*field T . " \E*[IT]" \E*[ref*restore-ss]
+.   el \{\
+.      ie !'\\*([Q'' .ref*field T . " \E*[IT]" \E*[ref*restore-ss]
+.      el .ref*field T . \E*[IT] \E*[ref*restore-ss]
+.   \}
+.\}
 .if \\n([T .nr ref*suppress-period \\n([T
+.
 ..
 \# %T Title of a chapter or article
 .de ref*add-T2
-.ref*field T . " \(lq" "" "\(rq"
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ref*field T , \[lq] "" \[rq]
+.\}
+.el \{\
+.   ie '\\*([A'' \{\
+.      ref*field T . \[lq] "" \[rq]
+.      if !'\\*([Q''.ref*field T . " \[lq]" "" \[rq]
+.   \}
+.   el .ref*field T . " \[lq]" "" \[rq]
+.\}
 .if \\n([T .nr ref*suppress-period \\n([T
 ..
 \# %B Book title (when citing an article from a book)
 .de ref*add-B
-.ie \\n([T .ref*field B "" ".\E*[IT]" "" \E*[PREV]
-.el .ref*field B . " \E*[IT]" "" \E*[PREV]
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie \\n([T .ref*field B "" \E*[IT] \E*[ref*restore-ss]
+.   el .ref*field B , \E*[IT] \E*[ref*restore-ss]
+.\}
+.el \{\
+.   ie \\n([T .ref*field B "" ".\E*[IT]" \E*[ref*restore-ss]
+.   el .ref*field B . " \E*[IT]" \E*[ref*restore-ss]
+.\}
 \# refer doesn't set reg [T to 1 for these book titles, so we do it here
 .ds eval*[B \\*([B
 .substring eval*[B -1
@@ -17536,25 +17805,116 @@
 .if '\\*[eval*[B]'?' .nr [T 1
 .rm eval*[B
 ..
+\# %q Titles that must go in quotes (e.g. an unpublished dissertation)
+.de ref*add-q
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field q , \[lq] "" \[rq]
+.el \{\
+.   ie !'\\*([A'' .ref*field q . " \[lq]" "" \[rq]
+.   el \{\
+.      ie !'\\*([Q'' .ref*field q . " \[lq]" "" \[rq]
+.      el .ref*field q . \[lq] "" \[rq]
+.   \}
+.\}
+..
 \# %R Report number for technical reports
 .de ref*add-R
 .ref*field R . " "
 ..
 \# %J Journal name
 .de ref*add-J
-.ie \\n([T .ref*field J "" " \E*[IT]" "" \E*[PREV]
-.el .ref*field J . " \E*[IT]" "" \E*[PREV]
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie \\n([T .ref*field J "" "\E*[IT]" \E*[ref*restore-ss]
+.   el .ref*field J , "\E*[IT]" \E*[ref*restore-ss]
+.\}
+.el \{\
+.   ie \\n([T .ref*field J "" " \E*[IT]" \E*[ref*restore-ss]
+.   el .ref*field J . " \E*[IT]" \E*[ref*restore-ss]
+.\}
+..
+\# %M Magazine or newspaper name
+.de ref*add-M
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie \\n([T .ref*field M "" "\E*[IT]" \E*[ref*restore-ss]
+.   el .ref*field M , "\E*[IT]" \E*[ref*restore-ss]
+.\}
+.el \{\
+.   ie \\n([T .ref*field M "" " \E*[IT]" \E*[ref*restore-ss]
+.   el .ref*field M . " \E*[IT]" \E*[ref*restore-ss]
+.\}
 ..
 \# %E Editor(s)
 .de ref*add-E
+.ds eval*[E \\*([E
+.substring eval*[E -1
+.if '\\*[eval*[E]'.' \{\
+.   if !\\n[#FN_REF]+\\n[#EN_REF] .chop [E
+.   rm eval*[E
+.\}
+.\" Workaround for join-authors also joining editors.  MLA style
+.\" requires a comma after first editor only if there are more than
+.\" two, whereas join-authors always puts a comma after the first if
+.\" there's more than one.
+.rm eval*[E
+.nr position 1 1
+.nr counter 1 1
+.while !'\\*[eval*[E]',' \{\
+.   ds eval*[E \\*([E
+.   substring eval*[E \\n+[position] \\n[position]
+.   if \\n+[counter]>30 .break \" 30 is abitrary
+.\}
+.\" Check for " and"
+.if '\\*[eval*[E]',' \{\
+.   ds eval*[E \\*([E
+.   nr and-check \\n[position]+4
+.   substring eval*[E \\n+[position] \\n[and-check]
+.\}
+.if '\\*[eval*[E]' and' \{\
+.   nr counter 1 1
+.   nr start-range -1 1
+.   nr end-range 3 1
+.   while !'\\*[eval*[E]', and' \{\
+.      ds eval*[E \\*([E
+.      substring eval*[E \\n+[start-range] \\n+[end-range]
+.      if \\n+[counter]>50 .break \" just in case; 50 is arbitrary
+.   \}
+.   if '\\*[eval*[E]', and' \{\
+.      length len*[E \\*([E
+.      nr rhs \\n[len*[E]-\\n[start-range]
+.      ds lhs \\*([E
+.      ds rhs \\*([E
+.      substring lhs 0 \\n[start-range]-1
+.      substring rhs -(\\n[rhs]-1)
+.      ds [E \\*[lhs]\\*[rhs]
+.   \}
+.   rm lhs
+.   rm rhs
+.   rr and-check
+.   rr counter
+.   rr start-range
+.   rr end-range
+.   rr len*[E
+.\}
+.\" End workaround
 .ie !\\n[ref*type]=0 \{\
 .   ie \\n([E>0 \{\
-.      ie \\n([T .ref*field E "" " Eds. "
-.      el .ref*field E . " Eds. "
+.      ie '\\*[$REF_STYLE]'NOTE' \{\
+.         ie \\n([T .ref*field E "" "ed. "
+.         el .ref*field E , "ed. "
+.      \}
+.      el \{\
+.         ie \\n([T .ref*field E "" " Eds. "
+.         el .ref*field E . " Eds. "
+.      \}
 .   \}
 .   el \{\
-.      ie \\n([T .ref*field E "" " Ed. "
-.      el .ref*field E . " Ed. "
+.      ie '\\*[$REF_STYLE]'NOTE' \{\
+.         ie \\n([T .ref*field E "" "ed. "
+.         el .ref*field E , "ed. "
+.      \}
+.      el \{\
+.         ie \\n([T .ref*field E "" " Ed. "
+.         el .ref*field E . " Ed. "
+.      \}
 .   \}
 .\}
 .el \{\
@@ -17562,21 +17922,30 @@
 .   el .ref*field E . " "
 .\}
 .rr [T
+.rr [E
 ..
 \# %e Edition
 .de ref*add-e
-.ie \\n([T .ref*field e "" " " " edition"
-.el .ref*field e . " " " edition"
+.ie \\n([T .ref*field e "" "" " ed."
+.el \{\
+.   ie '\\*[$REF_STYLE]'NOTE' .ref*field e , "" " ed."
+.   el .ref*field e . " " " ed."
+.\}
+.nr ref*suppress-period 1
+.nr [e 1
 .rr [T
 ..
-\# %V Volume (of a journal, or series of books)
+\# %V Volume (of a journal, or series of books); for journals, %N may be preferable
 .de ref*add-V
 .if \\n[ref*type]=1 \{\
 .   ref*field V 
 .\}
 .if \\n[ref*type]=2 \{\
-.   ie \\n([T .ref*field V "" " "
-.   el .ref*field V . " "
+.   ie '\\*[$REF_STYLE]'NOTE' .ref*field V , "vol. "
+.   el \{\
+.      ie \\n([T .ref*field V "" " Vol. "
+.      el .ref*field V . " Vol. "
+.   \}
 .\}
 .if \\n[ref*type]=3 \{\
 .   ie \\n([T .ref*field V "" " "
@@ -17594,8 +17963,14 @@
 .   ref*field S
 .\}
 .if \\n[ref*type]=2 \{\
-.   ie \\n([T .ref*field S "" " "
-.   el .ref*field S . " "
+.   ie '\\*[$REF_STYLE]'NOTE' \{\
+.      ie \\n([T .ref*field S
+.      el .ref*field S ,
+.   \}
+.   el \{\
+.      ie \\n([T .ref*field S "" " "
+.      el .ref*field S . " "
+.   \}
 .\}
 .if \\n[ref*type]=3 \{\
 .   ie \\n([T .ref*field S "" " "
@@ -17611,49 +17986,139 @@
 ..
 \# %C City
 .de ref*add-C
-.ie \\n([T .ref*field C "" " "
-.el .ref*field C . " "
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie r [d \{\
+.      ref*field C
+.      rr [d
+.   \}
+.   el \{\
+.      ref*field C "" \*[FU 2](
+.   \}
+.   if \\n([T .nr ref*suppress-period \\n([T
+.\}
+.el \{\
+.   ie \\n([T .ref*field C "" " " " "
+.   el \{\
+.      ie r [e .ref*field C "" " "
+.      el .ref*field C . " "
+.   \}
+.\}
 .rr [T
+.rr [e
 ..
 \# %I Publisher (I stands for Issuer)
 .de ref*add-I
-.ie !'\\*([C'' .ref*field I :
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie !'\\*([C'' .ref*field I :
+.   el .ref*field I "" (
+.\}
 .el \{\
-.   ie \\n([T .ref*field I "" " "
-.   el .ref*field I . " "
+.   ie !'\\*([C'' .ref*field I :
+.   el \{\
+.      ie \\n([T .ref*field I "" " "
+.      el .ref*field I . " "
+.   \}
 .\}
 .rr [T
 ..
 \# %D Date of publication
 .de ref*add-D
+.if \\n[ref*type]=0 \{\
+.   ie '\\*[$REF_STYLE]'NOTE' .ref*field D ,
+.   el .ref*field D . " "
+.\}
 .if \\n[ref*type]=1 \{\
-.   ie !'\\*([V''.ref*field D "" "(" ")"
-.   el .ref*field D
+.   ref*field D "" "(" ")"
+.\}
+.if \\n[ref*type]=2 \{\
+.   ie '\\*[$REF_STYLE]'NOTE' .ref*field D , "" )
+.   el .ref*field D ,
 .\}
-.if \\n[ref*type]=2 .ref*field D ,
 .if \\n[ref*type]=3 \{\
-.   ie '\\*([C'' \{\
-.      ie '\\*([I'' .ref*field D . " "
+.   ie !'\\*([C'' \{\
+.      ie '\\*[$REF_STYLE]'NOTE' .ref*field D , "" )
 .      el .ref*field D ,
 .   \}
-.   el .ref*field D ,
+.   el \{\
+.      if '\\*([I'' \{\
+.         ds eval*[D \\*([D
+.         substring eval*[D 0 -4
+.         ie '\\*[eval*[D]'1' .ds kern \*[BU3]
+.         el .ds kern \*[BU2]
+.         ie \\n[#PRINT_STYLE]=2 \{\
+.           if '\\*[$REF_STYLE]'NOTE' .ref*field D "" (\\*[kern] )
+.         \}
+.         el .ref*field D
+.      \}
+.      rm eval*[D
+.      rm kern
+.   \}
 .\}
 .if \\n[ref*type]=4 .ref*field D ,
+.if \\n[ref*type]=5 .ref*field D
+.ds eval*[D \\*([D
+.substring eval*[D -1
+.if '\\*[eval*[D]'.' .nr ref*suppress-period 1
 ..
 \# %P Page number(s)
 .de ref*add-P
-.ie \\n[ref*type]=1 .ref*field P : 
-.el .ref*field P . " "
+.if \\n[ref*type]=5 .nr ref*type 1
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie \\n[ref*type]=1 .ref*field P : "" .
+.   el .ref*field P "" "\|"
+.   nr ref*suppress-period 1
+.\}
+.el \{\
+.   ie \\n[ref*type]=1 .ref*field P \|: 
+.   el \{\
+.      ie d [n .ref*field P . \| .
+.      el .ref*field P . " "
+.   \}
+.\}
 ..
 \# %G Gov't. ordering number
 .de ref*add-G
-.ref*field G . " "
+.ie '\\*[$REF_STYLE]'NOTE' ref*field G ,
+.el .ref*field G . " "
 ..
-\# %O Other (usually goes at end of ref)
+\# %O Other (info that goes after %T [or %B] but is hard to categorize; eg a dissertation)
 .de ref*add-O
-.ref*field O . " "
-.ie r [O .nr ref*suppress-period \\n([O
-.el .nr ref*suppress-period 1
+.ds eval*[O \\*([O
+.substring eval*[O -1
+.if '\\*[eval*[O]'.' .nr [O 1
+.ds initial*cap \\*([O
+.substring initial*cap 0 0
+.ds [O*string \\*([O
+.substring [O*string 1
+.if '\\*[$REF_STYLE]'BIBLIO' \{\
+.   ds [O \E*[UC]\\*[initial*cap]\E*[LC]\\*[[O*string]
+.\}
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field O ,
+.el \{\
+.   if \\n([O=1 .chop [O
+.   ie r [e .ref*field O "" " "
+.   el \{\
+.      ie !d [A .ref*field O
+.      el .ref*field O . " "
+.   \}
+.\}
+.rr [O
+.rr [e
+..
+\# %n Annotations (after ref)
+.de ref*add-n
+.ds eval*[n \\*([n
+.substring eval*[n -1
+.if '\\*[eval*[n]'.' .chop [n
+.if '\\*[eval*[n]'?' .nr [n 1
+.if '\\*[eval*[n]'!' .nr [n 1
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field n ,
+.el \{\
+.   ie !'\\*([P'' .ref*field n "" " "
+.   el .ref*field n . " "
+.\}
+.if r [n .nr ref*suppress-period 1
+.rr [n
 ..
 \#
 .de ref*add-dflt
@@ -17664,21 +18129,37 @@
 \# -------------
 \# %d date of publication (the orignal date of publication)
 .de ref*add-d
-.ie \\n([T .ref*field d "" " "
-.el .ref*field d . " "
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ref*field d "" ( ;
+.   nr [d 1
+.\}
+.el \{\
+.   ie \\n([T .ref*field d "" " "
+.   el .ref*field d . " "
+.\}
 .rr [T
 ..
-\# %a additions (such as a new intro to reprints)
-.de ref*add-a
-.ie \\n([T .ref*field a "" " "
-.el .ref*field a . " "
+\# %b main author when citing from a preface, introduction, foreword
+\# or afterword
+.de ref*add-b
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie \\n([T .ref*field b "" "by"
+.   el .ref*field b , "by "
+.\}
+.el \{\
+.   ie \\n([T .ref*field b "" " By "
+.   el .ref*field b . " By "
+.\}
 .rr [T
 ..
 \# %t title, if different from original title (the T field, which s/b
 \# the original title)
 .de ref*add-t
-.ie \\n([T .ref*field t "" " Rpt. as \E*[IT]" "" \E*[PREV]
-.el .ref*field t . " Rpt. as \E*[IT]" "" \E*[PREV]
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field t , "rpt. of \E*[IT] " \E*[ref*restore-ss]
+.el \{\
+.   ie \\n([T .ref*field t "" " Rpt. of \E*[IT] " \E*[ref*restore-ss]
+.   el .ref*field t . " Rpt. of \E*[IT] " \E*[ref*restore-ss]
+.\}
 .rr [T
 ..
 \#
@@ -17686,14 +18167,23 @@
 \# ----------------
 \# %l Trans(l)ator
 .de ref*add-l
-.ie \\n([T .ref*field l "" " Trans. "
-.el .ref*field l . " Trans. "
+.ie '\\*[$REF_STYLE]'NOTE' \{\
+.   ie \\n([T .ref*field l "" "trans. "
+.   el .ref*field l , "trans. "
+.\}
+.el \{\
+.   ie \\n([T .ref*field l "" " Trans. "
+.   el .ref*field l . " Trans. "
+.\}
 .rr [T
 ..
 \# %r Translato(r) and edito(r)
 .de ref*add-r
-.ie \\n([T .ref*field r "" " Trans. and Ed. "
-.el .ref*field r . " Trans. and Ed. " 
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field r , "trans. and ed. "
+.el \{\
+.   ie \\n([T .ref*field r "" " Trans. and ed. "
+.   el .ref*field r . " Trans. and ed. " 
+.\}
 .rr [T
 ..
 \#
@@ -17701,43 +18191,66 @@
 \# --------
 \# %s Site name
 .de ref*add-s
-.ie \\n([s .ref*field s "" ".\E*[IT]" "" \E*[PREV]
-.el .ref*field s . " \E*[IT]" "" \E*[PREV]
-.\" refer doesn't set reg [T to 1 for these book titles, so we do it here
-.ds eval*[s \\*([s
-.substring eval*[s -1
-.rr [T
-.if '\\*[eval*[s]'!' .nr [T 1
-.if '\\*[eval*[s]'?' .nr [T 1
-.rm eval*[s
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field s , \E*[IT] \E*[ref*restore-ss]
+.el \{\
+.ie \\n([s .ref*field s "" ".\E*[IT]" \E*[ref*restore-ss]
+.el .ref*field s . " \E*[IT]" \E*[ref*restore-ss]
+.\}
+.\" refer doesn't set reg [T to 1 for these titles, so we do it here
+.if !'\\*[$REF_STYLE]'NOTE' \{\
+.   ds eval*[s \\*([s
+.   substring eval*[s -1
+.   rr [T
+.   if '\\*[eval*[s]'.' .nr [T 1
+.   if '\\*[eval*[s]'!' .nr [T 1
+.   if '\\*[eval*[s]'?' .nr [T 1
+.   rm eval*[s
+.\}
 ..
-\# %c content of site, if unclear (i.e. advertisement, cartoon,
-\# interview, etc.)
+\# %c content of site (ie. Web, Online posting, etc)
 .de ref*add-c
-.ie \\n([T .ref*field c "" " "
-.el .ref*field c . " "
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field c ,
+.el \{\
+.   ie \\n([T .ref*field c "" " "
+.   el .ref*field c . " "
+.\}
 .rr [T
 ..
 \# %o organization, group or sponsor of site
 .de ref*add-o
-.ie \\n([T .ref*field o "" " "
-.el .ref*field o . " "
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field o ,
+.el \{\
+.   ie \\n([T .ref*field o "" " "
+.   el .ref*field o . " "
+.\}
 .rr [T
 ..
 \# %a access date, i.e. the date you read it
 .de ref*add-a
-.ie \\n([T .ref*field a "" " "
-.el .ref*field a . " "
+.ie '\\*[$REF_STYLE]'NOTE' .ref*field a ,
+.el \{\
+.   ie \\n([T .ref*field a "" " "
+.   el .ref*field a . " "
+.\}
 .rr [T
 ..
 \# %u URL
 .de ref*add-u
-.ref*field u "" " <" ">"
+.ref*field u "" < >
 .rr [T
 ..
+.de ref*add-z
+.ref*field z
+..
 \#
 \# Build up reference string from ref*add-<x> macros.
 \#
+\# First, a string to ensure next field's font is reset to roman
+\# (TYPESET) or non-underlined (TYPEWRITE)
+\#
+.ie !n .ds ref*roman \f[R]\X'ps: exec decornone'\?\R'#UNDERLINE_ON 0'\?
+.el .ds ref*roman \f[R]\?\R'#UNDERLINE_ON 0'\?
+\#
 .de ref*field
 .if d ref*string \{\
 .   ie d ref*post-punct \{\
@@ -17746,8 +18259,8 @@
 .   \}
 .   el .as ref*string "\\$2 \"
 .\}
-.as ref*string "\\$3\\*([\\$1\\$4
-.if \\n[.$]>4 .ds ref*post-punct "\\$5
+.as ref*string "\\$3\\*([\\$1\\$4\E*[ref*roman]
+.if \\n[.$]>4 .ds ref*post-punct "\\$5\E*[ref*roman]
 .nr ref*suppress-period 0
 ..
 \#
@@ -17883,7 +18396,7 @@
 .    nr MN-size \\n[.ps]
 .    ps
 .    if \\n[#PRINT_STYLE]=1 \{\
-.       ps 12
+.       ps \\*[$TYPEWRITER_PS]
 .       nr MN-size \\n[.ps]
 .       ps
 .    \}
@@ -18138,4 +18651,4 @@
 .  if !\\n[#no-repeat-MN-right]=1 .vpt 1
 ..
 \#
-\# vim: ft=groff:
+\# vim: ft=groff: encoding=latin1: fileencoding=latin1: nomodified:
diff -ruN groff-1.20.1/contrib/mom/TODO groff-1.21/contrib/mom/TODO
--- groff-1.20.1/contrib/mom/TODO	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/mom/TODO	2010-12-31 08:33:09.000000000 +0100
@@ -16,11 +16,6 @@
 Capability of generating a separate file for TOCs, for collating
 and processing with gs/ps2pdf.
 
-UNDERLINING
------------
-Explore "the ultimative underline macro" for possible inclusion
-into mom.
-
 NUMBERED HEADS, SUBHEADS and PARAHEADS
 --------------------------------------
 Macros to set numbering style (roman, arabic, alpha, etc)?
diff -ruN groff-1.20.1/contrib/pdfmark/ChangeLog groff-1.21/contrib/pdfmark/ChangeLog
--- groff-1.20.1/contrib/pdfmark/ChangeLog	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/pdfmark/ChangeLog	2010-12-31 08:33:09.000000000 +0100
@@ -1,3 +1,35 @@
+2010-12-23  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	Update copyright notices; pdfmark.tmac bug-fix.
+
+	* pdfmark.tmac: Update copyright notices.
+	(pdf*href.mark.resolve): Avoid premature removal, by aliasing to...
+	(pdf*href.mark.begin): ...this, rather than renaming.
+
+	* pdfroff.sh, pdfroff.man: Update copyright notices.
+
+2010-12-14  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	Clean up handling of temporary files directory.
+
+	* .cvsignore (pdfroff-*): Ignore sub-directories matching this.
+	* Makefile.sub (MOSTLCLEANDIRADD): Schedule them for removal.
+
+2010-12-02  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	Address potential temporary file security vulnerabilities.
+
+	* pdfroff.sh (GROFF_TMPDIR): Use mktemp(1) to assign it, if possible;
+	fall back to ${TMPDIR}, ${TMP} or ${TEMP} if unsuccessful.
+	* pdfroff.man: Document it.
+
+2009-08-16  Colin Watson  <cjwatson@debian.org>
+
+	Make pdfroff's GhostScript invocation safer.
+
+	* pdfroff.sh (PDFROFF_POSTPROCESSOR_COMMAND): Add `-dSAFER' option.
+	* pdfroff.man: Document it.
+
 2008-12-28  Keith Marshall  <keith.d.marshall@ntlworld.com>
 
 	Avoid phantom line wrapping in pdfhref hot-spots.
diff -ruN groff-1.20.1/contrib/pdfmark/Makefile.sub groff-1.21/contrib/pdfmark/Makefile.sub
--- groff-1.20.1/contrib/pdfmark/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/pdfmark/Makefile.sub	2010-12-31 08:33:09.000000000 +0100
@@ -29,6 +29,9 @@
 PDFDOCFILES=\
   pdfmark.pdf
 
+MOSTLYCLEANDIRADD=\
+  pdfroff-*
+
 MOSTLYCLEANADD=\
   gnu.eps \
   $(PDFDOCFILES) \
diff -ruN groff-1.20.1/contrib/pdfmark/pdfmark.tmac groff-1.21/contrib/pdfmark/pdfmark.tmac
--- groff-1.20.1/contrib/pdfmark/pdfmark.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/pdfmark/pdfmark.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -3,7 +3,7 @@
 
 pdfmark.tmac
 
-Copyright (C) 2004, 2005, 2006, 2007, 2009
+Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010
   Free Software Foundation, Inc.
      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 
@@ -1592,7 +1592,7 @@
 .   \" "pdf*href.mark.end" macro has nothing further to do.
 .   \"
 .   pdf*href.mark.resolve \\$@
-.   rn pdf*href.mark.resolve pdf*href.mark.begin
+.   als pdf*href.mark.begin pdf*href.mark.resolve
 .   als pdf*href.mark.end pdf*href.mark.idle
 .   \}
 .el \{\
diff -ruN groff-1.20.1/contrib/pdfmark/pdfroff.man groff-1.21/contrib/pdfmark/pdfroff.man
--- groff-1.20.1/contrib/pdfmark/pdfroff.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/pdfmark/pdfroff.man	2010-12-31 08:33:09.000000000 +0100
@@ -7,11 +7,11 @@
 
 File position: <groff-source>/contrib/pdfmark/pdfroff.man
 
-Last update: 5 Jan 2009
+Last update: 23-Dec-2010
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2007, 2009, 2010, Free Software Foundation, Inc.
 written by Keith Marshall <keith.d.marshall@ntlworld.com>
 
 Permission is granted to copy, distribute and/or modify this document
@@ -521,7 +521,7 @@
 .IP
 .I
 .ad l
-.NH gs \-dBATCH \-dQUIET \-dNOPAUSE \-sDEVICE=pdfwrite \-sOutputFile=\-
+.NH gs \-dBATCH \-dQUIET \-dNOPAUSE \-dSAFER \-sDEVICE=pdfwrite \-sOutputFile=\-
 .ad
 .RE
 .
@@ -645,10 +645,24 @@
 .P
 Temporary files, created by
 .BR pdfroff ,
-are placed in the directory specified by environment variables (see
-section
-.BR ENVIRONMENT ),
-and named according to the convention
+are placed in the file system hierarchy,
+in or below the directory specified by environment variables
+(see section
+.BR ENVIRONMENT ).
+If
+.BR mktemp (@MAN1EXT@)
+is available,
+it is invoked to create a private subdirectory of
+the nominated temporary files directory,
+(with subdirectory name derived from the template
+.BR pdfroff-XXXXXXXXXX );
+if this subdirectory is successfully created,
+the temporary files will be placed within it,
+otherwise they will be placed directly in the directory
+nominated in the environment.
+.P
+All temporary files themselves
+are named according to the convention
 .BI pdf $$ .*\c
 \&, where
 .I $$
diff -ruN groff-1.20.1/contrib/pdfmark/pdfroff.sh groff-1.21/contrib/pdfmark/pdfroff.sh
--- groff-1.20.1/contrib/pdfmark/pdfroff.sh	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/pdfmark/pdfroff.sh	2010-12-31 08:33:09.000000000 +0100
@@ -3,7 +3,7 @@
 #
 # Function: Format PDF Output from groff Markup
 #
-# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2009, 2010, Free Software Foundation, Inc.
 # Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 # 
 # This file is part of groff.
@@ -135,9 +135,40 @@
       echo $2`
   fi
 #
-# Set up temporary/intermediate file locations.
+# Set up temporary/intermediate file locations, with traps to
+# clean them up on exit.  Note that, for greater portability, we
+# prefer to refer to events by number, rather than by symbolic
+# names; thus, the EXIT event is trapped as event zero.
+#
+  export TMPDIR GROFF_TMPDIR
+  TMPDIR=${GROFF_TMPDIR=${TMPDIR-${TMP-${TEMP-"."}}}}
+  if GROFF_TMPDIR=`exec 2>${NULLDEV}; mktemp -dt pdfroff-XXXXXXXXXX`
+  then
+  #
+  # We successfully created a private temporary directory,
+  # so to clean up, we may simply purge it.
+  #
+    trap "rm -rf ${GROFF_TMPDIR}" 0
+  #
+  else
+  #
+  # Creation of a private temporary directory was unsuccessful;
+  # fall back to user nominated directory, (using current directory
+  # as default), and schedule removal of only the temporary files.
+  #
+    GROFF_TMPDIR=${TMPDIR}
+    trap "rm -f ${GROFF_TMPDIR}/pdf$$.*" 0
+  fi
+  #
+  # In the case of abnormal termination events, we force an exit
+  # (with status code '1'), leaving the normal exit trap to clean
+  # up the temporary files, as above.  Note that we again prefer
+  # to refer to events by number, rather than by symbolic names;
+  # here we trap SIGHUP, SIGINT, SIGQUIT, SIGPIPE and SIGTERM.
+  #
+  trap "exit 1" 1 2 3 13 15
 #
-  WRKFILE=${GROFF_TMPDIR=${TMPDIR-${TMP-${TEMP-"."}}}}/pdf$$.tmp
+  WRKFILE=${GROFF_TMPDIR}/pdf$$.tmp
 #
   REFCOPY=${GROFF_TMPDIR}/pdf$$.cmp
   REFFILE=${GROFF_TMPDIR}/pdf$$.ref
@@ -146,11 +177,6 @@
   TC_DATA=${GROFF_TMPDIR}/pdf$$.tc
   BD_DATA=${GROFF_TMPDIR}/pdf$$.ps
 #
-# Set a trap, to delete temporary files on exit.
-# (FIXME: may want to include other signals, in released version).
-#
-  trap "rm -f ${GROFF_TMPDIR}/pdf$$.*" 0
-#
 # Initialise 'groff' format control settings,
 # to discriminate table of contents and document body formatting passes.
 #
@@ -597,7 +623,7 @@
   $SAY >&2 $n "Writing PDF output ..$c"
   if test -z "$PDFROFF_POSTPROCESSOR_COMMAND"
   then
-    PDFROFF_POSTPROCESSOR_COMMAND="$GS -dQUIET -dBATCH -dNOPAUSE
+    PDFROFF_POSTPROCESSOR_COMMAND="$GS -dQUIET -dBATCH -dNOPAUSE -dSAFER
       -sDEVICE=pdfwrite -sOutputFile="${PDF_OUTPUT-"-"}
 
   elif test -n "$PDF_OUTPUT"
@@ -627,4 +653,4 @@
   $SAY >&2 ". done"
 #
 # ------------------------------------------------------------------------------
-# $RCSfile: pdfroff.sh,v $ $Revision: 1.15 $: end of file
+# $RCSfile: pdfroff.sh,v $ $Revision: 1.18 $: end of file
diff -ruN groff-1.20.1/contrib/pic2graph/pic2graph.sh groff-1.21/contrib/pic2graph/pic2graph.sh
--- groff-1.20.1/contrib/pic2graph/pic2graph.sh	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/contrib/pic2graph/pic2graph.sh	2010-12-31 08:33:09.000000000 +0100
@@ -32,7 +32,7 @@
 # We don't have complete option coverage on eqn because this is primarily
 # intended as a pic translator; we can live with eqn defaults. 
 #
-# $Id: pic2graph.sh,v 1.8 2008/09/29 00:53:29 esr Exp $
+# $Id: pic2graph.sh,v 1.9 2010/02/25 20:17:13 wl Exp $
 #
 groffpic_opts=""
 gs_opts=""
@@ -86,7 +86,7 @@
     { (exit 1); exit 1; }
 fi
 
-trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
 
 # Here goes:
 # 1. Wrap the input in dummy .PS/PE macros (and add possibly null .EQ/.EN)
diff -ruN groff-1.20.1/doc/gnu.eps groff-1.21/doc/gnu.eps
--- groff-1.20.1/doc/gnu.eps	2009-01-09 15:25:55.000000000 +0100
+++ groff-1.21/doc/gnu.eps	2010-12-31 08:33:13.000000000 +0100
@@ -1,9 +1,11 @@
-%!PS-Adobe-2.0 EPSF-2.0
+%!PS-Adobe-3.0 EPSF-3.0
+%%LanguageLevel: 2
 %%Creator: pnmtops
 %%Title: noname.ps
 %%Pages: 1
 %%BoundingBox: 203 311 408 481
 %%EndComments
+%%BeginSetup
 /rlestr1 1 string def
 /readrlestring {
   /rlestr exch def
@@ -39,7 +41,7 @@
 /rpicstr 107 string def
 /gpicstr 107 string def
 /bpicstr 107 string def
-%%EndProlog
+%%EndSetup
 %%Page: 1 1
 gsave
 203.76 311.04 translate
@@ -1013,6 +1015,11 @@
 fffff0c7ff01fedffbff02fe645ad9fffff0c7ff01fedffbff02fe645ad9
 fffff096fffff096fffff096fffff096fffff096fffff096fffff096ffff
 f096fffff096fffff0
+currentdict /inputf undef
+currentdict /picstr undef
+currentdict /rpicstr undef
+currentdict /gpicstr undef
+currentdict /bpicstr undef
 grestore
 showpage
 %%Trailer
diff -ruN groff-1.20.1/doc/groff.info groff-1.21/doc/groff.info
--- groff-1.20.1/doc/groff.info	2009-01-09 15:25:55.000000000 +0100
+++ groff-1.21/doc/groff.info	2010-12-31 08:33:12.000000000 +0100
@@ -1,10 +1,10 @@
 This is groff.info, produced by makeinfo version 4.13 from
 ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.20.1.
+This manual documents GNU `troff' version 1.21.
 
    Copyright (C) 1994-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 Free Software Foundation, Inc.
+2008, 2009, 2010 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -25,280 +25,284 @@
 
 
 Indirect:
-groff.info-1: 1038
-groff.info-2: 299443
-groff.info-3: 523900
+groff.info-1: 1042
+groff.info-2: 297383
+groff.info-3: 537579
 
 Tag Table:
 (Indirect)
-Node: Top1038
-Node: Introduction2368
-Node: What Is groff?2821
-Node: What Is groff?-Footnotes4277
-Ref: What Is groff?-Footnote-14351
-Node: History4388
-Node: History-Footnotes9367
-Ref: History-Footnote-19427
-Node: groff Capabilities9635
-Node: Macro Package Intro10831
-Node: Preprocessor Intro11464
-Node: Output device intro12971
-Node: Credits13453
-Node: Invoking groff13967
-Node: Groff Options15265
-Node: Environment25497
-Node: Macro Directories27334
-Node: Font Directories28670
-Node: Paper Size30317
-Node: Invocation Examples31672
-Node: Invocation Examples-Footnotes32874
-Ref: Invocation Examples-Footnote-132958
-Node: grog33191
-Node: Tutorial for Macro Users34474
-Node: Basics34900
-Node: Basics-Footnotes39725
-Ref: Basics-Footnote-139783
-Ref: Basics-Footnote-239877
-Node: Common Features39991
-Node: Paragraphs40786
-Node: Sections and Chapters42298
-Node: Headers and Footers42804
-Node: Page Layout Adjustment43691
-Node: Displays43972
-Node: Footnotes and Annotations45244
-Node: Table of Contents45917
-Node: Indices46446
-Node: Paper Formats46862
-Node: Multiple Columns47249
-Node: Font and Size Changes47513
-Node: Predefined Strings47831
-Node: Preprocessor Support48183
-Node: Configuration and Customization48753
-Node: Macro Packages49136
-Node: man49698
-Node: Man options50140
-Node: Man options-Footnotes52838
-Ref: Man options-Footnote-152906
-Node: Man usage53627
-Node: Man font macros59691
-Node: Miscellaneous man macros61528
-Node: Predefined man strings63264
-Node: Preprocessors in man pages63836
-Node: Optional man extensions64464
-Node: mdoc68461
-Node: ms68640
-Node: ms Intro69149
-Node: General ms Structure69832
-Node: General ms Structure-Footnotes72286
-Ref: General ms Structure-Footnote-172372
-Node: ms Document Control Registers72418
-Node: ms Cover Page Macros78880
-Node: ms Body Text81905
-Node: Paragraphs in ms82398
-Node: Headings in ms84117
-Node: Highlighting in ms86897
-Node: Lists in ms89492
-Node: Indentation values in ms92915
-Node: Tabstops in ms93549
-Node: ms Displays and Keeps93976
-Node: ms Insertions97935
-Node: Example multi-page table99512
-Node: ms Footnotes99973
-Node: ms Page Layout101243
-Node: ms Headers and Footers101774
-Node: ms Margins103235
-Node: ms Multiple Columns103494
-Node: ms TOC104314
-Node: ms Strings and Special Characters107051
-Node: ms Strings and Special Characters-Footnotes109863
-Ref: ms Strings and Special Characters-Footnote-1109975
-Node: Differences from AT&T ms110062
-Node: Missing ms Macros113148
-Node: Additional ms Macros113923
-Node: Naming Conventions115196
-Node: me116232
-Node: mm116400
-Node: gtroff Reference116557
-Node: Text117481
-Node: Filling and Adjusting118050
-Node: Hyphenation118778
-Node: Sentences119575
-Node: Tab Stops120730
-Node: Implicit Line Breaks121638
-Node: Input Conventions122665
-Node: Input Encodings123471
-Node: Measurements125605
-Node: Measurements-Footnotes127810
-Ref: Measurements-Footnote-1127880
-Node: Default Units127952
-Node: Expressions129012
-Node: Expressions-Footnotes131788
-Ref: Expressions-Footnote-1131856
-Node: Identifiers131983
-Node: Embedded Commands135850
-Node: Requests136607
-Node: Request and Macro Arguments138853
-Node: Request and Macro Arguments-Footnotes141349
-Ref: Request and Macro Arguments-Footnote-1141449
-Ref: Request and Macro Arguments-Footnote-2141577
-Node: Macros141931
-Node: Escapes142322
-Node: Comments145194
-Node: Comments-Footnotes147775
-Ref: Comments-Footnote-1147837
-Node: Registers147936
-Node: Setting Registers148449
-Node: Interpolating Registers150752
-Node: Auto-increment151574
-Node: Assigning Formats153130
-Node: Built-in Registers155991
-Node: Manipulating Filling and Adjusting159682
-Node: Manipulating Hyphenation168208
-Node: Manipulating Hyphenation-Footnotes179682
-Ref: Manipulating Hyphenation-Footnote-1179776
-Node: Manipulating Spacing179851
-Node: Tabs and Fields184405
-Node: Tabs and Fields-Footnotes190409
-Ref: Tabs and Fields-Footnote-1190485
-Node: Leaders190563
-Node: Leaders-Footnotes192172
-Ref: Leaders-Footnote-1192232
-Node: Fields192313
-Node: Character Translations193746
-Node: Troff and Nroff Mode202992
-Node: Line Layout204992
-Node: Line Control210856
-Node: Page Layout213518
-Node: Page Control217191
-Node: Fonts and Symbols220931
-Node: Changing Fonts221516
-Node: Font Families225051
-Node: Font Positions229614
-Node: Using Symbols232764
-Node: Using Symbols-Footnotes248571
-Ref: Using Symbols-Footnote-1248643
-Ref: Using Symbols-Footnote-2249096
-Ref: Using Symbols-Footnote-3249167
-Ref: Using Symbols-Footnote-4249406
-Node: Special Fonts249469
-Node: Artificial Fonts250659
-Node: Ligatures and Kerning256173
-Node: Sizes262204
-Node: Sizes-Footnotes263045
-Ref: Sizes-Footnote-1263101
-Node: Changing Type Sizes263513
-Node: Fractional Type Sizes268991
-Node: Strings272068
-Ref: als279651
-Node: Conditionals and Loops281535
-Node: Operators in Conditionals281767
-Node: Operators in Conditionals-Footnotes285471
-Ref: Operators in Conditionals-Footnote-1285567
-Ref: Operators in Conditionals-Footnote-2285646
-Node: if-else285745
-Node: while287323
-Node: Writing Macros289715
-Node: Writing Macros-Footnotes294969
-Ref: Writing Macros-Footnote-1295043
-Node: Copy-in Mode295341
-Node: Parameters296240
-Node: Page Motions299443
-Node: Drawing Requests307126
-Node: Traps317519
-Node: Page Location Traps318136
-Node: Diversion Traps324349
-Node: Input Line Traps324969
-Node: Blank Line Traps326003
-Node: End-of-input Traps326295
-Node: Diversions326973
-Node: Environments334221
-Node: Suppressing output338096
-Node: Colors340135
-Node: I/O343712
-Node: Postprocessor Access352124
-Node: Miscellaneous353828
-Node: Miscellaneous-Footnotes359315
-Ref: Miscellaneous-Footnote-1359387
-Node: Gtroff Internals359457
-Node: Gtroff Internals-Footnotes363774
-Ref: Gtroff Internals-Footnote-1363852
-Node: Debugging363986
-Node: Warnings369973
-Node: Warnings-Footnotes372915
-Ref: Warnings-Footnote-1372977
-Node: Implementation Differences373098
-Node: Implementation Differences-Footnotes377932
-Ref: Implementation Differences-Footnote-1378030
-Node: Preprocessors378165
-Node: geqn378472
-Node: Invoking geqn378611
-Node: gtbl378722
-Node: Invoking gtbl378852
-Node: gpic378963
-Node: Invoking gpic379093
-Node: ggrn379204
-Node: Invoking ggrn379334
-Node: grap379445
-Node: grefer379726
-Node: Invoking grefer379867
-Node: gsoelim379988
-Node: Invoking gsoelim380119
-Node: Output Devices380245
-Node: Special Characters380489
-Node: grotty380663
-Node: Invoking grotty380817
-Node: grops380938
-Node: Invoking grops381102
-Node: Embedding PostScript381247
-Node: grodvi381386
-Node: Invoking grodvi381528
-Node: grolj4381649
-Node: Invoking grolj4381792
-Node: grolbp381913
-Node: Invoking grolbp382057
-Node: grohtml382178
-Node: Invoking grohtml382371
-Node: grohtml specific registers and strings382544
-Node: gxditview383556
-Node: Invoking gxditview383697
-Node: File formats383833
-Node: gtroff Output384109
-Node: gtroff Output-Footnotes385954
-Ref: gtroff Output-Footnote-1386026
-Node: Language Concepts386161
-Node: Separation386912
-Node: Argument Units389165
-Node: Document Parts390318
-Node: Command Reference391725
-Node: Comment Command392141
-Node: Simple Commands392639
-Node: Simple Commands-Footnotes398564
-Ref: Simple Commands-Footnote-1398640
-Node: Graphics Commands398701
-Node: Device Control Commands406026
-Node: Obsolete Command410086
-Node: Intermediate Output Examples411372
-Node: Output Language Compatibility414169
-Node: Font Files416230
-Node: Font Files-Footnotes416851
-Ref: Font Files-Footnote-1416917
-Node: DESC File Format416978
-Node: Font File Format422860
-Node: Font File Format-Footnotes429097
-Ref: Font File Format-Footnote-1429175
-Ref: Font File Format-Footnote-2429266
-Node: Installation429485
-Node: Copying This Manual429616
-Node: Request Index454752
-Node: Escape Index471057
-Node: Operator Index477548
-Node: Register Index479030
-Node: Macro Index492832
-Node: String Index505850
-Node: Glyph Name Index514535
-Node: Font File Keyword Index514841
-Node: Program and File Index518250
-Node: Concept Index523900
+Node: Top1042
+Node: Introduction2376
+Node: What Is groff?2829
+Node: What Is groff?-Footnotes4285
+Ref: What Is groff?-Footnote-14359
+Node: History4396
+Node: History-Footnotes9375
+Ref: History-Footnote-19435
+Node: groff Capabilities9643
+Node: Macro Package Intro10839
+Node: Preprocessor Intro11472
+Node: Output device intro13101
+Node: Credits13583
+Node: Invoking groff14097
+Node: Groff Options15395
+Node: Environment26032
+Node: Macro Directories28363
+Node: Font Directories29695
+Node: Paper Size31338
+Node: Invocation Examples32693
+Node: Invocation Examples-Footnotes33895
+Ref: Invocation Examples-Footnote-133979
+Node: grog34212
+Node: Tutorial for Macro Users35495
+Node: Basics35921
+Node: Basics-Footnotes40746
+Ref: Basics-Footnote-140804
+Ref: Basics-Footnote-240898
+Node: Common Features41012
+Node: Paragraphs41807
+Node: Sections and Chapters43319
+Node: Headers and Footers43825
+Node: Page Layout Adjustment44712
+Node: Displays44993
+Node: Footnotes and Annotations46265
+Node: Table of Contents46938
+Node: Indices47467
+Node: Paper Formats47883
+Node: Multiple Columns48270
+Node: Font and Size Changes48534
+Node: Predefined Strings48852
+Node: Preprocessor Support49204
+Node: Configuration and Customization49774
+Node: Macro Packages50157
+Node: man50719
+Node: Man options51161
+Node: Man options-Footnotes53859
+Ref: Man options-Footnote-153927
+Node: Man usage54648
+Node: Man font macros60712
+Node: Miscellaneous man macros62549
+Node: Predefined man strings64285
+Node: Preprocessors in man pages64857
+Node: Optional man extensions65485
+Node: mdoc69482
+Node: ms69661
+Node: ms Intro70170
+Node: General ms Structure70853
+Node: General ms Structure-Footnotes73307
+Ref: General ms Structure-Footnote-173393
+Node: ms Document Control Registers73439
+Node: ms Cover Page Macros80093
+Node: ms Body Text83118
+Node: Paragraphs in ms83611
+Node: Headings in ms85330
+Node: Highlighting in ms88110
+Node: Lists in ms90705
+Node: Indentation values in ms94128
+Node: Tabstops in ms94762
+Node: ms Displays and Keeps95189
+Node: ms Insertions99148
+Node: Example multi-page table100725
+Node: ms Footnotes101186
+Node: ms Page Layout102456
+Node: ms Headers and Footers102987
+Node: ms Margins104448
+Node: ms Multiple Columns104707
+Node: ms TOC105527
+Node: ms Strings and Special Characters108264
+Node: ms Strings and Special Characters-Footnotes111076
+Ref: ms Strings and Special Characters-Footnote-1111188
+Node: Differences from AT&T ms111275
+Node: Missing ms Macros114361
+Node: Additional ms Macros115136
+Node: Naming Conventions116409
+Node: me117445
+Node: mm117613
+Node: gtroff Reference117770
+Node: Text118694
+Node: Filling and Adjusting119263
+Node: Hyphenation119991
+Node: Sentences120788
+Node: Tab Stops121943
+Node: Implicit Line Breaks122851
+Node: Input Conventions123993
+Node: Input Encodings124799
+Node: Measurements126933
+Node: Measurements-Footnotes129138
+Ref: Measurements-Footnote-1129208
+Node: Default Units129280
+Node: Expressions130340
+Node: Expressions-Footnotes133757
+Ref: Expressions-Footnote-1133825
+Node: Identifiers133952
+Node: Embedded Commands137819
+Node: Requests138576
+Node: Request and Macro Arguments140822
+Node: Request and Macro Arguments-Footnotes143318
+Ref: Request and Macro Arguments-Footnote-1143418
+Ref: Request and Macro Arguments-Footnote-2143546
+Node: Macros143900
+Node: Escapes144291
+Node: Comments147163
+Node: Comments-Footnotes149744
+Ref: Comments-Footnote-1149806
+Node: Registers149905
+Node: Setting Registers150418
+Node: Interpolating Registers154186
+Node: Auto-increment155008
+Node: Assigning Formats156564
+Node: Built-in Registers159425
+Node: Manipulating Filling and Adjusting163254
+Node: Manipulating Hyphenation171780
+Node: Manipulating Hyphenation-Footnotes183354
+Ref: Manipulating Hyphenation-Footnote-1183448
+Node: Manipulating Spacing183523
+Node: Tabs and Fields188077
+Node: Tabs and Fields-Footnotes194081
+Ref: Tabs and Fields-Footnote-1194157
+Node: Leaders194235
+Node: Leaders-Footnotes195844
+Ref: Leaders-Footnote-1195904
+Node: Fields195985
+Node: Character Translations197418
+Node: Troff and Nroff Mode206664
+Node: Line Layout208664
+Node: Line Control214528
+Node: Page Layout217190
+Node: Page Control220863
+Node: Fonts and Symbols224603
+Node: Changing Fonts225210
+Node: Font Families228745
+Node: Font Positions233308
+Node: Using Symbols236458
+Node: Using Symbols-Footnotes253457
+Ref: Using Symbols-Footnote-1253529
+Ref: Using Symbols-Footnote-2253982
+Ref: Using Symbols-Footnote-3254053
+Ref: Using Symbols-Footnote-4254292
+Node: Character Classes254355
+Node: Special Fonts257074
+Node: Artificial Fonts258268
+Node: Ligatures and Kerning263782
+Node: Sizes269813
+Node: Sizes-Footnotes270654
+Ref: Sizes-Footnote-1270710
+Node: Changing Type Sizes271122
+Node: Fractional Type Sizes276600
+Node: Strings279677
+Ref: als287260
+Node: Conditionals and Loops289144
+Node: Operators in Conditionals289376
+Node: Operators in Conditionals-Footnotes293125
+Ref: Operators in Conditionals-Footnote-1293221
+Ref: Operators in Conditionals-Footnote-2293300
+Node: if-else293399
+Node: while294991
+Node: Writing Macros297383
+Node: Writing Macros-Footnotes302637
+Ref: Writing Macros-Footnote-1302711
+Node: Copy-in Mode303009
+Node: Parameters303908
+Node: Page Motions307111
+Node: Drawing Requests314794
+Node: Traps325187
+Node: Page Location Traps325829
+Node: Diversion Traps332042
+Node: Input Line Traps332662
+Node: Blank Line Traps333696
+Node: Leading Spaces Traps333990
+Node: End-of-input Traps335571
+Node: Diversions338076
+Node: Environments345324
+Node: Suppressing output349199
+Node: Colors351238
+Node: I/O354815
+Node: Postprocessor Access363355
+Node: Miscellaneous365059
+Node: Miscellaneous-Footnotes370546
+Ref: Miscellaneous-Footnote-1370618
+Node: Gtroff Internals370688
+Node: Gtroff Internals-Footnotes375005
+Ref: Gtroff Internals-Footnote-1375083
+Node: Debugging375217
+Node: Warnings381204
+Node: Warnings-Footnotes384302
+Ref: Warnings-Footnote-1384364
+Node: Implementation Differences384485
+Node: Implementation Differences-Footnotes389319
+Ref: Implementation Differences-Footnote-1389417
+Node: Preprocessors389552
+Node: geqn389871
+Node: Invoking geqn390010
+Node: gtbl390121
+Node: Invoking gtbl390251
+Node: gpic390362
+Node: Invoking gpic390492
+Node: ggrn390603
+Node: Invoking ggrn390733
+Node: grap390844
+Node: grefer391125
+Node: Invoking grefer391266
+Node: gsoelim391387
+Node: Invoking gsoelim391534
+Node: preconv391660
+Node: Invoking preconv391792
+Node: Output Devices391918
+Node: Special Characters392162
+Node: grotty392336
+Node: Invoking grotty392490
+Node: grops392611
+Node: Invoking grops392775
+Node: Embedding PostScript392920
+Node: grodvi393059
+Node: Invoking grodvi393201
+Node: grolj4393322
+Node: Invoking grolj4393465
+Node: grolbp393586
+Node: Invoking grolbp393730
+Node: grohtml393851
+Node: Invoking grohtml395205
+Node: grohtml specific registers and strings395378
+Node: gxditview396390
+Node: Invoking gxditview396531
+Node: File formats396667
+Node: gtroff Output396943
+Node: gtroff Output-Footnotes398788
+Ref: gtroff Output-Footnote-1398860
+Node: Language Concepts398995
+Node: Separation399746
+Node: Argument Units401999
+Node: Document Parts403152
+Node: Command Reference404559
+Node: Comment Command404975
+Node: Simple Commands405473
+Node: Simple Commands-Footnotes411398
+Ref: Simple Commands-Footnote-1411474
+Node: Graphics Commands411535
+Node: Device Control Commands418860
+Node: Obsolete Command422920
+Node: Intermediate Output Examples424206
+Node: Output Language Compatibility427003
+Node: Font Files429064
+Node: Font Files-Footnotes429685
+Ref: Font Files-Footnote-1429751
+Node: DESC File Format429812
+Node: Font File Format435694
+Node: Font File Format-Footnotes441931
+Ref: Font File Format-Footnote-1442009
+Ref: Font File Format-Footnote-2442100
+Node: Installation442319
+Node: Copying This Manual442450
+Node: Request Index467586
+Node: Escape Index484100
+Node: Operator Index490591
+Node: Register Index492073
+Node: Macro Index506438
+Node: String Index519456
+Node: Glyph Name Index528141
+Node: Font File Keyword Index528447
+Node: Program and File Index531856
+Node: Concept Index537579
 
 End Tag Table
 
diff -ruN groff-1.20.1/doc/groff.info-1 groff-1.21/doc/groff.info-1
--- groff-1.20.1/doc/groff.info-1	2009-01-09 15:25:55.000000000 +0100
+++ groff-1.21/doc/groff.info-1	2010-12-31 08:33:12.000000000 +0100
@@ -1,10 +1,10 @@
 This is groff.info, produced by makeinfo version 4.13 from
 ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.20.1.
+This manual documents GNU `troff' version 1.21.
 
    Copyright (C) 1994-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 Free Software Foundation, Inc.
+2008, 2009, 2010 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -52,10 +52,10 @@
 * Program and File Index::
 * Concept Index::
 
-   This manual documents GNU `troff' version 1.20.1.
+   This manual documents GNU `troff' version 1.21.
 
    Copyright (C) 1994-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 Free Software Foundation, Inc.
+2008, 2009, 2010 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -333,6 +333,9 @@
    A free implementation of `grap', a preprocessor for drawing graphs,
 can be obtained as an extra package; `groff' can use `grap' also.
 
+   Unique to `groff' is the `preconv' preprocessor which enables
+`groff' to handle documents in various input encodings.
+
    There are other preprocessors in existence, but, unfortunately, no
 free implementations are available.  Among them are preprocessors for
 drawing mathematical pictures (`ideal') and chemical structures
@@ -411,33 +414,34 @@
 appropriate for the selected device.  The default device is `ps' (but
 it can be changed when `groff' is configured and built).  It can
 optionally preprocess with any of `gpic', `geqn', `gtbl', `ggrn',
-`grap', `grefer', or `gsoelim'.
+`grap', `grefer', `gsoelim', or `preconv'.
 
    This section only documents options to the `groff' front end.  Many
 of the arguments to `groff' are passed on to `gtroff', therefore those
 are also included.  Arguments to pre- or postprocessors can be found in
 *note Invoking gpic::, *note Invoking geqn::, *note Invoking gtbl::,
 *note Invoking ggrn::, *note Invoking grefer::, *note Invoking
-gsoelim::, *note Invoking grotty::, *note Invoking grops::, *note
-Invoking grohtml::, *note Invoking grodvi::, *note Invoking grolj4::,
-*note Invoking grolbp::, and *note Invoking gxditview::.
+gsoelim::, *note Invoking preconv::, *note Invoking grotty::, *note
+Invoking grops::, *note Invoking grohtml::, *note Invoking grodvi::,
+*note Invoking grolj4::, *note Invoking grolbp::, and *note Invoking
+gxditview::.
 
    The command line format for `groff' is:
 
 
-     groff [ -abceghilpstvzCEGNRSUVXZ ] [ -FDIR ] [ -mNAME ]
-           [ -TDEF ] [ -fFAM ] [ -wNAME ] [ -WNAME ]
-           [ -MDIR ] [ -dCS ] [ -rCN ] [ -nNUM ]
-           [ -oLIST ] [ -PARG ] [ -LARG ] [ -IDIR ]
-           [ FILES... ]
+     groff [ -abceghiklpstvzCEGNRSUVXZ ] [ -dCS ] [ -DARG ]
+           [ -fFAM ] [ -FDIR ] [ -IDIR ] [ -KARG ]
+           [ -LARG ] [ -mNAME ] [ -MDIR ] [ -nNUM ]
+           [ -oLIST ] [ -PARG ] [ -rCN ] [ -TDEF ]
+           [ -wNAME ] [ -WNAME ] [ FILES... ]
 
    The command line format for `gtroff' is as follows.
 
 
-     gtroff [ -abcivzCERU ] [ -wNAME ] [ -WNAME ] [ -dCS ]
-            [ -fFAM ] [ -mNAME ] [ -nNUM ]
-            [ -oLIST ] [ -rCN ] [ -TNAME ]
-            [ -FDIR ] [ -MDIR ] [ FILES... ]
+     gtroff [ -abcivzCERU ] [ -dCS ] [ -fFAM ] [ -FDIR ]
+            [ -mNAME ] [ -MDIR ] [ -nNUM ] [ -oLIST ]
+            [ -rCN ] [ -TNAME ] [ -wNAME ] [ -WNAME ]
+            [ FILES... ]
 
 Obviously, many of the options to `groff' are actually passed on to
 `gtroff'.
@@ -451,14 +455,56 @@
 
    Here's the description of the command-line options:
 
-`-h'
-     Print a help message.
+`-a'
+     Generate an ASCII approximation of the typeset output.  The
+     read-only register `.A' is then set to 1.  *Note Built-in
+     Registers::.  A typical example is
+
+
+          groff -a -man -Tdvi troff.man | less
+
+     which shows how lines are broken for the DVI device.  Note that
+     this option is rather useless today since graphic output devices
+     are available virtually everywhere.
+
+`-b'
+     Print a backtrace with each warning or error message.  This
+     backtrace should help track down the cause of the error.  The line
+     numbers given in the backtrace may not always be correct: `gtroff'
+     can get confused by `as' or `am' requests while counting line
+     numbers.
+
+`-c'
+     Suppress color output.
+
+`-C'
+     Enable compatibility mode.  *Note Implementation Differences::,
+     for the list of incompatibilities between `groff' and AT&T `troff'.
+
+`-dCS'
+`-dNAME=S'
+     Define C or NAME to be a string S.  C must be a one-letter name;
+     NAME can be of arbitrary length.  All string assignments happen
+     before loading any macro file (including the start-up file).
+
+`-DARG'
+     Set default input encoding used by `preconv' to ARG.  Implies `-k'.
 
 `-e'
      Preprocess with `geqn'.
 
-`-t'
-     Preprocess with `gtbl'.
+`-E'
+     Inhibit all error messages.
+
+`-fFAM'
+     Use FAM as the default font family.  *Note Font Families::.
+
+`-FDIR'
+     Search `DIR' for subdirectories `devNAME' (NAME is the name of the
+     device), for the `DESC' file, and for font files before looking in
+     the standard directories (*note Font Directories::).  This option
+     is passed to all pre- and postprocessors using the
+     `GROFF_FONT_PATH' environment variable.
 
 `-g'
      Preprocess with `ggrn'.
@@ -466,44 +512,38 @@
 `-G'
      Preprocess with `grap'.
 
-`-p'
-     Preprocess with `gpic'.
-
-`-s'
-     Preprocess with `gsoelim'.
+`-h'
+     Print a help message.
 
-`-c'
-     Suppress color output.
+`-i'
+     Read the standard input after all the named input files have been
+     processed.
 
-`-R'
-     Preprocess with `grefer'.  No mechanism is provided for passing
-     arguments to `grefer' because most `grefer' options have
-     equivalent commands which can be included in the file.  *Note
-     grefer::, for more details.
+`-IDIR'
+     This option may be used to specify a directory to search for files.
+     It is passed to the following programs:
 
-     Note that `gtroff' also accepts a `-R' option, which is not
-     accessible via `groff'.  This option prevents the loading of the
-     `troffrc' and `troffrc-end' files.
+        * `gsoelim' (see *note gsoelim:: for more details); it also
+          implies `groff''s `-s' option.
 
-`-v'
-     Make programs run by `groff' print out their version number.
+        * `gtroff'; it is used to search files named in the `psbb' and
+          `so' requests.
 
-`-V'
-     Print the pipeline on `stdout' instead of executing it.  If
-     specified more than once, print the pipeline on `stderr' and
-     execute it.
+        * `grops'; it is used to search files named in the
+          `\X'ps: import' and `\X'ps: file' escapes.
 
-`-z'
-     Suppress output from `gtroff'.  Only error messages are printed.
+     The current directory is always searched first.  This option may be
+     specified more than once; the directories are searched in the order
+     specified.  No directory search is performed for files specified
+     using an absolute path.
 
-`-Z'
-     Do not postprocess the output of `gtroff'.  Normally `groff'
-     automatically runs the appropriate postprocessor.
+`-k'
+     Preprocess with `preconv'.  This is run before any other
+     preprocessor.  Please refer to `preconv''s manual page for its
+     behaviour if no `-K' (or `-D') option is specified.
 
-`-PARG'
-     Pass ARG to the postprocessor.  Each argument should be passed
-     with a separate `-P' option.  Note that `groff' does not prepend
-     `-' to ARG before passing it to the postprocessor.
+`-KARG'
+     Set input encoding used by preconv to ARG.  Implies `-k'.
 
 `-l'
      Send the output to a spooler for printing.  The command used for
@@ -517,6 +557,73 @@
      ARG before passing it to the postprocessor.  If the `print'
      keyword in the device description file is missing, `-L' is ignored.
 
+`-mNAME'
+     Read in the file `NAME.tmac'.  Normally `groff' searches for this
+     in its macro directories.  If it isn't found, it tries `tmac.NAME'
+     (searching in the same directories).
+
+`-MDIR'
+     Search directory `DIR' for macro files before the standard
+     directories (*note Macro Directories::).
+
+`-nNUM'
+     Number the first page NUM.
+
+`-N'
+     Don't allow newlines with `eqn' delimiters.  This is the same as
+     the `-N' option in `geqn'.
+
+`-oLIST'
+     Output only pages in LIST, which is a comma-separated list of page
+     ranges; `N' means print page N, `M-N' means print every page
+     between M and N, `-N' means print every page up to N, `N-' means
+     print every page beginning with N.  `gtroff' exits after printing
+     the last page in the list.  All the ranges are inclusive on both
+     ends.
+
+     Within `gtroff', this information can be extracted with the `.P'
+     register.  *Note Built-in Registers::.
+
+     If your document restarts page numbering at the beginning of each
+     chapter, then `gtroff' prints the specified page range for each
+     chapter.
+
+`-p'
+     Preprocess with `gpic'.
+
+`-PARG'
+     Pass ARG to the postprocessor.  Each argument should be passed
+     with a separate `-P' option.  Note that `groff' does not prepend
+     `-' to ARG before passing it to the postprocessor.
+
+`-rCN'
+`-rNAME=N'
+     Set number register C or NAME to the value N.  C must be a
+     one-letter name; NAME can be of arbitrary length.  N can be any
+     `gtroff' numeric expression.  All register assignments happen
+     before loading any macro file (including the start-up file).
+
+`-R'
+     Preprocess with `grefer'.  No mechanism is provided for passing
+     arguments to `grefer' because most `grefer' options have
+     equivalent commands which can be included in the file.  *Note
+     grefer::, for more details.
+
+     Note that `gtroff' also accepts a `-R' option, which is not
+     accessible via `groff'.  This option prevents the loading of the
+     `troffrc' and `troffrc-end' files.
+
+`-s'
+     Preprocess with `gsoelim'.
+
+`-S'
+     Safer mode.  Pass the `-S' option to `gpic' and disable the
+     `open', `opena', `pso', `sy', and `pi' requests.  For security
+     reasons, this is enabled by default.
+
+`-t'
+     Preprocess with `gtbl'.
+
 `-TDEV'
      Prepare output for device DEV.  The default device is `ps', unless
      changed when `groff' was configured and built.  The following are
@@ -582,51 +689,10 @@
      Files::, for more info.)  This can be overridden with the `-X'
      option.
 
-`-X'
-     Preview with `gxditview' instead of using the usual postprocessor.
-     This is unlikely to produce good results except with `-Tps'.
-
-     Note that this is not the same as using `-TX75' or `-TX100' to
-     view a document with `gxditview': The former uses the metrics of
-     the specified device, whereas the latter uses X-specific fonts and
-     metrics.
-
-`-N'
-     Don't allow newlines with `eqn' delimiters.  This is the same as
-     the `-N' option in `geqn'.
-
-`-S'
-     Safer mode.  Pass the `-S' option to `gpic' and disable the
-     `open', `opena', `pso', `sy', and `pi' requests.  For security
-     reasons, this is enabled by default.
-
 `-U'
      Unsafe mode.  This enables the `open', `opena', `pso', `sy', and
      `pi' requests.
 
-`-a'
-     Generate an ASCII approximation of the typeset output.  The
-     read-only register `.A' is then set to 1.  *Note Built-in
-     Registers::.  A typical example is
-
-
-          groff -a -man -Tdvi troff.man | less
-
-     which shows how lines are broken for the DVI device.  Note that
-     this option is rather useless today since graphic output devices
-     are available virtually everywhere.
-
-`-b'
-     Print a backtrace with each warning or error message.  This
-     backtrace should help track down the cause of the error.  The line
-     numbers given in the backtrace may not always be correct: `gtroff'
-     can get confused by `as' or `am' requests while counting line
-     numbers.
-
-`-i'
-     Read the standard input after all the named input files have been
-     processed.
-
 `-wNAME'
      Enable warning NAME.  Available warnings are described in *note
      Debugging::.  Multiple `-w' options are allowed.
@@ -634,80 +700,29 @@
 `-WNAME'
      Inhibit warning NAME.  Multiple `-W' options are allowed.
 
-`-E'
-     Inhibit all error messages.
-
-`-C'
-     Enable compatibility mode.  *Note Implementation Differences::,
-     for the list of incompatibilities between `groff' and AT&T `troff'.
-
-`-dCS'
-`-dNAME=S'
-     Define C or NAME to be a string S.  C must be a one-letter name;
-     NAME can be of arbitrary length.  All string assignments happen
-     before loading any macro file (including the start-up file).
-
-`-fFAM'
-     Use FAM as the default font family.  *Note Font Families::.
-
-`-mNAME'
-     Read in the file `NAME.tmac'.  Normally `groff' searches for this
-     in its macro directories.  If it isn't found, it tries `tmac.NAME'
-     (searching in the same directories).
-
-`-nNUM'
-     Number the first page NUM.
-
-`-oLIST'
-     Output only pages in LIST, which is a comma-separated list of page
-     ranges; `N' means print page N, `M-N' means print every page
-     between M and N, `-N' means print every page up to N, `N-' means
-     print every page beginning with N.  `gtroff' exits after printing
-     the last page in the list.  All the ranges are inclusive on both
-     ends.
-
-     Within `gtroff', this information can be extracted with the `.P'
-     register.  *Note Built-in Registers::.
-
-     If your document restarts page numbering at the beginning of each
-     chapter, then `gtroff' prints the specified page range for each
-     chapter.
-
-`-rCN'
-`-rNAME=N'
-     Set number register C or NAME to the value N.  C must be a
-     one-letter name; NAME can be of arbitrary length.  N can be any
-     `gtroff' numeric expression.  All register assignments happen
-     before loading any macro file (including the start-up file).
-
-`-FDIR'
-     Search `DIR' for subdirectories `devNAME' (NAME is the name of the
-     device), for the `DESC' file, and for font files before looking in
-     the standard directories (*note Font Directories::).  This option
-     is passed to all pre- and postprocessors using the
-     `GROFF_FONT_PATH' environment variable.
-
-`-MDIR'
-     Search directory `DIR' for macro files before the standard
-     directories (*note Macro Directories::).
+`-v'
+     Make programs run by `groff' print out their version number.
 
-`-IDIR'
-     This option may be used to specify a directory to search for files.
-     It is passed to the following programs:
+`-V'
+     Print the pipeline on `stdout' instead of executing it.  If
+     specified more than once, print the pipeline on `stderr' and
+     execute it.
 
-        * `gsoelim' (see *note gsoelim:: for more details); it also
-          implies `groff''s `-s' option.
+`-X'
+     Preview with `gxditview' instead of using the usual postprocessor.
+     This is unlikely to produce good results except with `-Tps'.
 
-        * `gtroff'; it is used to search files named in the `psbb' and
-          `so' requests.
+     Note that this is not the same as using `-TX75' or `-TX100' to
+     view a document with `gxditview': The former uses the metrics of
+     the specified device, whereas the latter uses X-specific fonts and
+     metrics.
 
-        * `grops'; it is used to search files named in the
-          `\X'ps: import' and `\X'ps: file' escapes.
+`-z'
+     Suppress output from `gtroff'.  Only error messages are printed.
 
-     The current directory is always searched first.  This option may be
-     specified more than once; the directories are searched in the order
-     specified.  No directory search is performed for files specified
-     using an absolute path.
+`-Z'
+     Do not postprocess the output of `gtroff'.  Normally `groff'
+     automatically runs the appropriate postprocessor.
 
 
 File: groff.info,  Node: Environment,  Next: Macro Directories,  Prev: Groff Options,  Up: Invoking groff
@@ -718,32 +733,39 @@
 There are also several environment variables (of the operating system,
 not within `gtroff') which can modify the behavior of `groff'.
 
+`GROFF_BIN_PATH'
+     This search path, followed by `PATH', is used for commands executed
+     by `groff'.
+
 `GROFF_COMMAND_PREFIX'
      If this is set to X, then `groff' runs `Xtroff' instead of
      `gtroff'.  This also applies to `tbl', `pic', `eqn', `grn',
      `refer', and `soelim'.  It does not apply to `grops', `grodvi',
-     `grotty', `pre-grohtml', `post-grohtml', `grolj4', and `gxditview'.
+     `grotty', `pre-grohtml', `post-grohtml', `preconv', `grolj4', and
+     `gxditview'.
 
      The default command prefix is determined during the installation
      process.  If a non-GNU troff system is found, prefix `g' is used,
      none otherwise.
 
-`GROFF_TMAC_PATH'
-     A colon-separated list of directories in which to search for macro
-     files (before the default directories are tried).  *Note Macro
-     Directories::.
-
-`GROFF_TYPESETTER'
-     The default output device.
+`GROFF_ENCODING'
+     The value of this environment value is passed to the `preconv'
+     preprocessor to select the encoding of input files.  Setting this
+     option implies `groff''s command line option `-k' (this is,
+     `groff' actually always calls `preconv').  If set without a value,
+     `groff' calls `preconv' without arguments.  An explicit `-K'
+     command line option overrides the value of `GROFF_ENCODING'.  See
+     the manual page of `preconv' for details.
 
 `GROFF_FONT_PATH'
      A colon-separated list of directories in which to search for the
      `dev'NAME directory (before the default directories are tried).
      *Note Font Directories::.
 
-`GROFF_BIN_PATH'
-     This search path, followed by `PATH', is used for commands executed
-     by `groff'.
+`GROFF_TMAC_PATH'
+     A colon-separated list of directories in which to search for macro
+     files (before the default directories are tried).  *Note Macro
+     Directories::.
 
 `GROFF_TMPDIR'
      The directory in which `groff' creates temporary files.  If this is
@@ -753,6 +775,9 @@
      this is usually `/tmp').  `grops', `grefer', `pre-grohtml', and
      `post-grohtml' can create temporary files in this directory.
 
+`GROFF_TYPESETTER'
+     The default output device.
+
    Note that MS-DOS and MS-Windows ports of `groff' use semi-colons,
 rather than colons, to separate the directories in the lists described
 above.
@@ -790,11 +815,11 @@
 
           /usr/local/lib/groff/site-tmac
           /usr/local/share/groff/site-tmac
-          /usr/local/share/groff/1.20.1/tmac
+          /usr/local/share/groff/1.21/tmac
 
-     assuming that the version of `groff' is 1.20.1, and the
-     installation prefix was `/usr/local'.  It is possible to fine-tune
-     those directories during the installation process.
+     assuming that the version of `groff' is 1.21, and the installation
+     prefix was `/usr/local'.  It is possible to fine-tune those
+     directories during the installation process.
 
 
 File: groff.info,  Node: Font Directories,  Next: Paper Size,  Prev: Macro Directories,  Up: Invoking groff
@@ -830,11 +855,11 @@
 
 
           /usr/local/share/groff/site-font
-          /usr/local/share/groff/1.20.1/font
+          /usr/local/share/groff/1.21/font
 
-     assuming that the version of `groff' is 1.20.1, and the
-     installation prefix was `/usr/local'.  It is possible to fine-tune
-     those directories during the installation process.
+     assuming that the version of `groff' is 1.21, and the installation
+     prefix was `/usr/local'.  It is possible to fine-tune those
+     directories during the installation process.
 
 
 File: groff.info,  Node: Paper Size,  Next: Invocation Examples,  Prev: Font Directories,  Up: Invoking groff
@@ -2255,6 +2280,14 @@
 
      Default: 2n.
 
+ -- Register: \n[DD]
+     Sets the vertical spacing before and after a display, a `tbl'
+     table, an `eqn' equation, or a `pic' image.
+
+     Effective: next paragraph.
+
+     Default: 0.5v.
+
 
 File: groff.info,  Node: ms Cover Page Macros,  Next: ms Body Text,  Prev: ms Document Control Registers,  Up: ms
 
@@ -3657,7 +3690,9 @@
 
    A line that begins with a space causes a break and the space is
 output at the beginning of the next line.  Note that this space isn't
-adjusted, even in fill mode.
+adjusted, even in fill mode; however, the behaviour can be modified
+with the leading spaces macro request `lsm'.  *Note Leading Spaces
+Traps::.
 
    The end of file also causes a break - otherwise the last line of the
 document may vanish!
@@ -3869,6 +3904,24 @@
      Expressions-Footnote-1::)  See below for the use of unary
      operators in motion requests.
 
+     The logical not operator, as described above, works only within
+     `if' and `while' requests.  Furthermore, it may appear only at the
+     beginning of an expression, and negates the entire expression.
+     Attempting to insert the `!' operator within the expression
+     results in a `numeric expression expected' warning.  This
+     maintains bug-compatibility with old versions of `troff'.
+
+     Example:
+
+
+          .nr X 1
+          .nr Y 0
+          .\" This does not work as expected
+          .if (\n[X])&(!\n[Y]) .nop X only
+          .
+          .\" Use this construct instead
+          .if (\n[X]=1)&(\n[Y]=0) .nop X only
+
    * Extrema: `>?' (maximum), `<?' (minimum).
 
      Example:
@@ -4476,12 +4529,47 @@
      other words, it vanishes completely after `gtroff' has processed
      it.
 
-   For example, the following two lines are equivalent:
+     For example, the following two lines are equivalent:
 
 
-     .nr a (((17 + (3 * 4))) % 4)
-     \R'a (((17 + (3 * 4))) % 4)'
-         => 1
+          .nr a (((17 + (3 * 4))) % 4)
+          \R'a (((17 + (3 * 4))) % 4)'
+              => 1
+
+     Note that the complete transparency of `\R' can cause surprising
+     effects if you use number registers like `.k' which get evaluated
+     at the time they are accessed.
+
+
+          .ll 1.6i
+          .
+          aaa bbb ccc ddd eee fff ggg hhh\R':k \n[.k]'
+          .tm :k == \n[:k]
+              => :k == 126950
+          .
+          .br
+          .
+          aaa bbb ccc ddd eee fff ggg hhh\h'0'\R':k \n[.k]'
+          .tm :k == \n[:k]
+              => :k == 15000
+
+     If you process this with the PostScript device (`-Tps'), there
+     will be a line break eventually after `ggg' in both input lines.
+     However, after processing the space after `ggg', the partially
+     collected line is not overfull yet, so `troff' continues to
+     collect input until it sees the space (or in this case, the
+     newline) after `hhh'.  At this point, the line is longer than the
+     line length, and the line gets broken.
+
+     In the first input line, since the `\R' escape leaves no traces,
+     the check for the overfull line hasn't been done yet at the point
+     where `\R' gets handled, and you get a value for the `.k' number
+     register which is even greater than the current line length.
+
+     In the second input line, the insertion of `\h'0'' to emit an
+     invisible zero-width space forces `troff' to check the line length
+     which in turn causes the start of a new output line.  Now `.k'
+     returns the expected value.
 
    Both `nr' and `\R' have two additional special forms to increment or
 decrement a register.
@@ -4730,6 +4818,10 @@
 `\n[.H]'
      Horizontal resolution in basic units.
 
+`\n[.R]'
+     The number of number registers available.  This is always 10000 in
+     GNU `troff'; it exists for backward compatibility.
+
 `\n[.U]'
      If `gtroff' is called with the `-U' command line option to
      activate unsafe mode, the number register `.U' is set to 1, and to
@@ -5245,7 +5337,9 @@
      the current list of patterns.  Its arguments are pairs of
      character codes - integers from 0 to 255.  The request maps
      character code A to code B, code C to code D, and so on.  You can
-     use character codes which would be invalid otherwise.
+     use character codes which would be invalid otherwise.  By default,
+     everything maps to itself except letters `A' to `Z' which map to
+     `a' to `z'.
 
      The set of hyphenation patterns is associated with the current
      language set by the `hla' request.  The `hpf' request is usually
@@ -5935,7 +6029,7 @@
               => foo bar
 
      The first backslash is consumed while the macro is read, and the
-     second is swallowed while exexuting macro `foo'.
+     second is swallowed while executing macro `foo'.
 
    A "translation" is a mapping of an input character to an output
 glyph.  The mapping occurs at output time, i.e., the input character
@@ -6581,6 +6675,7 @@
 * Font Families::
 * Font Positions::
 * Using Symbols::
+* Character Classes::
 * Special Fonts::
 * Artificial Fonts::
 * Ligatures and Kerning::
@@ -6886,7 +6981,7 @@
      *Note Changing Fonts::, for the standard syntax form.
 
 
-File: groff.info,  Node: Using Symbols,  Next: Special Fonts,  Prev: Font Positions,  Up: Fonts and Symbols
+File: groff.info,  Node: Using Symbols,  Next: Character Classes,  Prev: Font Positions,  Up: Fonts and Symbols
 
 5.17.4 Using Symbols
 --------------------
@@ -7132,7 +7227,9 @@
      can be modified with the `cflags' request.  The first argument is
      the sum of the desired flags and the remaining arguments are the
      characters or symbols to have those properties.  It is possible to
-     omit the spaces between the characters or symbols.
+     omit the spaces between the characters or symbols.  Instead of
+     single characters or symbols you can also use character classes
+     (see *note Character Classes:: for more details).
 
     `1'
           The character ends sentences (initially characters `.?!' have
@@ -7187,6 +7284,30 @@
           `\:' right after the hyphen at the places which really need a
           break point.
 
+    `128'
+          Prohibit a line break before the character, but allow a line
+          break after the character.  This works only in combination
+          with flags 256 and 512 (see below) and has no effect
+          otherwise.
+
+    `256'
+          Prohibit a line break after the character, but allow a line
+          break before the character.  This works only in combination
+          with flags 128 and 512 (see below) and has no effect
+          otherwise.
+
+    `512'
+          Allow line break before or after the character.  This works
+          only in combination with flags 128 and 256 and has no effect
+          otherwise.
+
+          Contrary to flag values 2 and 4, the flags 128, 256, and 512
+          work pairwise.  If, for example, the left character has value
+          512, and the right character 128, no line break gets
+          inserted.  If we use value 6 instead for the left character,
+          a line break after the character can't be suppressed since
+          the right neighbour character doesn't get examined.
+
  -- Request: .char g [string]
  -- Request: .fchar g [string]
  -- Request: .fschar f g [string]
@@ -7279,9 +7400,78 @@
    (4) `char' is a misnomer since an output glyph is defined.
 
 
-File: groff.info,  Node: Special Fonts,  Next: Artificial Fonts,  Prev: Using Symbols,  Up: Fonts and Symbols
+File: groff.info,  Node: Character Classes,  Next: Special Fonts,  Prev: Using Symbols,  Up: Fonts and Symbols
+
+5.17.5 Character Classes
+------------------------
 
-5.17.5 Special Fonts
+Classes are particularly useful for East Asian languages such as
+Chinese, Japanese, and Korean, where the number of needed characters is
+much larger than in European languages, and where large sets of
+characters share the same properties.
+
+ -- Request: .class n c1 c2 ...
+     In `groff', a "character class" (or simply "class") is a set of
+     characters, grouped by some user aspect.  The `class' request
+     defines such classes so that other requests can refer to all
+     characters belonging to this set with a single class name.
+     Currently, only the `cflags' request can handle character classes.
+
+     A `class' request takes a class name followed by a list of
+     entities.  In its simplest form, the entities are characters or
+     symbols:
+
+
+          .class [prepunct] , : ; > }
+
+     Since class and glyph names share the same namespace, it is
+     recommended to start and end the class name with `[' and `]',
+     respectively, to avoid collisions with normal `groff' symbols (and
+     symbols defined by the user).  In particular, the presence of `]'
+     in the symbol name intentionally prevents the usage of `\[...]',
+     thus you must use the `\C' escape to access a class with such a
+     name.
+
+     You can also use a special character range notation, consisting of
+     a start character or symbol, followed by `-', and an end character
+     or symbol.  Internally, `gtroff' converts these two symbol names to
+     Unicode values (according to the groff glyph gist) which then give
+     the start and end value of the range.  If that fails, the class
+     definition is skipped.
+
+     Finally, classes can be nested, too.
+
+     Here is a more complex example:
+
+
+          .class [prepunctx] \C'[prepunct]' \[u2013]-\[u2016]
+
+     The class `prepunctx' now contains the contents of the class
+     `prepunct' as defined above (the set `, : ; > }'), and characters
+     in the range between `U+2013' and `U+2016'.
+
+     If you want to add `-' to a class, it must be the first character
+     value in the argument list, otherwise it gets misinterpreted as a
+     range.
+
+     Note that it is not possible to use class names within range
+     definitions.
+
+     Typical use of the `class' request is to control line-breaking and
+     hyphenation rules as defined by the `cflags' request.  For example,
+     to inhibit line breaks before the characters belonging to the
+     `prepunctx' class, you can write:
+
+
+          .cflags 2 \C'[prepunctx]'
+
+     See the `cflags' request in *note Using Symbols::, for more
+     details.
+
+
+File: groff.info,  Node: Special Fonts,  Next: Artificial Fonts,  Prev: Character Classes,  Up: Fonts and Symbols
+
+5.17.6 Special Fonts
 --------------------
 
 Special fonts are those that `gtroff' searches when it cannot find the
@@ -7314,7 +7504,7 @@
 
 File: groff.info,  Node: Artificial Fonts,  Next: Ligatures and Kerning,  Prev: Special Fonts,  Up: Fonts and Symbols
 
-5.17.6 Artificial Fonts
+5.17.7 Artificial Fonts
 -----------------------
 
 There are a number of requests and escapes for artificially creating
@@ -7450,7 +7640,7 @@
 
 File: groff.info,  Node: Ligatures and Kerning,  Prev: Artificial Fonts,  Up: Fonts and Symbols
 
-5.17.7 Ligatures and Kerning
+5.17.8 Ligatures and Kerning
 ----------------------------
 
 Ligatures are groups of characters that are run together, i.e, producing
@@ -8165,8 +8355,8 @@
 5.20.1 Operators in Conditionals
 --------------------------------
 
-In `if', `ie', and `while' requests, there are several more operators
-available:
+In `if', `ie', and `while' requests, in addition to ordinary *note
+Expressions::, there are several more operators available:
 
 `e'
 `o'
@@ -8306,7 +8496,7 @@
      of the line) if EXPR evaluates to a value greater than zero
      (true).  ANYTHING is interpreted as though it was on a line by
      itself (except that leading spaces are swallowed).  *Note
-     Expressions::, for more info.
+     Operators in Conditionals::, for more info.
 
 
           .nr xxx 1
@@ -8431,324 +8621,6 @@
 
    *Note Expressions::.
 
-
-File: groff.info,  Node: Writing Macros,  Next: Page Motions,  Prev: Conditionals and Loops,  Up: gtroff Reference
-
-5.21 Writing Macros
-===================
-
-A "macro" is a collection of text and embedded commands which can be
-invoked multiple times.  Use macros to define common operations.  *Note
-Strings::, for a (limited) alternative syntax to call macros.
-
- -- Request: .de name [end]
- -- Request: .de1 name [end]
- -- Request: .dei name [end]
- -- Request: .dei1 name [end]
-     Define a new macro named NAME.  `gtroff' copies subsequent lines
-     (starting with the next one) into an internal buffer until it
-     encounters the line `..' (two dots).  The optional second argument
-     to `de' changes this to a macro to `.END'.
-
-     There can be whitespace after the first dot in the line containing
-     the ending token (either `.' or macro `END').  Don't insert a tab
-     character immediately after the `..', otherwise it isn't
-     recognized as the end-of-macro symbol.(1) (*note Writing
-     Macros-Footnote-1::)
-
-     Here a small example macro called `P' which causes a break and
-     inserts some vertical space.  It could be used to separate
-     paragraphs.
-
-
-          .de P
-          .  br
-          .  sp .8v
-          ..
-
-     The following example defines a macro within another.  Remember
-     that expansion must be protected twice; once for reading the macro
-     and once for executing.
-
-
-          \# a dummy macro to avoid a warning
-          .de end
-          ..
-          .
-          .de foo
-          .  de bar end
-          .    nop \f[B]Hallo \\\\$1!\f[]
-          .  end
-          ..
-          .
-          .foo
-          .bar Joe
-              => Hallo Joe!
-
-     Since `\f' has no expansion, it isn't necessary to protect its
-     backslash.  Had we defined another macro within `bar' which takes a
-     parameter, eight backslashes would be necessary before `$1'.
-
-     The `de1' request turns off compatibility mode while executing the
-     macro.  On entry, the current compatibility mode is saved and
-     restored at exit.
-
-
-          .nr xxx 12345
-          .
-          .de aa
-          The value of xxx is \\n[xxx].
-          ..
-          .de1 bb
-          The value of xxx ix \\n[xxx].
-          ..
-          .
-          .cp 1
-          .
-          .aa
-              => warning: number register `[' not defined
-              => The value of xxx is 0xxx].
-          .bb
-              => The value of xxx ix 12345.
-
-     The `dei' request defines a macro indirectly.  That is, it expands
-     strings whose names are NAME or END before performing the append.
-
-     This:
-
-
-          .ds xx aa
-          .ds yy bb
-          .dei xx yy
-
-     is equivalent to:
-
-
-          .de aa bb
-
-     The `dei1' request is similar to `dei' but with compatibility mode
-     switched off during execution of the defined macro.
-
-     If compatibility mode is on, `de' (and `dei') behave similar to
-     `de1' (and `dei1'): A `compatibility save' token is inserted at
-     the beginning, and a `compatibility restore' token at the end,
-     with compatibility mode switched on during execution.  *Note
-     Gtroff Internals::, for more information on switching
-     compatibility mode on and off in a single document.
-
-     Using `trace.tmac', you can trace calls to `de' and `de1'.
-
-     Note that macro identifiers are shared with identifiers for
-     strings and diversions.
-
-     *Note the description of the `als' request: als, for possible
-     pitfalls if redefining a macro which has been aliased.
-
- -- Request: .am name [end]
- -- Request: .am1 name [end]
- -- Request: .ami name [end]
- -- Request: .ami1 name [end]
-     Works similarly to `de' except it appends onto the macro named
-     NAME.  So, to make the previously defined `P' macro actually do
-     indented instead of block paragraphs, add the necessary code to the
-     existing macro like this:
-
-
-          .am P
-          .ti +5n
-          ..
-
-     The `am1' request turns off compatibility mode while executing the
-     appended macro piece.  To be more precise, a "compatibility save"
-     input token is inserted at the beginning of the appended code, and
-     a "compatibility restore" input token at the end.
-
-     The `ami' request appends indirectly, meaning that `gtroff'
-     expands strings whose names are NAME or END before performing the
-     append.
-
-     The `ami1' request is similar to `ami' but compatibility mode is
-     switched off during execution of the defined macro.
-
-     Using `trace.tmac', you can trace calls to `am' and `am1'.
-
-   *Note Strings::, for the `als' and `rn' request to create an alias
-and rename a macro, respectively.
-
-   The `de', `am', `di', `da', `ds', and `as' requests (together with
-its variants) only create a new object if the name of the macro,
-diversion or string diversion is currently undefined or if it is
-defined to be a request; normally they modify the value of an existing
-object.
-
- -- Request: .return [anything]
-     Exit a macro, immediately returning to the caller.
-
-     If called with an argument, exit twice, namely the current macro
-     and the macro one level higher.  This is used to define a wrapper
-     macro for `return' in `trace.tmac'.
-
-* Menu:
-
-* Copy-in Mode::
-* Parameters::
-
-
-File: groff.info,  Node: Writing Macros-Footnotes,  Up: Writing Macros
-
-   (1) While it is possible to define and call a macro `.' with
-
-
-     .de .
-     .  tm foo
-     ..
-     .
-     ..    \" This calls macro `.'!
-
-you can't use this as the end-of-macro macro: during a macro definition,
-`..' is never handled as a call to `.', even if you say `.de foo .'
-explicitly.
-
-
-File: groff.info,  Node: Copy-in Mode,  Next: Parameters,  Prev: Writing Macros,  Up: Writing Macros
-
-5.21.1 Copy-in Mode
--------------------
-
-When `gtroff' reads in the text for a macro, string, or diversion, it
-copies the text (including request lines, but excluding escapes) into
-an internal buffer.  Escapes are converted into an internal form, except
-for `\n', `\$', `\*', `\\' and `\<RET>' which are evaluated and
-inserted into the text where the escape was located.  This is known as
-"copy-in" mode or "copy" mode.
-
-   What this means is that you can specify when these escapes are to be
-evaluated (either at copy-in time or at the time of use) by insulating
-the escapes with an extra backslash.  Compare this to the `\def' and
-`\edef' commands in TeX.
-
-   The following example prints the numbers 20 and 10:
-
-
-     .nr x 20
-     .de y
-     .nr x 10
-     \&\nx
-     \&\\nx
-     ..
-     .y
-
-
-File: groff.info,  Node: Parameters,  Prev: Copy-in Mode,  Up: Writing Macros
-
-5.21.2 Parameters
------------------
-
-The arguments to a macro or string can be examined using a variety of
-escapes.
-
- -- Register: \n[.$]
-     The number of arguments passed to a macro or string.  This is a
-     read-only number register.
-
-     Note that the `shift' request can change its value.
-
-   Any individual argument can be retrieved with one of the following
-escapes:
-
- -- Escape: \$n
- -- Escape: \$(nn
- -- Escape: \$[nnn]
-     Retrieve the Nth, NNth or NNNth argument.  As usual, the first
-     form only accepts a single number (larger than zero), the second a
-     two-digit number (larger or equal to 10), and the third any
-     positive integer value (larger than zero).  Macros and strings can
-     have an unlimited number of arguments.  Note that due to copy-in
-     mode, use two backslashes on these in actual use to prevent
-     interpolation until the macro is actually invoked.
-
- -- Request: .shift [n]
-     Shift the arguments 1 position, or as many positions as specified
-     by its argument.  After executing this request, argument I becomes
-     argument I-N; arguments 1 to N are no longer available.  Shifting
-     by negative amounts is currently undefined.
-
-     The register `.$' is adjusted accordingly.
-
- -- Escape: \$*
- -- Escape: \$@
-     In some cases it is convenient to use all of the arguments at once
-     (for example, to pass the arguments along to another macro).  The
-     `\$*' escape concatenates all the arguments separated by spaces.
-     A similar escape is `\$@', which concatenates all the arguments
-     with each surrounded by double quotes, and separated by spaces.
-     If not in compatibility mode, the input level of double quotes is
-     preserved (see *note Request and Macro Arguments::).
-
- -- Escape: \$^
-     Handle the parameters of a macro as if they were an argument to the
-     `ds' or similar requests.
-
-
-          .de foo
-          .  tm $1=`\\$1'
-          .  tm $2=`\\$2'
-          .  tm $*=`\\$*'
-          .  tm $@=`\\$@'
-          .  tm $^=`\\$^'
-          ..
-          .foo " This is a "test"
-              => $1=` This is a '
-              => $2=`test"'
-              => $*=` This is a  test"'
-              => $@=`" This is a " "test""'
-              => $^=`" This is a "test"'
-
-     This escape is useful mainly for macro packages like `trace.tmac'
-     which redefines some requests and macros for debugging purposes.
-
- -- Escape: \$0
-     The name used to invoke the current macro.  The `als' request can
-     make a macro have more than one name.
-
-     If a macro is called as a string (within another macro), the value
-     of `\$0' isn't changed.
-
-
-          .de foo
-          .  tm \\$0
-          ..
-          .als foo bar
-          .
-
-
-          .de aaa
-          .  foo
-          ..
-          .de bbb
-          .  bar
-          ..
-          .de ccc
-          \\*[foo]\\
-          ..
-          .de ddd
-          \\*[bar]\\
-          ..
-          .
-
-
-          .aaa
-              => foo
-          .bbb
-              => bar
-          .ccc
-              => ccc
-          .ddd
-              => ddd
-
-
-   *Note Request and Macro Arguments::.
-
 
 
 Local Variables:
diff -ruN groff-1.20.1/doc/groff.info-2 groff-1.21/doc/groff.info-2
--- groff-1.20.1/doc/groff.info-2	2009-01-09 15:25:55.000000000 +0100
+++ groff-1.21/doc/groff.info-2	2010-12-31 08:33:12.000000000 +0100
@@ -1,10 +1,10 @@
 This is groff.info, produced by makeinfo version 4.13 from
 ./groff.texinfo.
 
-This manual documents GNU `troff' version 1.20.1.
+This manual documents GNU `troff' version 1.21.
 
    Copyright (C) 1994-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 Free Software Foundation, Inc.
+2008, 2009, 2010 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -24,6 +24,324 @@
 END-INFO-DIR-ENTRY
 
 
+File: groff.info,  Node: Writing Macros,  Next: Page Motions,  Prev: Conditionals and Loops,  Up: gtroff Reference
+
+5.21 Writing Macros
+===================
+
+A "macro" is a collection of text and embedded commands which can be
+invoked multiple times.  Use macros to define common operations.  *Note
+Strings::, for a (limited) alternative syntax to call macros.
+
+ -- Request: .de name [end]
+ -- Request: .de1 name [end]
+ -- Request: .dei name [end]
+ -- Request: .dei1 name [end]
+     Define a new macro named NAME.  `gtroff' copies subsequent lines
+     (starting with the next one) into an internal buffer until it
+     encounters the line `..' (two dots).  The optional second argument
+     to `de' changes this to a macro to `.END'.
+
+     There can be whitespace after the first dot in the line containing
+     the ending token (either `.' or macro `END').  Don't insert a tab
+     character immediately after the `..', otherwise it isn't
+     recognized as the end-of-macro symbol.(1) (*note Writing
+     Macros-Footnote-1::)
+
+     Here a small example macro called `P' which causes a break and
+     inserts some vertical space.  It could be used to separate
+     paragraphs.
+
+
+          .de P
+          .  br
+          .  sp .8v
+          ..
+
+     The following example defines a macro within another.  Remember
+     that expansion must be protected twice; once for reading the macro
+     and once for executing.
+
+
+          \# a dummy macro to avoid a warning
+          .de end
+          ..
+          .
+          .de foo
+          .  de bar end
+          .    nop \f[B]Hallo \\\\$1!\f[]
+          .  end
+          ..
+          .
+          .foo
+          .bar Joe
+              => Hallo Joe!
+
+     Since `\f' has no expansion, it isn't necessary to protect its
+     backslash.  Had we defined another macro within `bar' which takes a
+     parameter, eight backslashes would be necessary before `$1'.
+
+     The `de1' request turns off compatibility mode while executing the
+     macro.  On entry, the current compatibility mode is saved and
+     restored at exit.
+
+
+          .nr xxx 12345
+          .
+          .de aa
+          The value of xxx is \\n[xxx].
+          ..
+          .de1 bb
+          The value of xxx ix \\n[xxx].
+          ..
+          .
+          .cp 1
+          .
+          .aa
+              => warning: number register `[' not defined
+              => The value of xxx is 0xxx].
+          .bb
+              => The value of xxx ix 12345.
+
+     The `dei' request defines a macro indirectly.  That is, it expands
+     strings whose names are NAME or END before performing the append.
+
+     This:
+
+
+          .ds xx aa
+          .ds yy bb
+          .dei xx yy
+
+     is equivalent to:
+
+
+          .de aa bb
+
+     The `dei1' request is similar to `dei' but with compatibility mode
+     switched off during execution of the defined macro.
+
+     If compatibility mode is on, `de' (and `dei') behave similar to
+     `de1' (and `dei1'): A `compatibility save' token is inserted at
+     the beginning, and a `compatibility restore' token at the end,
+     with compatibility mode switched on during execution.  *Note
+     Gtroff Internals::, for more information on switching
+     compatibility mode on and off in a single document.
+
+     Using `trace.tmac', you can trace calls to `de' and `de1'.
+
+     Note that macro identifiers are shared with identifiers for
+     strings and diversions.
+
+     *Note the description of the `als' request: als, for possible
+     pitfalls if redefining a macro which has been aliased.
+
+ -- Request: .am name [end]
+ -- Request: .am1 name [end]
+ -- Request: .ami name [end]
+ -- Request: .ami1 name [end]
+     Works similarly to `de' except it appends onto the macro named
+     NAME.  So, to make the previously defined `P' macro actually do
+     indented instead of block paragraphs, add the necessary code to the
+     existing macro like this:
+
+
+          .am P
+          .ti +5n
+          ..
+
+     The `am1' request turns off compatibility mode while executing the
+     appended macro piece.  To be more precise, a "compatibility save"
+     input token is inserted at the beginning of the appended code, and
+     a "compatibility restore" input token at the end.
+
+     The `ami' request appends indirectly, meaning that `gtroff'
+     expands strings whose names are NAME or END before performing the
+     append.
+
+     The `ami1' request is similar to `ami' but compatibility mode is
+     switched off during execution of the defined macro.
+
+     Using `trace.tmac', you can trace calls to `am' and `am1'.
+
+   *Note Strings::, for the `als' and `rn' request to create an alias
+and rename a macro, respectively.
+
+   The `de', `am', `di', `da', `ds', and `as' requests (together with
+its variants) only create a new object if the name of the macro,
+diversion or string diversion is currently undefined or if it is
+defined to be a request; normally they modify the value of an existing
+object.
+
+ -- Request: .return [anything]
+     Exit a macro, immediately returning to the caller.
+
+     If called with an argument, exit twice, namely the current macro
+     and the macro one level higher.  This is used to define a wrapper
+     macro for `return' in `trace.tmac'.
+
+* Menu:
+
+* Copy-in Mode::
+* Parameters::
+
+
+File: groff.info,  Node: Writing Macros-Footnotes,  Up: Writing Macros
+
+   (1) While it is possible to define and call a macro `.' with
+
+
+     .de .
+     .  tm foo
+     ..
+     .
+     ..    \" This calls macro `.'!
+
+you can't use this as the end-of-macro macro: during a macro definition,
+`..' is never handled as a call to `.', even if you say `.de foo .'
+explicitly.
+
+
+File: groff.info,  Node: Copy-in Mode,  Next: Parameters,  Prev: Writing Macros,  Up: Writing Macros
+
+5.21.1 Copy-in Mode
+-------------------
+
+When `gtroff' reads in the text for a macro, string, or diversion, it
+copies the text (including request lines, but excluding escapes) into
+an internal buffer.  Escapes are converted into an internal form, except
+for `\n', `\$', `\*', `\\' and `\<RET>' which are evaluated and
+inserted into the text where the escape was located.  This is known as
+"copy-in" mode or "copy" mode.
+
+   What this means is that you can specify when these escapes are to be
+evaluated (either at copy-in time or at the time of use) by insulating
+the escapes with an extra backslash.  Compare this to the `\def' and
+`\edef' commands in TeX.
+
+   The following example prints the numbers 20 and 10:
+
+
+     .nr x 20
+     .de y
+     .nr x 10
+     \&\nx
+     \&\\nx
+     ..
+     .y
+
+
+File: groff.info,  Node: Parameters,  Prev: Copy-in Mode,  Up: Writing Macros
+
+5.21.2 Parameters
+-----------------
+
+The arguments to a macro or string can be examined using a variety of
+escapes.
+
+ -- Register: \n[.$]
+     The number of arguments passed to a macro or string.  This is a
+     read-only number register.
+
+     Note that the `shift' request can change its value.
+
+   Any individual argument can be retrieved with one of the following
+escapes:
+
+ -- Escape: \$n
+ -- Escape: \$(nn
+ -- Escape: \$[nnn]
+     Retrieve the Nth, NNth or NNNth argument.  As usual, the first
+     form only accepts a single number (larger than zero), the second a
+     two-digit number (larger or equal to 10), and the third any
+     positive integer value (larger than zero).  Macros and strings can
+     have an unlimited number of arguments.  Note that due to copy-in
+     mode, use two backslashes on these in actual use to prevent
+     interpolation until the macro is actually invoked.
+
+ -- Request: .shift [n]
+     Shift the arguments 1 position, or as many positions as specified
+     by its argument.  After executing this request, argument I becomes
+     argument I-N; arguments 1 to N are no longer available.  Shifting
+     by negative amounts is currently undefined.
+
+     The register `.$' is adjusted accordingly.
+
+ -- Escape: \$*
+ -- Escape: \$@
+     In some cases it is convenient to use all of the arguments at once
+     (for example, to pass the arguments along to another macro).  The
+     `\$*' escape concatenates all the arguments separated by spaces.
+     A similar escape is `\$@', which concatenates all the arguments
+     with each surrounded by double quotes, and separated by spaces.
+     If not in compatibility mode, the input level of double quotes is
+     preserved (see *note Request and Macro Arguments::).
+
+ -- Escape: \$^
+     Handle the parameters of a macro as if they were an argument to the
+     `ds' or similar requests.
+
+
+          .de foo
+          .  tm $1=`\\$1'
+          .  tm $2=`\\$2'
+          .  tm $*=`\\$*'
+          .  tm $@=`\\$@'
+          .  tm $^=`\\$^'
+          ..
+          .foo " This is a "test"
+              => $1=` This is a '
+              => $2=`test"'
+              => $*=` This is a  test"'
+              => $@=`" This is a " "test""'
+              => $^=`" This is a "test"'
+
+     This escape is useful mainly for macro packages like `trace.tmac'
+     which redefines some requests and macros for debugging purposes.
+
+ -- Escape: \$0
+     The name used to invoke the current macro.  The `als' request can
+     make a macro have more than one name.
+
+     If a macro is called as a string (within another macro), the value
+     of `\$0' isn't changed.
+
+
+          .de foo
+          .  tm \\$0
+          ..
+          .als foo bar
+          .
+
+
+          .de aaa
+          .  foo
+          ..
+          .de bbb
+          .  bar
+          ..
+          .de ccc
+          \\*[foo]\\
+          ..
+          .de ddd
+          \\*[bar]\\
+          ..
+          .
+
+
+          .aaa
+              => foo
+          .bbb
+              => bar
+          .ccc
+              => ccc
+          .ddd
+              => ddd
+
+
+   *Note Request and Macro Arguments::.
+
+
 File: groff.info,  Node: Page Motions,  Next: Drawing Requests,  Prev: Writing Macros,  Up: gtroff Reference
 
 5.22 Page Motions
@@ -551,6 +869,7 @@
 * Diversion Traps::
 * Input Line Traps::
 * Blank Line Traps::
+* Leading Spaces Traps::
 * End-of-input Traps::
 
 
@@ -788,7 +1107,7 @@
      number of already processed lines.
 
 
-File: groff.info,  Node: Blank Line Traps,  Next: End-of-input Traps,  Prev: Input Line Traps,  Up: Traps
+File: groff.info,  Node: Blank Line Traps,  Next: Leading Spaces Traps,  Prev: Input Line Traps,  Up: Traps
 
 5.24.4 Blank Line Traps
 -----------------------
@@ -798,9 +1117,41 @@
      a blank line in the input file.
 
 
-File: groff.info,  Node: End-of-input Traps,  Prev: Blank Line Traps,  Up: Traps
+File: groff.info,  Node: Leading Spaces Traps,  Next: End-of-input Traps,  Prev: Blank Line Traps,  Up: Traps
 
-5.24.5 End-of-input Traps
+5.24.5 Leading Spaces Traps
+---------------------------
+
+ -- Request: .lsm macro
+ -- Register: \n[lsn]
+ -- Register: \n[lss]
+     Set a leading spaces trap.  `gtroff' executes MACRO when it
+     encounters leading spaces in an input line; the implicit line break
+     which normally happens in this case is suppressed.  A line
+     consisting of spaces only, however, is treated as an empty line,
+     possibly subject to an empty line macro set with the `blm' request.
+
+     Leading spaces are removed from the input line before calling the
+     leading spaces macro.  The number of removed spaces is stored in
+     register `lsn'; the horizontal space which would be emitted if
+     there was no leading space macro is stored in register `lss'.
+     Note that `lsn' and `lss' are available even if no leading space
+     macro has been set.
+
+     The first thing a leading space macro sees is a token.  However,
+     some escapes like `\f' or `\m' are handled on the fly (see *note
+     Gtroff Internals::, for a complete list) without creating a token
+     at all.  Consider that a line starts with two spaces followed by
+     `\fIfoo'.  While skipping the spaces `\fI' is handled too so that
+     groff's current font is properly set to `I', but the leading space
+     macro only sees `foo', without the preceding `\fI'.  If the macro
+     should see the font escape you have to `protect' it with something
+     which creates a token, for example with `\&\fIfoo'.
+
+
+File: groff.info,  Node: End-of-input Traps,  Prev: Leading Spaces Traps,  Up: Traps
+
+5.24.6 End-of-input Traps
 -------------------------
 
  -- Request: .em macro
@@ -813,8 +1164,9 @@
 
 
           .de approval
-          .  ne 5v
-          .  sp |(\\n[.t] - 6v)
+          \c
+          .  ne 3v
+          .  sp (\\n[.t]u - 3v)
           .  in +4i
           .  lc _
           .  br
@@ -825,6 +1177,54 @@
           .
           .em approval
 
+     The `\c' in the above example needs explanation.  For historical
+     reasons (and for compatibility with AT&T `troff'), the end macro
+     exits as soon as it causes a page break and no remaining data is
+     in the partially collected line.
+
+     Let us assume that there is no `\c' in the above `approval' macro,
+     and that the page is full and has been ended with, say, a `br'
+     request.  The `ne' request now causes the start of a new page,
+     which in turn makes `troff' exit immediately for the reasons just
+     described.  In most situations this is not intended.
+
+     To always force processing the whole end macro independently of
+     this behaviour it is thus advisable to insert something which
+     starts an empty partially filled line (`\c') whenever there is a
+     chance that a page break can happen.  In the above example, the
+     call of the `ne' request assures that the remaining code stays on
+     the same page, so we have to insert `\c' only once.
+
+     The next example shows how to append three lines, then starting a
+     new page unconditionally.  Since `.ne 1' doesn't give the desired
+     effect - there is always one line available or we are already at
+     the beginning of the next page - we temporarily increase the page
+     length by one line so that we can use `.ne 2'.
+
+
+          .de EM
+          .pl +1v
+          \c
+          .ne 2
+          line one
+          .br
+          \c
+          .ne 2
+          line two
+          .br
+          \c
+          .ne 2
+          line three
+          .br
+          .pl -1v
+          \c
+          'bp
+          ..
+          .em EM
+
+     Note that this specific feature affects only the first potential
+     page break caused by the end macro; further page breaks emitted by
+     the end macro are handled normally.
 
 
 File: groff.info,  Node: Diversions,  Next: Environments,  Prev: Traps,  Up: gtroff Reference
@@ -1379,7 +1779,9 @@
      the specified FILE in the same directories as macro files for the
      the `-m' command line option.  If the file name to be included has
      the form `NAME.tmac' and it isn't found, `mso' tries to include
-     `tmac.NAME' and vice versa.
+     `tmac.NAME' and vice versa.  If the file does not exist, a warning
+     of type `file' is emitted.  *Note Debugging::, for information
+     about warnings.
 
  -- Request: .trf file
  -- Request: .cf file
@@ -2204,6 +2606,11 @@
 `524288'
      Color related warnings.
 
+`file'
+`1048576'
+     Missing files.  The `mso' request gives this warning when the
+     requested macro file does not exist.  This is enabled by default.
+
 `all'
      All warnings except `di', `mac' and `reg'.  It is intended that
      this covers all warnings that are useful with traditional macro
@@ -2369,6 +2776,7 @@
 * grap::
 * grefer::
 * gsoelim::
+* preconv::
 
 
 File: groff.info,  Node: geqn,  Next: gtbl,  Prev: Preprocessors,  Up: Preprocessors
@@ -2462,7 +2870,7 @@
 -----------------------
 
 
-File: groff.info,  Node: gsoelim,  Prev: grefer,  Up: Preprocessors
+File: groff.info,  Node: gsoelim,  Next: preconv,  Prev: grefer,  Up: Preprocessors
 
 6.7 `gsoelim'
 =============
@@ -2478,6 +2886,22 @@
 ------------------------
 
 
+File: groff.info,  Node: preconv,  Prev: gsoelim,  Up: Preprocessors
+
+6.8 `preconv'
+=============
+
+* Menu:
+
+* Invoking preconv::
+
+
+File: groff.info,  Node: Invoking preconv,  Prev: preconv,  Up: preconv
+
+6.8.1 Invoking `preconv'
+------------------------
+
+
 File: groff.info,  Node: Output Devices,  Next: File formats,  Prev: Preprocessors,  Up: Top
 
 7 Output Devices
@@ -2595,6 +3019,27 @@
 7.7 `grohtml'
 =============
 
+The `grohtml' front end (which consists of a preprocessor,
+`pre-grohtml', and a device driver, `post-grohtml') translates the
+output of GNU `troff' to HTML.  Users should always invoke `grohtml'
+via the `groff' command with a `\-Thtml' option.  If no files are
+given, `grohtml' will read the standard input.  A filename of `-' will
+also cause `grohtml' to read the standard input.  HTML output is
+written to the standard output.  When `grohtml' is run by `groff',
+options can be passed to `grohtml' using `groff''s `-P' option.
+
+   `grohtml' invokes `groff' twice.  In the first pass, pictures,
+equations, and tables are rendered using the `ps' device, and in the
+second pass HTML output is generated by the `html' device.
+
+   `grohtml' always writes output in `UTF-8' encoding and has built-in
+entities for all non-composite unicode characters.  In spite of this,
+`groff' may issue warnings about unknown special characters if they
+can't be found during the first pass.  Such warnings can be safely
+ignored unless the special characters appear inside a table or
+equation, in which case glyphs for these characters must be defined for
+the `ps' device as well.
+
 * Menu:
 
 * Invoking grohtml::
@@ -4298,7 +4743,7 @@
 * ad:                                    Manipulating Filling and Adjusting.
                                                               (line  52)
 * af:                                    Assigning Formats.   (line  12)
-* aln:                                   Setting Registers.   (line  79)
+* aln:                                   Setting Registers.   (line 114)
 * als:                                   Strings.             (line 237)
 * am:                                    Writing Macros.      (line 114)
 * am1:                                   Writing Macros.      (line 115)
@@ -4324,12 +4769,13 @@
                                                               (line  10)
 * ce:                                    Manipulating Filling and Adjusting.
                                                               (line 189)
-* cf:                                    I/O.                 (line  49)
+* cf:                                    I/O.                 (line  51)
 * cflags:                                Using Symbols.       (line 242)
 * ch:                                    Page Location Traps. (line 119)
-* char:                                  Using Symbols.       (line 303)
+* char:                                  Using Symbols.       (line 329)
 * chop:                                  Strings.             (line 276)
-* close:                                 I/O.                 (line 239)
+* class:                                 Character Classes.   (line  12)
+* close:                                 I/O.                 (line 241)
 * color:                                 Colors.              (line   7)
 * composite:                             Using Symbols.       (line 195)
 * continue:                              while.               (line  77)
@@ -4368,13 +4814,13 @@
 * ex:                                    Debugging.           (line  45)
 * fam:                                   Font Families.       (line  19)
 * fc:                                    Fields.              (line  18)
-* fchar:                                 Using Symbols.       (line 304)
+* fchar:                                 Using Symbols.       (line 330)
 * fcolor:                                Colors.              (line  85)
 * fi:                                    Manipulating Filling and Adjusting.
                                                               (line  30)
 * fl:                                    Debugging.           (line  89)
 * fp:                                    Font Positions.      (line  11)
-* fschar:                                Using Symbols.       (line 305)
+* fschar:                                Using Symbols.       (line 331)
 * fspecial:                              Special Fonts.       (line  18)
 * ft <1>:                                Font Positions.      (line  58)
 * ft:                                    Changing Fonts.      (line   7)
@@ -4384,9 +4830,9 @@
 * hc:                                    Manipulating Hyphenation.
                                                               (line 105)
 * hcode:                                 Manipulating Hyphenation.
-                                                              (line 174)
+                                                              (line 176)
 * hla:                                   Manipulating Hyphenation.
-                                                              (line 252)
+                                                              (line 254)
 * hlm:                                   Manipulating Hyphenation.
                                                               (line  45)
 * hpf:                                   Manipulating Hyphenation.
@@ -4400,9 +4846,9 @@
 * hy:                                    Manipulating Hyphenation.
                                                               (line   9)
 * hym:                                   Manipulating Hyphenation.
-                                                              (line 208)
+                                                              (line 210)
 * hys:                                   Manipulating Hyphenation.
-                                                              (line 223)
+                                                              (line 225)
 * ie:                                    if-else.             (line  27)
 * if:                                    if-else.             (line  10)
 * ig:                                    Comments.            (line  67)
@@ -4420,6 +4866,8 @@
 * ll:                                    Line Layout.         (line 145)
 * ls:                                    Manipulating Spacing.
                                                               (line  69)
+* lsm:                                   Leading Spaces Traps.
+                                                              (line   7)
 * lt:                                    Page Layout.         (line  60)
 * mc:                                    Miscellaneous.       (line  76)
 * mk:                                    Page Motions.        (line  10)
@@ -4440,14 +4888,14 @@
                                                               (line  32)
 * ns:                                    Manipulating Spacing.
                                                               (line 131)
-* nx:                                    I/O.                 (line  83)
-* open:                                  I/O.                 (line 207)
-* opena:                                 I/O.                 (line 208)
+* nx:                                    I/O.                 (line  85)
+* open:                                  I/O.                 (line 209)
+* opena:                                 I/O.                 (line 210)
 * os:                                    Page Control.        (line  55)
 * output:                                Diversions.          (line 185)
 * pc:                                    Page Layout.         (line  89)
 * pev:                                   Debugging.           (line  64)
-* pi:                                    I/O.                 (line 147)
+* pi:                                    I/O.                 (line 149)
 * pl:                                    Page Layout.         (line  10)
 * pm:                                    Debugging.           (line  68)
 * pn:                                    Page Layout.         (line  77)
@@ -4458,22 +4906,22 @@
 * pso:                                   I/O.                 (line  30)
 * ptr:                                   Debugging.           (line  83)
 * pvs:                                   Changing Type Sizes. (line 133)
-* rchar:                                 Using Symbols.       (line 362)
-* rd:                                    I/O.                 (line  88)
+* rchar:                                 Using Symbols.       (line 388)
+* rd:                                    I/O.                 (line  90)
 * return:                                Writing Macros.      (line 151)
-* rfschar:                               Using Symbols.       (line 363)
+* rfschar:                               Using Symbols.       (line 389)
 * rj:                                    Manipulating Filling and Adjusting.
                                                               (line 238)
 * rm:                                    Strings.             (line 232)
 * rn:                                    Strings.             (line 229)
-* rnn:                                   Setting Registers.   (line  75)
-* rr:                                    Setting Registers.   (line  71)
+* rnn:                                   Setting Registers.   (line 110)
+* rr:                                    Setting Registers.   (line 106)
 * rs:                                    Manipulating Spacing.
                                                               (line 132)
 * rt:                                    Page Motions.        (line  11)
-* schar:                                 Using Symbols.       (line 306)
+* schar:                                 Using Symbols.       (line 332)
 * shc:                                   Manipulating Hyphenation.
-                                                              (line 239)
+                                                              (line 241)
 * shift:                                 Parameters.          (line  30)
 * sizes:                                 Changing Type Sizes. (line  69)
 * so:                                    I/O.                 (line   9)
@@ -4486,7 +4934,7 @@
 * sty:                                   Font Families.       (line  60)
 * substring:                             Strings.             (line 201)
 * sv:                                    Page Control.        (line  54)
-* sy:                                    I/O.                 (line 169)
+* sy:                                    I/O.                 (line 171)
 * ta:                                    Tabs and Fields.     (line  14)
 * tc:                                    Tabs and Fields.     (line 139)
 * ti:                                    Line Layout.         (line 117)
@@ -4498,7 +4946,7 @@
 * tmc:                                   Debugging.           (line  27)
 * tr:                                    Character Translations.
                                                               (line 155)
-* trf:                                   I/O.                 (line  48)
+* trf:                                   I/O.                 (line  50)
 * trin:                                  Character Translations.
                                                               (line 156)
 * trnt:                                  Character Translations.
@@ -4514,9 +4962,9 @@
 * warnscale:                             Debugging.           (line 131)
 * wh:                                    Page Location Traps. (line  29)
 * while:                                 while.               (line  10)
-* write:                                 I/O.                 (line 219)
-* writec:                                I/O.                 (line 220)
-* writem:                                I/O.                 (line 230)
+* write:                                 I/O.                 (line 221)
+* writec:                                I/O.                 (line 222)
+* writem:                                I/O.                 (line 232)
 
 
 File: groff.info,  Node: Escape Index,  Next: Operator Index,  Prev: Request Index,  Up: Top
@@ -4568,7 +5016,7 @@
 * \a:                                    Leaders.             (line  18)
 * \A:                                    Identifiers.         (line  55)
 * \b:                                    Drawing Requests.    (line 239)
-* \B:                                    Expressions.         (line  66)
+* \B:                                    Expressions.         (line  84)
 * \C:                                    Using Symbols.       (line 189)
 * \c:                                    Line Control.        (line  44)
 * \D:                                    Drawing Requests.    (line  71)
@@ -4602,7 +5050,7 @@
 * \S:                                    Artificial Fonts.    (line  45)
 * \t:                                    Tabs and Fields.     (line  10)
 * \u:                                    Page Motions.        (line 106)
-* \V:                                    I/O.                 (line 257)
+* \V:                                    I/O.                 (line 259)
 * \v:                                    Page Motions.        (line  87)
 * \w:                                    Page Motions.        (line 155)
 * \X:                                    Postprocessor Access.
@@ -4630,21 +5078,21 @@
 * !:                                     Expressions.          (line 21)
 * %:                                     Expressions.          (line  8)
 * &:                                     Expressions.          (line 19)
-* (:                                     Expressions.          (line 42)
-* ):                                     Expressions.          (line 42)
+* (:                                     Expressions.          (line 60)
+* ):                                     Expressions.          (line 60)
 * *:                                     Expressions.          (line  8)
 * +:                                     Expressions.          (line  8)
 * -:                                     Expressions.          (line  8)
 * /:                                     Expressions.          (line  8)
 * <:                                     Expressions.          (line 15)
 * <=:                                    Expressions.          (line 15)
-* <?:                                    Expressions.          (line 27)
+* <?:                                    Expressions.          (line 45)
 * <colon>:                               Expressions.          (line 19)
 * =:                                     Expressions.          (line 15)
 * ==:                                    Expressions.          (line 15)
 * >:                                     Expressions.          (line 15)
 * >=:                                    Expressions.          (line 15)
-* >?:                                    Expressions.          (line 27)
+* >?:                                    Expressions.          (line 45)
 
 
 File: groff.info,  Node: Register Index,  Next: Macro Index,  Prev: Operator Index,  Up: Top
@@ -4663,18 +5111,18 @@
 [index]
 * Menu:
 
-* $$:                                    Built-in Registers.  (line  96)
+* $$:                                    Built-in Registers.  (line 100)
 * % <1>:                                 Page Control.        (line  10)
 * %:                                     Page Layout.         (line  89)
 * .$:                                    Parameters.          (line  10)
 * .a:                                    Manipulating Spacing.
                                                               (line  90)
-* .A:                                    Built-in Registers.  (line 103)
+* .A:                                    Built-in Registers.  (line 107)
 * .b:                                    Artificial Fonts.    (line  98)
 * .br:                                   Requests.            (line  58)
 * .C:                                    Implementation Differences.
                                                               (line  25)
-* .c:                                    Built-in Registers.  (line  73)
+* .c:                                    Built-in Registers.  (line  77)
 * .cdp:                                  Environments.        (line  96)
 * .ce:                                   Manipulating Filling and Adjusting.
                                                               (line 190)
@@ -4688,12 +5136,12 @@
 * .fam:                                  Font Families.       (line  20)
 * .fn:                                   Font Families.       (line  24)
 * .fp:                                   Font Positions.      (line  13)
-* .g:                                    Built-in Registers.  (line  99)
+* .g:                                    Built-in Registers.  (line 103)
 * .h:                                    Diversions.          (line  74)
 * .H:                                    Built-in Registers.  (line  15)
 * .height:                               Artificial Fonts.    (line  16)
 * .hla:                                  Manipulating Hyphenation.
-                                                              (line 253)
+                                                              (line 255)
 * .hlc:                                  Manipulating Hyphenation.
                                                               (line  47)
 * .hlm:                                  Manipulating Hyphenation.
@@ -4701,9 +5149,9 @@
 * .hy:                                   Manipulating Hyphenation.
                                                               (line  10)
 * .hym:                                  Manipulating Hyphenation.
-                                                              (line 209)
+                                                              (line 211)
 * .hys:                                  Manipulating Hyphenation.
-                                                              (line 224)
+                                                              (line 226)
 * .i:                                    Line Layout.         (line  94)
 * .in:                                   Line Layout.         (line 120)
 * .int:                                  Line Control.        (line  45)
@@ -4727,9 +5175,9 @@
 * .ns:                                   Manipulating Spacing.
                                                               (line 133)
 * .o:                                    Line Layout.         (line  64)
-* .O:                                    Built-in Registers.  (line 108)
+* .O:                                    Built-in Registers.  (line 112)
 * .p:                                    Page Layout.         (line  13)
-* .P:                                    Built-in Registers.  (line 112)
+* .P:                                    Built-in Registers.  (line 116)
 * .pe:                                   Page Location Traps. (line 152)
 * .pn:                                   Page Layout.         (line  80)
 * .ps:                                   Fractional Type Sizes.
@@ -4737,6 +5185,7 @@
 * .psr:                                  Fractional Type Sizes.
                                                               (line  42)
 * .pvs:                                  Changing Type Sizes. (line 136)
+* .R:                                    Built-in Registers.  (line  18)
 * .rj:                                   Manipulating Filling and Adjusting.
                                                               (line 239)
 * .s:                                    Changing Type Sizes. (line  11)
@@ -4749,27 +5198,30 @@
                                                               (line 136)
 * .sty:                                  Changing Fonts.      (line  11)
 * .t:                                    Page Location Traps. (line 110)
-* .T:                                    Built-in Registers.  (line 118)
+* .T:                                    Built-in Registers.  (line 122)
 * .tabs:                                 Tabs and Fields.     (line  15)
 * .trunc:                                Page Location Traps. (line 140)
 * .u:                                    Manipulating Filling and Adjusting.
                                                               (line  31)
+* .U:                                    Built-in Registers.  (line  22)
 * .v:                                    Changing Type Sizes. (line  87)
-* .V:                                    Built-in Registers.  (line  23)
+* .V:                                    Built-in Registers.  (line  27)
 * .vpt:                                  Page Location Traps. (line  18)
 * .w:                                    Environments.        (line  94)
 * .warn:                                 Debugging.           (line 160)
-* .x:                                    Built-in Registers.  (line  85)
-* .Y:                                    Built-in Registers.  (line  93)
-* .y:                                    Built-in Registers.  (line  89)
+* .x:                                    Built-in Registers.  (line  89)
+* .Y:                                    Built-in Registers.  (line  97)
+* .y:                                    Built-in Registers.  (line  93)
 * .z:                                    Diversions.          (line  66)
 * .zoom:                                 Changing Fonts.      (line  74)
-* c.:                                    Built-in Registers.  (line  74)
+* c.:                                    Built-in Registers.  (line  78)
 * ct:                                    Page Motions.        (line 160)
+* DD [ms]:                               ms Document Control Registers.
+                                                              (line 239)
 * dl:                                    Diversions.          (line  92)
 * dn:                                    Diversions.          (line  91)
-* dw:                                    Built-in Registers.  (line  39)
-* dy:                                    Built-in Registers.  (line  42)
+* dw:                                    Built-in Registers.  (line  43)
+* dy:                                    Built-in Registers.  (line  46)
 * FAM [ms]:                              ms Document Control Registers.
                                                               (line 110)
 * FF [ms]:                               ms Document Control Registers.
@@ -4794,7 +5246,7 @@
                                                               (line  40)
 * HORPHANS [ms]:                         ms Document Control Registers.
                                                               (line 154)
-* hours:                                 Built-in Registers.  (line  35)
+* hours:                                 Built-in Registers.  (line  39)
 * hp:                                    Page Motions.        (line 219)
 * HY [ms]:                               ms Document Control Registers.
                                                               (line 101)
@@ -4802,15 +5254,19 @@
                                                               (line  25)
 * llx:                                   Miscellaneous.       (line 142)
 * lly:                                   Miscellaneous.       (line 143)
-* ln:                                    Built-in Registers.  (line  79)
+* ln:                                    Built-in Registers.  (line  83)
+* lsn:                                   Leading Spaces Traps.
+                                                              (line   8)
+* lss:                                   Leading Spaces Traps.
+                                                              (line   9)
 * LT [ms]:                               ms Document Control Registers.
                                                               (line  32)
 * MINGW [ms] <1>:                        Additional ms Macros.
                                                               (line  28)
 * MINGW [ms]:                            ms Document Control Registers.
                                                               (line 231)
-* minutes:                               Built-in Registers.  (line  31)
-* mo:                                    Built-in Registers.  (line  45)
+* minutes:                               Built-in Registers.  (line  35)
+* mo:                                    Built-in Registers.  (line  49)
 * nl:                                    Page Control.        (line  68)
 * opmaxx:                                Suppressing output.  (line  19)
 * opmaxy:                                Suppressing output.  (line  19)
@@ -4835,18 +5291,18 @@
 * rsb:                                   Page Motions.        (line 159)
 * rst:                                   Page Motions.        (line 158)
 * sb:                                    Page Motions.        (line 157)
-* seconds:                               Built-in Registers.  (line  26)
+* seconds:                               Built-in Registers.  (line  30)
 * skw:                                   Page Motions.        (line 162)
 * slimit:                                Debugging.           (line 123)
 * ssc:                                   Page Motions.        (line 161)
 * st:                                    Page Motions.        (line 156)
-* systat:                                I/O.                 (line 170)
+* systat:                                I/O.                 (line 172)
 * urx:                                   Miscellaneous.       (line 144)
 * ury:                                   Miscellaneous.       (line 145)
 * VS [ms]:                               ms Document Control Registers.
                                                               (line  67)
-* year:                                  Built-in Registers.  (line  48)
-* yr:                                    Built-in Registers.  (line  51)
+* year:                                  Built-in Registers.  (line  52)
+* yr:                                    Built-in Registers.  (line  55)
 
 
 File: groff.info,  Node: Macro Index,  Next: String Index,  Prev: Register Index,  Up: Top
@@ -5070,7 +5526,7 @@
                                                               (line  41)
 * . [ms]:                                ms Strings and Special Characters.
                                                               (line  89)
-* .T:                                    Built-in Registers.  (line 123)
+* .T:                                    Built-in Registers.  (line 127)
 * 3 [ms]:                                ms Strings and Special Characters.
                                                               (line 107)
 * 8 [ms]:                                ms Strings and Special Characters.
@@ -5280,9 +5736,9 @@
                                                               (line  12)
 * gtroff:                                Groff Options.       (line   6)
 * hyphen.us:                             Manipulating Hyphenation.
-                                                              (line 161)
+                                                              (line 163)
 * hyphenex.us:                           Manipulating Hyphenation.
-                                                              (line 161)
+                                                              (line 163)
 * latin1.tmac:                           Input Encodings.     (line  14)
 * latin2.tmac:                           Input Encodings.     (line  18)
 * latin9.tmac:                           Input Encodings.     (line  28)
@@ -5298,10 +5754,11 @@
                                                               (line  30)
 * nrchbar:                               Miscellaneous.       (line 111)
 * papersize.tmac:                        Paper Size.          (line  16)
-* perl:                                  I/O.                 (line 180)
+* perl:                                  I/O.                 (line 182)
 * pic:                                   ms Insertions.       (line   7)
-* post-grohtml:                          Groff Options.       (line 165)
-* pre-grohtml:                           Groff Options.       (line 165)
+* post-grohtml:                          Groff Options.       (line 269)
+* pre-grohtml:                           Groff Options.       (line 269)
+* preconv:                               Groff Options.       (line   6)
 * refer:                                 ms Insertions.       (line   7)
 * soelim:                                Debugging.           (line  10)
 * tbl:                                   ms Insertions.       (line   7)
@@ -5310,14 +5767,14 @@
 * troffrc <2>:                           Troff and Nroff Mode.
                                                               (line  24)
 * troffrc <3>:                           Manipulating Hyphenation.
-                                                              (line 161)
+                                                              (line 163)
 * troffrc <4>:                           Paper Size.          (line  16)
-* troffrc:                               Groff Options.       (line  80)
+* troffrc:                               Groff Options.       (line 205)
 * troffrc-end <1>:                       Troff and Nroff Mode.
                                                               (line  24)
 * troffrc-end <2>:                       Manipulating Hyphenation.
-                                                              (line 161)
-* troffrc-end:                           Groff Options.       (line  80)
+                                                              (line 163)
+* troffrc-end:                           Groff Options.       (line 205)
 * tty.tmac:                              Troff and Nroff Mode.
                                                               (line  32)
 
Binärdateien groff-1.20.1/doc/groff.info-3 and groff-1.21/doc/groff.info-3 sind verschieden.
diff -ruN groff-1.20.1/doc/groff.texinfo groff-1.21/doc/groff.texinfo
--- groff-1.20.1/doc/groff.texinfo	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/doc/groff.texinfo	2010-12-31 08:33:09.000000000 +0100
@@ -24,10 +24,10 @@
 
 
 @copying
-This manual documents GNU @code{troff} version 1.20.1.
+This manual documents GNU @code{troff} version 1.21.
 
 Copyright @copyright{} 1994-2000, 2001, 2002, 2003, 2004, 2005, 2006,
-2007, 2008, 2009
+2007, 2008, 2009, 2010
 Free Software Foundation, Inc.
 
 @quotation
@@ -473,8 +473,8 @@
 @titlepage
 @title groff
 @subtitle The GNU implementation of @code{troff}
-@subtitle Edition 1.20.1
-@subtitle Spring 2009
+@subtitle Edition 1.21
+@subtitle Winter 2010
 @author by Trent A.@tie{}Fisher
 @author and Werner Lemberg (@email{bug-groff@@gnu.org})
 
@@ -842,6 +842,9 @@
 can be obtained as an extra package; @code{groff} can use @code{grap}
 also.
 
+Unique to @code{groff} is the @code{preconv} preprocessor which enables
+@code{groff} to handle documents in various input encodings.
+
 There are other preprocessors in existence, but, unfortunately, no free
 implementations are available.  Among them are preprocessors for drawing
 mathematical pictures (@code{ideal}) and chemical structures
@@ -935,38 +938,40 @@
 @pindex gtbl
 @pindex grefer
 @pindex gsoelim
+@pindex preconv
 @code{groff} normally runs the @code{gtroff} program and a postprocessor
 appropriate for the selected device.  The default device is @samp{ps}
 (but it can be changed when @code{groff} is configured and built).  It
 can optionally preprocess with any of @code{gpic}, @code{geqn},
-@code{gtbl}, @code{ggrn}, @code{grap}, @code{grefer}, or @code{gsoelim}.
+@code{gtbl}, @code{ggrn}, @code{grap}, @code{grefer}, @code{gsoelim}, or
+@code{preconv}.
 
 This section only documents options to the @code{groff} front end.  Many
 of the arguments to @code{groff} are passed on to @code{gtroff},
 therefore those are also included.  Arguments to pre- or postprocessors
 can be found in @ref{Invoking gpic}, @ref{Invoking geqn}, @ref{Invoking
 gtbl}, @ref{Invoking ggrn}, @ref{Invoking grefer}, @ref{Invoking
-gsoelim}, @ref{Invoking grotty}, @ref{Invoking grops}, @ref{Invoking
-grohtml}, @ref{Invoking grodvi}, @ref{Invoking grolj4}, @ref{Invoking
-grolbp}, and @ref{Invoking gxditview}.
+gsoelim}, @ref{Invoking preconv}, @ref{Invoking grotty}, @ref{Invoking
+grops}, @ref{Invoking grohtml}, @ref{Invoking grodvi}, @ref{Invoking
+grolj4}, @ref{Invoking grolbp}, and @ref{Invoking gxditview}.
 
 The command line format for @code{groff} is:
 
 @Example
-groff [ -abceghilpstvzCEGNRSUVXZ ] [ -F@var{dir} ] [ -m@var{name} ]
-      [ -T@var{def} ] [ -f@var{fam} ] [ -w@var{name} ] [ -W@var{name} ]
-      [ -M@var{dir} ] [ -d@var{cs} ] [ -r@var{cn} ] [ -n@var{num} ]
-      [ -o@var{list} ] [ -P@var{arg} ] [ -L@var{arg} ] [ -I@var{dir} ]
-      [ @var{files}@dots{} ]
+groff [ -abceghiklpstvzCEGNRSUVXZ ] [ -d@var{cs} ] [ -D@var{arg} ]
+      [ -f@var{fam} ] [ -F@var{dir} ] [ -I@var{dir} ] [ -K@var{arg} ]
+      [ -L@var{arg} ] [ -m@var{name} ] [ -M@var{dir} ] [ -n@var{num} ]
+      [ -o@var{list} ] [ -P@var{arg} ] [ -r@var{cn} ] [ -T@var{def} ]
+      [ -w@var{name} ] [ -W@var{name} ] [ @var{files}@dots{} ]
 @endExample
 
 The command line format for @code{gtroff} is as follows.
 
 @Example
-gtroff [ -abcivzCERU ] [ -w@var{name} ] [ -W@var{name} ] [ -d@var{cs} ]
-       [ -f@var{fam} ] [ -m@var{name} ] [ -n@var{num} ]
-       [ -o@var{list} ] [ -r@var{cn} ] [ -T@var{name} ]
-       [ -F@var{dir} ] [ -M@var{dir} ] [ @var{files}@dots{} ]
+gtroff [ -abcivzCERU ] [ -d@var{cs} ] [ -f@var{fam} ] [ -F@var{dir} ]
+       [ -m@var{name} ] [ -M@var{dir} ] [ -n@var{num} ] [ -o@var{list} ]
+       [ -r@var{cn} ] [ -T@var{name} ] [ -w@var{name} ] [ -W@var{name} ]
+       [ @var{files}@dots{} ]
 @endExample
 
 @noindent
@@ -985,14 +990,61 @@
 
 @cindex command-line options
 @table @samp
-@item -h
-Print a help message.
+@item -a
+@cindex @acronym{ASCII} approximation output register (@code{.A})
+Generate an @acronym{ASCII} approximation of the typeset output.  The
+read-only register @code{.A} is then set to@tie{}1.  @xref{Built-in
+Registers}.  A typical example is
+
+@Example
+groff -a -man -Tdvi troff.man | less
+@endExample
+
+@noindent
+which shows how lines are broken for the DVI device.  Note that this
+option is rather useless today since graphic output devices are
+available virtually everywhere.
+
+@item -b
+Print a backtrace with each warning or error message.  This backtrace
+should help track down the cause of the error.  The line numbers given
+in the backtrace may not always be correct: @code{gtroff} can get
+confused by @code{as} or @code{am} requests while counting line numbers.
+
+@item -c
+Suppress color output.
+
+@item -C
+Enable compatibility mode.  @xref{Implementation Differences}, for the
+list of incompatibilities between @code{groff} and @acronym{AT&T}
+@code{troff}.
+
+@item -d@var{c}@var{s}
+@itemx -d@var{name}=@var{s}
+Define @var{c} or @var{name} to be a string@tie{}@var{s}.
+@var{c}@tie{}must be a one-letter name; @var{name} can be of arbitrary
+length.  All string assignments happen before loading any macro file
+(including the start-up file).
+
+@item -D@var{arg}
+Set default input encoding used by @code{preconv} to @var{arg}.  Implies
+@option{-k}.
 
 @item -e
 Preprocess with @code{geqn}.
 
-@item -t
-Preprocess with @code{gtbl}.
+@item -E
+Inhibit all error messages.
+
+@item -f@var{fam}
+Use @var{fam} as the default font family.  @xref{Font Families}.
+
+@item -F@var{dir}
+Search @file{@var{dir}} for subdirectories @file{dev@var{name}}
+(@var{name} is the name of the device), for the @file{DESC} file, and
+for font files before looking in the standard directories (@pxref{Font
+Directories}).  This option is passed to all pre- and postprocessors
+using the @env{GROFF_FONT_PATH} environment variable.
 
 @item -g
 Preprocess with @code{ggrn}.
@@ -1000,46 +1052,43 @@
 @item -G
 Preprocess with @code{grap}.
 
-@item -p
-Preprocess with @code{gpic}.
-
-@item -s
-Preprocess with @code{gsoelim}.
+@item -h
+Print a help message.
 
-@item -c
-Suppress color output.
+@item -i
+Read the standard input after all the named input files have been
+processed.
 
-@item -R
-Preprocess with @code{grefer}.  No mechanism is provided for passing
-arguments to @code{grefer} because most @code{grefer} options have
-equivalent commands which can be included in the file.  @xref{grefer},
-for more details.
+@item -I@var{dir}
+This option may be used to specify a directory to search for files.
+It is passed to the following programs:
 
-@pindex troffrc
-@pindex troffrc-end
-Note that @code{gtroff} also accepts a @option{-R} option, which is not
-accessible via @code{groff}.  This option prevents the loading of the
-@file{troffrc} and @file{troffrc-end} files.
+@itemize
+@item
+@code{gsoelim} (see @ref{gsoelim} for more details);
+it also implies @code{groff}'s @option{-s} option.
 
-@item -v
-Make programs run by @code{groff} print out their version number.
+@item
+@code{gtroff}; it is used to search files named in the @code{psbb} and
+@code{so} requests.
 
-@item -V
-Print the pipeline on @code{stdout} instead of executing it.  If
-specified more than once, print the pipeline on @code{stderr} and
-execute it.
+@item
+@code{grops}; it is used to search files named in the
+@w{@code{\X'ps: import}} and @w{@code{\X'ps: file}} escapes.
+@end itemize
 
-@item -z
-Suppress output from @code{gtroff}.  Only error messages are printed.
+The current directory is always searched first.  This option may be
+specified more than once; the directories are searched in the order
+specified.  No directory search is performed for files specified using
+an absolute path.
 
-@item -Z
-Do not postprocess the output of @code{gtroff}.  Normally @code{groff}
-automatically runs the appropriate postprocessor.
+@item -k
+Preprocess with @code{preconv}.  This is run before any other
+preprocessor.  Please refer to @code{preconv}'s manual page for its
+behaviour if no @option{-K} (or @option{-D}) option is specified.
 
-@item -P@var{arg}
-Pass @var{arg} to the postprocessor.  Each argument should be passed
-with a separate @option{-P} option.  Note that @code{groff} does not
-prepend @samp{-} to @var{arg} before passing it to the postprocessor.
+@item -K@var{arg}
+Set input encoding used by preconv to @var{arg}.  Implies @option{-k}.
 
 @item -l
 Send the output to a spooler for printing.  The command used for this is
@@ -1054,6 +1103,85 @@
 @code{print} keyword in the device description file is missing,
 @option{-L} is ignored.
 
+@item -m@var{name}
+Read in the file @file{@var{name}.tmac}.  Normally @code{groff} searches
+for this in its macro directories.  If it isn't found, it tries
+@file{tmac.@var{name}} (searching in the same directories).
+
+@item -M@var{dir}
+Search directory @file{@var{dir}} for macro files before the standard
+directories (@pxref{Macro Directories}).
+
+@item -n@var{num}
+Number the first page @var{num}.
+
+@item -N
+Don't allow newlines with @code{eqn} delimiters.  This is the same as
+the @option{-N} option in @code{geqn}.
+
+@item -o@var{list}
+@cindex print current page register (@code{.P})
+Output only pages in @var{list}, which is a comma-separated list of page
+ranges; @samp{@var{n}} means print page@tie{}@var{n},
+@samp{@var{m}-@var{n}} means print every page between @var{m}
+and@tie{}@var{n}, @samp{-@var{n}} means print every page up
+to@tie{}@var{n}, @samp{@var{n}-} means print every page beginning
+with@tie{}@var{n}.  @code{gtroff} exits after printing the last page in
+the list.  All the ranges are inclusive on both ends.
+
+Within @code{gtroff}, this information can be extracted with the
+@samp{.P} register.  @xref{Built-in Registers}.
+
+If your document restarts page numbering at the beginning of each
+chapter, then @code{gtroff} prints the specified page range for each
+chapter.
+
+@item -p
+Preprocess with @code{gpic}.
+
+@item -P@var{arg}
+Pass @var{arg} to the postprocessor.  Each argument should be passed
+with a separate @option{-P} option.  Note that @code{groff} does not
+prepend @samp{-} to @var{arg} before passing it to the postprocessor.
+
+@item -r@var{c}@var{n}
+@itemx -r@var{name}=@var{n}
+Set number register@tie{}@var{c} or @var{name} to the
+value@tie{}@var{n}.  @var{c}@tie{}must be a one-letter name; @var{name}
+can be of arbitrary length.  @var{n}@tie{}can be any @code{gtroff}
+numeric expression.  All register assignments happen before loading any
+macro file (including the start-up file).
+
+@item -R
+Preprocess with @code{grefer}.  No mechanism is provided for passing
+arguments to @code{grefer} because most @code{grefer} options have
+equivalent commands which can be included in the file.  @xref{grefer},
+for more details.
+
+@pindex troffrc
+@pindex troffrc-end
+Note that @code{gtroff} also accepts a @option{-R} option, which is not
+accessible via @code{groff}.  This option prevents the loading of the
+@file{troffrc} and @file{troffrc-end} files.
+
+@item -s
+Preprocess with @code{gsoelim}.
+
+@item -S
+@cindex @code{open} request, and safer mode
+@cindex @code{opena} request, and safer mode
+@cindex @code{pso} request, and safer mode
+@cindex @code{sy} request, and safer mode
+@cindex @code{pi} request, and safer mode
+@cindex safer mode
+@cindex mode, safer
+Safer mode.  Pass the @option{-S} option to @code{gpic} and disable the
+@code{open}, @code{opena}, @code{pso}, @code{sy}, and @code{pi}
+requests.  For security reasons, this is enabled by default.
+
+@item -t
+Preprocess with @code{gtbl}.
+
 @item -T@var{dev}
 Prepare output for device @var{dev}.  The default device is @samp{ps},
 unless changed when @code{groff} was configured and built.  The
@@ -1142,62 +1270,12 @@
 Files}, for more info.)  This can be overridden with the @option{-X}
 option.
 
-@item -X
-Preview with @code{gxditview} instead of using the usual postprocessor.
-This is unlikely to produce good results except with @option{-Tps}.
-
-Note that this is not the same as using @option{-TX75} or
-@option{-TX100} to view a document with @code{gxditview}: The former
-uses the metrics of the specified device, whereas the latter uses
-X-specific fonts and metrics.
-
-@item -N
-Don't allow newlines with @code{eqn} delimiters.  This is the same as
-the @option{-N} option in @code{geqn}.
-
-@item -S
-@cindex @code{open} request, and safer mode
-@cindex @code{opena} request, and safer mode
-@cindex @code{pso} request, and safer mode
-@cindex @code{sy} request, and safer mode
-@cindex @code{pi} request, and safer mode
-@cindex safer mode
-@cindex mode, safer
-Safer mode.  Pass the @option{-S} option to @code{gpic} and disable the
-@code{open}, @code{opena}, @code{pso}, @code{sy}, and @code{pi}
-requests.  For security reasons, this is enabled by default.
-
 @item -U
 @cindex mode, unsafe
 @cindex unsafe mode
 Unsafe mode.  This enables the @code{open}, @code{opena}, @code{pso},
 @code{sy}, and @code{pi} requests.
 
-@item -a
-@cindex @acronym{ASCII} approximation output register (@code{.A})
-Generate an @acronym{ASCII} approximation of the typeset output.  The
-read-only register @code{.A} is then set to@tie{}1.  @xref{Built-in
-Registers}.  A typical example is
-
-@Example
-groff -a -man -Tdvi troff.man | less
-@endExample
-
-@noindent
-which shows how lines are broken for the DVI device.  Note that this
-option is rather useless today since graphic output devices are
-available virtually everywhere.
-
-@item -b
-Print a backtrace with each warning or error message.  This backtrace
-should help track down the cause of the error.  The line numbers given
-in the backtrace may not always be correct: @code{gtroff} can get
-confused by @code{as} or @code{am} requests while counting line numbers.
-
-@item -i
-Read the standard input after all the named input files have been
-processed.
-
 @item -w@var{name}
 Enable warning @var{name}.  Available warnings are described in
 @ref{Debugging}.  Multiple @option{-w} options are allowed.
@@ -1205,90 +1283,29 @@
 @item -W@var{name}
 Inhibit warning @var{name}.  Multiple @option{-W} options are allowed.
 
-@item -E
-Inhibit all error messages.
-
-@item -C
-Enable compatibility mode.  @xref{Implementation Differences}, for the
-list of incompatibilities between @code{groff} and @acronym{AT&T}
-@code{troff}.
-
-@item -d@var{c}@var{s}
-@itemx -d@var{name}=@var{s}
-Define @var{c} or @var{name} to be a string@tie{}@var{s}.
-@var{c}@tie{}must be a one-letter name; @var{name} can be of arbitrary
-length.  All string assignments happen before loading any macro file
-(including the start-up file).
-
-@item -f@var{fam}
-Use @var{fam} as the default font family.  @xref{Font Families}.
-
-@item -m@var{name}
-Read in the file @file{@var{name}.tmac}.  Normally @code{groff} searches
-for this in its macro directories.  If it isn't found, it tries
-@file{tmac.@var{name}} (searching in the same directories).
-
-@item -n@var{num}
-Number the first page @var{num}.
-
-@item -o@var{list}
-@cindex print current page register (@code{.P})
-Output only pages in @var{list}, which is a comma-separated list of page
-ranges; @samp{@var{n}} means print page@tie{}@var{n},
-@samp{@var{m}-@var{n}} means print every page between @var{m}
-and@tie{}@var{n}, @samp{-@var{n}} means print every page up
-to@tie{}@var{n}, @samp{@var{n}-} means print every page beginning
-with@tie{}@var{n}.  @code{gtroff} exits after printing the last page in
-the list.  All the ranges are inclusive on both ends.
-
-Within @code{gtroff}, this information can be extracted with the
-@samp{.P} register.  @xref{Built-in Registers}.
-
-If your document restarts page numbering at the beginning of each
-chapter, then @code{gtroff} prints the specified page range for each
-chapter.
-
-@item -r@var{c}@var{n}
-@itemx -r@var{name}=@var{n}
-Set number register@tie{}@var{c} or @var{name} to the
-value@tie{}@var{n}.  @var{c}@tie{}must be a one-letter name; @var{name}
-can be of arbitrary length.  @var{n}@tie{}can be any @code{gtroff}
-numeric expression.  All register assignments happen before loading any
-macro file (including the start-up file).
-
-@item -F@var{dir}
-Search @file{@var{dir}} for subdirectories @file{dev@var{name}}
-(@var{name} is the name of the device), for the @file{DESC} file, and
-for font files before looking in the standard directories (@pxref{Font
-Directories}).  This option is passed to all pre- and postprocessors
-using the @env{GROFF_FONT_PATH} environment variable.
-
-@item -M@var{dir}
-Search directory @file{@var{dir}} for macro files before the standard
-directories (@pxref{Macro Directories}).
+@item -v
+Make programs run by @code{groff} print out their version number.
 
-@item -I@var{dir}
-This option may be used to specify a directory to search for files.
-It is passed to the following programs:
+@item -V
+Print the pipeline on @code{stdout} instead of executing it.  If
+specified more than once, print the pipeline on @code{stderr} and
+execute it.
 
-@itemize
-@item
-@code{gsoelim} (see @ref{gsoelim} for more details);
-it also implies @code{groff}'s @option{-s} option.
+@item -X
+Preview with @code{gxditview} instead of using the usual postprocessor.
+This is unlikely to produce good results except with @option{-Tps}.
 
-@item
-@code{gtroff}; it is used to search files named in the @code{psbb} and
-@code{so} requests.
+Note that this is not the same as using @option{-TX75} or
+@option{-TX100} to view a document with @code{gxditview}: The former
+uses the metrics of the specified device, whereas the latter uses
+X-specific fonts and metrics.
 
-@item
-@code{grops}; it is used to search files named in the
-@w{@code{\X'ps: import}} and @w{@code{\X'ps: file}} escapes.
-@end itemize
+@item -z
+Suppress output from @code{gtroff}.  Only error messages are printed.
 
-The current directory is always searched first.  This option may be
-specified more than once; the directories are searched in the order
-specified.  No directory search is performed for files specified using
-an absolute path.
+@item -Z
+Do not postprocess the output of @code{gtroff}.  Normally @code{groff}
+automatically runs the appropriate postprocessor.
 @end table
 
 
@@ -1303,6 +1320,11 @@
 not within @code{gtroff}) which can modify the behavior of @code{groff}.
 
 @table @code
+@item GROFF_BIN_PATH
+@tindex GROFF_BIN_PATH@r{, environment variable}
+This search path, followed by @code{PATH}, is used for commands executed
+by @code{groff}.
+
 @item GROFF_COMMAND_PREFIX
 @tindex GROFF_COMMAND_PREFIX@r{, environment variable}
 @cindex command prefix
@@ -1311,21 +1333,22 @@
 @code{@var{X}troff} instead of @code{gtroff}.  This also applies to
 @code{tbl}, @code{pic}, @code{eqn}, @code{grn}, @code{refer}, and
 @code{soelim}.  It does not apply to @code{grops}, @code{grodvi},
-@code{grotty}, @code{pre-grohtml}, @code{post-grohtml}, @code{grolj4},
-and @code{gxditview}.
+@code{grotty}, @code{pre-grohtml}, @code{post-grohtml}, @code{preconv},
+@code{grolj4}, and @code{gxditview}.
 
 The default command prefix is determined during the installation
 process.  If a non-GNU troff system is found, prefix @samp{g} is used,
 none otherwise.
 
-@item GROFF_TMAC_PATH
-@tindex GROFF_TMAC_PATH@r{, environment variable}
-A colon-separated list of directories in which to search for macro files
-(before the default directories are tried).  @xref{Macro Directories}.
-
-@item GROFF_TYPESETTER
-@tindex GROFF_TYPESETTER@r{, environment variable}
-The default output device.
+@item GROFF_ENCODING
+@tindex GROFF_ENCODING@r{, environment variable}
+The value of this environment value is passed to the @code{preconv}
+preprocessor to select the encoding of input files.  Setting this option
+implies @code{groff}'s command line option @option{-k} (this is,
+@code{groff} actually always calls @code{preconv}).  If set without a
+value, @code{groff} calls @code{preconv} without arguments.  An explicit
+@option{-K} command line option overrides the value of
+@env{GROFF_ENCODING}.  See the manual page of @code{preconv} for details.
 
 @item GROFF_FONT_PATH
 @tindex GROFF_FONT_PATH@r{, environment variable}
@@ -1333,10 +1356,10 @@
 @code{dev}@var{name} directory (before the default directories are
 tried).  @xref{Font Directories}.
 
-@item GROFF_BIN_PATH
-@tindex GROFF_BIN_PATH@r{, environment variable}
-This search path, followed by @code{PATH}, is used for commands executed
-by @code{groff}.
+@item GROFF_TMAC_PATH
+@tindex GROFF_TMAC_PATH@r{, environment variable}
+A colon-separated list of directories in which to search for macro files
+(before the default directories are tried).  @xref{Macro Directories}.
 
 @item GROFF_TMPDIR
 @tindex GROFF_TMPDIR@r{, environment variable}
@@ -1347,6 +1370,10 @@
 default directory (on Unix and GNU/Linux systems, this is usually
 @file{/tmp}).  @code{grops}, @code{grefer}, @code{pre-grohtml}, and
 @code{post-grohtml} can create temporary files in this directory.
+
+@item GROFF_TYPESETTER
+@tindex GROFF_TYPESETTER@r{, environment variable}
+The default output device.
 @end table
 
 Note that MS-DOS and MS-Windows ports of @code{groff} use semi-colons,
@@ -1415,11 +1442,11 @@
 @Example
 /usr/local/lib/groff/site-tmac
 /usr/local/share/groff/site-tmac
-/usr/local/share/groff/1.20.1/tmac
+/usr/local/share/groff/1.21/tmac
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.20.1, and the
+assuming that the version of @code{groff} is 1.21, and the
 installation prefix was @file{/usr/local}.  It is possible to fine-tune
 those directories during the installation process.
 @end itemize
@@ -1472,11 +1499,11 @@
 
 @Example
 /usr/local/share/groff/site-font
-/usr/local/share/groff/1.20.1/font
+/usr/local/share/groff/1.21/font
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.20.1, and the
+assuming that the version of @code{groff} is 1.21, and the
 installation prefix was @file{/usr/local}.  It is possible to fine-tune
 those directories during the installation process.
 @end itemize
@@ -3093,6 +3120,15 @@
 Default: 2@dmn{n}.
 @endDefmpreg
 
+@Defmpreg {DD, ms}
+Sets the vertical spacing before and after a display, a @code{tbl} table, an
+@code{eqn} equation, or a @code{pic} image.
+
+Effective: next paragraph.
+
+Default: 0.5@dmn{v}.
+@endDefmpreg
+
 @c ---------------------------------------------------------------------
 
 @node ms Cover Page Macros, ms Body Text, ms Document Control Registers, ms
@@ -4751,9 +4787,11 @@
 
 @cindex fill mode
 @cindex mode, fill
+@cindex leading spaces macro (@code{lsm})
 A line that begins with a space causes a break and the space is output
 at the beginning of the next line.  Note that this space isn't adjusted,
-even in fill mode.
+even in fill mode; however, the behaviour can be modified with the
+leading spaces macro request @code{lsm}.  @xref{Leading Spaces Traps}.
 
 The end of file also causes a break -- otherwise the last line of the
 document may vanish!
@@ -5090,6 +5128,32 @@
 `true' because @code{gtroff} treats both negative numbers and zero as
 `false'.}  See below for the use of unary operators in motion requests.
 
+@cindex logical not, limitation in expression
+@cindex expression, limitation of logical not in
+The logical not operator,
+as described above,
+works only within @code{if} and @code{while} requests.
+Furthermore, it may appear
+only at the beginning of an expression,
+and negates the entire expression.
+Attempting to insert the @samp{!} operator
+within the expression results in a
+@samp{numeric expression expected} warning.  This
+maintains bug-compatibility
+with old versions of @code{troff}.
+
+Example:
+
+@Example
+.nr X 1
+.nr Y 0
+.\" This does not work as expected
+.if (\n[X])&(!\n[Y]) .nop X only
+.
+.\" Use this construct instead
+.if (\n[X]=1)&(\n[Y]=0) .nop X only
+@endExample
+
 @item
 @cindex extremum operators (@code{>?}, @code{<?})
 @cindex operators, extremum (@code{>?}, @code{<?})
@@ -5960,7 +6024,6 @@
 The @code{\R} escape doesn't produce an input token in @code{gtroff};
 in other words, it vanishes completely after @code{gtroff} has
 processed it.
-@endDefreq
 
 For example, the following two lines are equivalent:
 
@@ -5970,6 +6033,43 @@
     @result{} 1
 @endExample
 
+Note that the complete transparency of @code{\R} can cause surprising
+effects if you use number registers like @code{.k} which get evaluated
+at the time they are accessed.
+
+@Example
+.ll 1.6i
+.
+aaa bbb ccc ddd eee fff ggg hhh\R':k \n[.k]'
+.tm :k == \n[:k]
+    @result{} :k == 126950
+.
+.br
+.
+aaa bbb ccc ddd eee fff ggg hhh\h'0'\R':k \n[.k]'
+.tm :k == \n[:k]
+    @result{} :k == 15000
+@endExample
+
+If you process this with the PostScript device (@code{-Tps}), there
+will be a line break eventually after @code{ggg} in both input lines.
+However, after processing the space after @code{ggg}, the partially
+collected line is not overfull yet, so @code{troff} continues to
+collect input until it sees the space (or in this case, the newline)
+after @code{hhh}.  At this point, the line is longer than the line
+length, and the line gets broken.
+
+In the first input line, since the @code{\R} escape leaves no traces,
+the check for the overfull line hasn't been done yet at the point where
+@code{\R} gets handled, and you get a value for the @code{.k} number
+register which is even greater than the current line length.
+
+In the second input line, the insertion of @code{\h'0'} to emit an
+invisible zero-width space forces @code{troff} to check the line length
+which in turn causes the start of a new output line.  Now @code{.k}
+returns the expected value.
+@endDefreq
+
 Both @code{nr} and @code{\R} have two additional special forms to
 increment or decrement a register.
 
@@ -6276,11 +6376,19 @@
 @vindex .H
 Horizontal resolution in basic units.
 
+@item \n[.R]
+@cindex number of registers register (@code{.R})
+@cindex registers, number of, register (@code{.R})
+@vindex .R
+The number of number registers available.  This is always 10000 in
+GNU@tie{}@code{troff}; it exists for backward compatibility.
+
 @item \n[.U]
 @cindex safer mode
 @cindex mode, safer
 @cindex unsafe mode
 @cindex mode, unsafe
+@vindex .U
 If @code{gtroff} is called with the @option{-U} command line option to
 activate unsafe mode, the number register @code{.U} is set to@tie{}1,
 and to zero otherwise.  @xref{Groff Options}.
@@ -6966,7 +7074,9 @@
 integers from 0 to@tie{}255.  The request maps character
 code@tie{}@var{a} to code@tie{}@var{b}, code@tie{}@var{c} to
 code@tie{}@var{d}, and so on.  You can use character codes which would
-be invalid otherwise.
+be invalid otherwise.  By default, everything maps to itself except
+letters `A' to `Z' which map to `a' to `z'.
+
 
 @pindex troffrc
 @pindex troffrc-end
@@ -7791,7 +7901,7 @@
 
 @noindent
 The first backslash is consumed while the macro is read, and the second
-is swallowed while exexuting macro @code{foo}.
+is swallowed while executing macro @code{foo}.
 @endDefesc
 
 A @dfn{translation} is a mapping of an input character to an output
@@ -8616,6 +8726,7 @@
 * Font Families::
 * Font Positions::
 * Using Symbols::
+* Character Classes::
 * Special Fonts::
 * Artificial Fonts::
 * Ligatures and Kerning::
@@ -9012,7 +9123,7 @@
 
 @c ---------------------------------------------------------------------
 
-@node Using Symbols, Special Fonts, Font Positions, Fonts and Symbols
+@node Using Symbols, Character Classes, Font Positions, Fonts and Symbols
 @subsection Using Symbols
 @cindex using symbols
 @cindex symbols, using
@@ -9348,7 +9459,9 @@
 modified with the @code{cflags} request.  The first argument is the sum
 of the desired flags and the remaining arguments are the characters or
 symbols to have those properties.  It is possible to omit the spaces
-between the characters or symbols.
+between the characters or symbols.  Instead of single characters or
+symbols you can also use character classes (see @ref{Character Classes}
+for more details).
 
 @table @code
 @item 1
@@ -9424,6 +9537,27 @@
 done without thinking; in most situations, a better solution instead of
 changing the @code{cflags} value is to insert @code{\:} right after the
 hyphen at the places which really need a break point.
+
+@item 128
+Prohibit a line break before the character, but allow a line break after
+the character.  This works only in combination with flags 256 and 512
+(see below) and has no effect otherwise.
+
+@item 256
+Prohibit a line break after the character, but allow a line break before
+the character.  This works only in combination with flags 128 and 512
+(see below) and has no effect otherwise.
+
+@item 512
+Allow line break before or after the character.  This works only in
+combination with flags 128 and 256 and has no effect otherwise.
+
+Contrary to flag values 2 and@tie{}4, the flags 128, 256, and 512 work
+pairwise.  If, for example, the left character has value 512, and the
+right character 128, no line break gets inserted.  If we use
+value@tie{}6 instead for the left character, a line break after the
+character can't be suppressed since the right neighbour character
+doesn't get examined.
 @end table
 @endDefreq
 
@@ -9529,7 +9663,83 @@
 
 @c ---------------------------------------------------------------------
 
-@node Special Fonts, Artificial Fonts, Using Symbols, Fonts and Symbols
+@node Character Classes, Special Fonts, Using Symbols, Fonts and Symbols
+@subsection Character Classes
+@cindex character classes
+@cindex classes, character
+
+Classes are particularly useful for East Asian languages such as
+Chinese, Japanese, and Korean, where the number of needed characters is
+much larger than in European languages, and where large sets of
+characters share the same properties.
+
+@Defreq {class, n c1 c2 @dots{}}
+@cindex character class (@code{class})
+@cindex defining character class (@code{class})
+@cindex class of characters (@code{class})
+In @code{groff}, a @dfn{character class} (or simply ``class'') is a set
+of characters, grouped by some user aspect.  The @code{class} request
+defines such classes so that other requests can refer to all characters
+belonging to this set with a single class name.  Currently, only the
+@code{cflags} request can handle character classes.
+
+A @code{class} request takes a class name followed by a list of
+entities.  In its simplest form, the entities are characters or symbols:
+
+@Example
+.class [prepunct] , : ; > @}
+@endExample
+
+Since class and glyph names share the same namespace, it is recommended
+to start and end the class name with @code{[} and @code{]},
+respectively, to avoid collisions with normal @code{groff} symbols (and
+symbols defined by the user).  In particular, the presence of @code{]}
+in the symbol name intentionally prevents the usage of @code{\[...]},
+thus you must use the @code{\C} escape to access a class with such a
+name.
+
+@cindex GGL (groff glyph list)
+@cindex groff glyph list (GGL)
+You can also use a special character range notation, consisting of a
+start character or symbol, followed by @samp{-}, and an end character or
+symbol.  Internally, @code{gtroff} converts these two symbol names to
+Unicode values (according to the groff glyph gist) which then give the
+start and end value of the range.  If that fails, the class definition
+is skipped.
+
+Finally, classes can be nested, too.  
+
+Here is a more complex example:
+
+@Example
+.class [prepunctx] \C'[prepunct]' \[u2013]-\[u2016]
+@endExample
+
+The class @samp{prepunctx} now contains the contents of the class
+@code{prepunct} as defined above (the set @samp{, : ; > @}}), and
+characters in the range between @code{U+2013} and @code{U+2016}.
+
+If you want to add @samp{-} to a class, it must be the first character
+value in the argument list, otherwise it gets misinterpreted as a range.
+
+Note that it is not possible to use class names within range
+definitions.
+
+Typical use of the @code{class} request is to control line-breaking and
+hyphenation rules as defined by the @code{cflags} request.  For example,
+to inhibit line breaks before the characters belonging to the
+@code{prepunctx} class, you can write:
+
+@Example
+.cflags 2 \C'[prepunctx]'
+@endExample
+
+See the @code{cflags} request in @ref{Using Symbols}, for more details.
+@endDefreq
+
+@c ---------------------------------------------------------------------
+
+@node Special Fonts, Artificial Fonts, Character Classes, Fonts and Symbols
 @subsection Special Fonts
 @cindex special fonts
 @cindex fonts, special
@@ -10697,8 +10907,8 @@
 @cindex @code{if} request, operators to use with
 @cindex @code{ie} request, operators to use with
 @cindex @code{while} request, operators to use with
-In @code{if}, @code{ie}, and @code{while} requests, there are several
-more operators available:
+In @code{if}, @code{ie}, and @code{while} requests, in addition to ordinary
+@ref{Expressions}, there are several more operators available:
 
 @table @code
 @item e
@@ -10852,7 +11062,7 @@
 remainder of the line) if @var{expr} evaluates to a value greater than
 zero (true).  @var{anything} is interpreted as though it was on a line
 by itself (except that leading spaces are swallowed).
-@xref{Expressions}, for more info.
+@xref{Operators in Conditionals}, for more info.
 
 @Example
 .nr xxx 1
@@ -12035,6 +12245,7 @@
 * Diversion Traps::
 * Input Line Traps::
 * Blank Line Traps::
+* Leading Spaces Traps::
 * End-of-input Traps::
 @end menu
 
@@ -12330,7 +12541,7 @@
 
 @c ---------------------------------------------------------------------
 
-@node Blank Line Traps, End-of-input Traps, Input Line Traps, Traps
+@node Blank Line Traps, Leading Spaces Traps, Input Line Traps, Traps
 @subsection Blank Line Traps
 @cindex blank line traps
 @cindex traps, blank line
@@ -12343,7 +12554,42 @@
 
 @c ---------------------------------------------------------------------
 
-@node End-of-input Traps,  , Blank Line Traps, Traps
+@node Leading Spaces Traps, End-of-input Traps, Blank Line Traps, Traps
+@subsection Leading Spaces Traps
+@cindex leading spaces traps
+@cindex traps, leading spaces
+
+@DefreqList {lsm, macro}
+@DefregItem {lsn}
+@DefregListEnd {lss}
+@cindex leading spaces macro (@code{lsm})
+Set a leading spaces trap.  @code{gtroff} executes @var{macro} when it
+encounters leading spaces in an input line; the implicit line break
+which normally happens in this case is suppressed.  A line consisting
+of spaces only, however, is treated as an empty line, possibly subject
+to an empty line macro set with the @code{blm} request.
+
+Leading spaces are removed from the input line before calling the
+leading spaces macro.  The number of removed spaces is stored in
+register @code{lsn}; the horizontal space which would be emitted if
+there was no leading space macro is stored in register @code{lss}.
+Note that @code{lsn} and @code{lss} are available even if no leading
+space macro has been set.
+
+The first thing a leading space macro sees is a token.  However, some
+escapes like @code{\f} or @code{\m} are handled on the fly (see
+@ref{Gtroff Internals}, for a complete list) without creating a token
+at all.  Consider that a line starts with two spaces followed by
+@code{\fIfoo}.  While skipping the spaces @code{\fI} is handled too so
+that groff's current font is properly set to @samp{I}, but the leading
+space macro only sees @code{foo}, without the preceding @code{\fI}.
+If the macro should see the font escape you have to `protect' it with
+something which creates a token, for example with @code{\&\fIfoo}.
+@endDefreq
+
+@c ---------------------------------------------------------------------
+
+@node End-of-input Traps,  , Leading Spaces Traps, Traps
 @subsection End-of-input Traps
 @cindex end-of-input traps
 @cindex traps, end-of-input
@@ -12363,8 +12609,9 @@
 
 @Example
 .de approval
-.  ne 5v
-.  sp |(\\n[.t] - 6v)
+\c
+.  ne 3v
+.  sp (\\n[.t]u - 3v)
 .  in +4i
 .  lc _
 .  br
@@ -12375,6 +12622,56 @@
 .
 .em approval
 @endExample
+
+The @code{\c} in the above example needs explanation.  For historical
+reasons (and for compatibility with @acronym{AT&T} @code{troff}), the
+end macro exits as soon as it causes a page break and no remaining
+data is in the partially collected line.
+
+Let us assume that there is no @code{\c} in the above @code{approval}
+macro, and that the page is full and has been ended with, say, a
+@code{br} request.  The @code{ne} request now causes the start of a new
+page, which in turn makes @code{troff} exit immediately for the reasons
+just described.  In most situations this is not intended.
+
+To always force processing the whole end macro independently of this
+behaviour it is thus advisable to insert something which starts an
+empty partially filled line (@code{\c}) whenever there is a chance that
+a page break can happen.  In the above example, the call of the
+@code{ne} request assures that the remaining code stays on the same
+page, so we have to insert @code{\c} only once.
+
+The next example shows how to append three lines, then starting a new
+page unconditionally.  Since @w{@samp{.ne 1}} doesn't give the desired
+effect -- there is always one line available or we are already at the
+beginning of the next page -- we temporarily increase the page length
+by one line so that we can use @w{@samp{.ne 2}}.
+
+@Example
+.de EM
+.pl +1v
+\c
+.ne 2
+line one
+.br
+\c
+.ne 2
+line two
+.br
+\c
+.ne 2
+line three
+.br
+.pl -1v
+\c
+'bp
+..
+.em EM
+@endExample
+
+Note that this specific feature affects only the first potential page
+break caused by the end macro; further page breaks emitted by the end
+macro are handled normally.
 @endDefreq
 
 
@@ -13086,6 +13383,8 @@
 the the @option{-m} command line option.  If the file name to be
 included has the form @file{@var{name}.tmac} and it isn't found,
 @code{mso} tries to include @file{tmac.@var{name}} and vice versa.
+If the file does not exist, a warning of type @samp{file} is emitted.
+@xref{Debugging}, for information about warnings.
 @endDefreq
 
 @DefreqList {trf, file}
@@ -14136,6 +14435,11 @@
 @itemx 524288
 Color related warnings.
 
+@item file
+@itemx 1048576
+Missing files.  The @code{mso} request gives this warning when the
+requested macro file does not exist.  This is enabled by default.
+
 @item all
 All warnings except @samp{di}, @samp{mac} and @samp{reg}.  It is
 intended that this covers all warnings that are useful with traditional
@@ -14362,6 +14666,7 @@
 * grap::
 * grefer::
 * gsoelim::
+* preconv::
 @end menu
 
 
@@ -14496,7 +14801,7 @@
 
 @c =====================================================================
 
-@node gsoelim,  , grefer, Preprocessors
+@node gsoelim, preconv, grefer, Preprocessors
 @section @code{gsoelim}
 @cindex @code{soelim}, the program
 @cindex @code{gsoelim}, the program
@@ -14517,6 +14822,27 @@
 @c XXX
 
 
+@c =====================================================================
+
+@node preconv,  , gsoelim, Preprocessors
+@section @code{preconv}
+@cindex @code{preconv}, the program
+
+@c XXX
+
+@menu
+* Invoking preconv::
+@end menu
+
+@c ---------------------------------------------------------------------
+
+@node Invoking preconv,  , preconv, preconv
+@subsection Invoking @code{preconv}
+@cindex invoking @code{preconv}
+@cindex @code{preconv}, invoking
+
+@c XXX
+
 
 @c =====================================================================
 @c =====================================================================
@@ -14696,7 +15022,28 @@
 @section @code{grohtml}
 @cindex @code{grohtml}, the program
 
-@c XXX
+The @code{grohtml} front end (which consists of a preprocessor,
+@code{pre-grohtml}, and a device driver, @code{post-grohtml}) translates
+the output of GNU @code{troff} to @acronym{HTML}.  Users should always
+invoke @code{grohtml} via the @code{groff} command with a @code{\-Thtml}
+option.  If no files are given, @code{grohtml} will read the standard
+input.  A filename of @code{-} will also cause @code{grohtml} to read
+the standard input.  @acronym{HTML} output is written to the standard
+output.  When @code{grohtml} is run by @code{groff}, options can be
+passed to @code{grohtml} using @code{groff}'s @code{-P} option.
+
+@code{grohtml} invokes @code{groff} twice.  In the first pass, pictures,
+equations, and tables are rendered using the @code{ps} device, and in
+the second pass @acronym{HTML} output is generated by the @code{html}
+device.
+
+@code{grohtml} always writes output in @code{UTF-8} encoding and has
+built-in entities for all non-composite unicode characters.  In spite of
+this, @code{groff} may issue warnings about unknown special characters
+if they can't be found during the first pass.  Such warnings can be
+safely ignored unless the special characters appear inside a table or
+equation, in which case glyphs for these characters must be defined for
+the @code{ps} device as well.
 
 @menu
 * Invoking grohtml::
diff -ruN groff-1.20.1/doc/Makefile.in groff-1.21/doc/Makefile.in
--- groff-1.20.1/doc/Makefile.in	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/doc/Makefile.in	2010-12-31 08:33:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
 #   Free Software Foundation, Inc.
 #      Written by Werner Lemberg <wl@gnu.org>
 # 
@@ -99,9 +99,9 @@
 	$(GROFF) -Tps -ms -mwww >$@
 
 .texinfo.dvi:
-	$(TEXI2DVI) -e $<
+	MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e $<
 .texinfo.pdf:
-	$(TEXI2DVI) -e --pdf $<
+	MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e --pdf $<
 .texinfo.html:
 	$(MAKEINFO) --enable-encoding -I$(srcdir) --html --no-split $< \
 	&& $(SHELL) $(srcdir)/fixinfo.sh $@
diff -ruN groff-1.20.1/doc/pic.ms groff-1.21/doc/pic.ms
--- groff-1.20.1/doc/pic.ms	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/doc/pic.ms	2010-12-31 08:33:09.000000000 +0100
@@ -30,7 +30,7 @@
 .\" Eric S. Raymond <esr@thyrsus.com> in August 1995.  It has been put
 .\" under the GPL in March 2006.
 .\"
-.\"	$Id: pic.ms,v 1.44 2009/01/05 20:10:52 wl Exp $	
+.\"	$Id: pic.ms,v 1.45 2010/09/19 07:46:27 wl Exp $	
 .
 .
 .\" Set a proper TeX and LaTeX
@@ -3022,7 +3022,7 @@
 .sp 2p
 .TH
 boxht@0.5@Default height of a box
-boxwid@0.75@Default height of a box
+boxwid@0.75@Default width of a box
 lineht@0.5@Default length of vertical line
 linewid@0.75@Default length of horizontal line
 arcrad @0.25@Default radius of an arc
diff -ruN groff-1.20.1/doc/texinfo.tex groff-1.21/doc/texinfo.tex
--- groff-1.20.1/doc/texinfo.tex	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/doc/texinfo.tex	2010-12-31 08:33:09.000000000 +0100
@@ -1,13 +1,13 @@
 % texinfo.tex -- TeX macros to handle Texinfo files.
-%
+% 
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2009-01-01.14-groff}
+\def\texinfoversion{2010-12-23.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -65,7 +65,6 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -93,14 +92,13 @@
 \let\ptexnewwrite\newwrite
 \let\ptexnoindent=\noindent
 \let\ptexplus=+
+\let\ptexraggedright=\raggedright
 \let\ptexrbrace=\}
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
 \let\ptextop=\top
-{\catcode`\'=\active
-\global\let\ptexquoteright'}% Math-mode def from plain.tex.
-\let\ptexraggedright=\raggedright
+{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode
 
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
@@ -199,36 +197,7 @@
 % that mark overfull boxes (in case you have decided
 % that the text looks ok even though it passes the margin).
 %
-\def\finalout{\overfullrule=0pt}
-
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
-%
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
-}
+\def\finalout{\overfullrule=0pt }
 
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
@@ -267,7 +236,6 @@
 \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
   \removelastskip\penalty-200\bigskip\fi\fi}
 
-% For @cropmarks command.
 % Do @cropmarks to get crop marks.
 %
 \newif\ifcropmarks
@@ -358,7 +326,7 @@
                % We don't want .vr (or whatever) entries like this:
                % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
                % "\acronym" won't work when it's read back in;
-               % it needs to be 
+               % it needs to be
                % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
@@ -599,85 +567,6 @@
 \newhelp\EMsimple{Press RETURN to continue.}
 
 
-%% Simple single-character @ commands
-
-% @@ prints an @
-% Kludge this until the fonts are right (grr).
-\def\@{{\tt\char64}}
-
-% This is turned off because it was never documented
-% and you can use @w{...} around a quote to suppress ligatures.
-%% Define @` and @' to be the same as ` and '
-%% but suppressing ligatures.
-%\def\`{{`}}
-%\def\'{{'}}
-
-% Used to generate quoted braces.
-\def\mylbrace {{\tt\char123}}
-\def\myrbrace {{\tt\char125}}
-\let\{=\mylbrace
-\let\}=\myrbrace
-\begingroup
-  % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux/toc files.
-  \catcode`\{ = \other \catcode`\} = \other
-  \catcode`\[ = 1 \catcode`\] = 2
-  \catcode`\! = 0 \catcode`\\ = \other
-  !gdef!lbracecmd[\{]%
-  !gdef!rbracecmd[\}]%
-  !gdef!lbraceatcmd[@{]%
-  !gdef!rbraceatcmd[@}]%
-!endgroup
-
-% @comma{} to avoid , parsing problems.
-\let\comma = ,
-
-% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
-\let\, = \c
-\let\dotaccent = \.
-\def\ringaccent#1{{\accent23 #1}}
-\let\tieaccent = \t
-\let\ubaraccent = \b
-\let\udotaccent = \d
-
-% Other special characters: @questiondown @exclamdown @ordf @ordm
-% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
-\def\questiondown{?`}
-\def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
-
-% Dotless i and dotless j, used for accents.
-\def\imacro{i}
-\def\jmacro{j}
-\def\dotless#1{%
-  \def\temp{#1}%
-  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
-  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
-  \else \errmessage{@dotless can be used only with i or j}%
-  \fi\fi
-}
-
-% The \TeX{} logo, as in plain, but resetting the spacing so that a
-% period following counts as ending a sentence.  (Idea found in latex.)
-%
-\edef\TeX{\TeX \spacefactor=1000 }
-
-% @LaTeX{} logo.  Not quite the same results as the definition in
-% latex.ltx, since we use a different font for the raised A; it's most
-% convenient for us to use an explicitly smaller font, rather than using
-% the \scriptstyle font (since we don't reset \scriptstyle and
-% \scriptscriptstyle).
-%
-\def\LaTeX{%
-  L\kern-.36em
-  {\setbox0=\hbox{T}%
-   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-  \kern-.15em
-  \TeX
-}
-
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
@@ -709,7 +598,7 @@
 \def\?{?\spacefactor=\endofsentencespacefactor\space}
 
 % @frenchspacing on|off  says whether to put extra space after punctuation.
-% 
+%
 \def\onword{on}
 \def\offword{off}
 %
@@ -873,7 +762,7 @@
 
 % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
 % paragraph.  For more general purposes, use the \margin insertion
-% class.  WHICH is `l' or `r'.
+% class.  WHICH is `l' or `r'.  Not documented, written for gawk manual.
 %
 \newskip\inmarginspacing \inmarginspacing=1cm
 \def\strutdepth{\dp\strutbox}
@@ -920,6 +809,36 @@
   \temp
 }
 
+% @| inserts a changebar to the left of the current line.  It should
+% surround any changed text.  This approach does *not* work if the
+% change spans more than two lines of output.  To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).  This command
+% is not documented, not supported, and doesn't work.
+%
+\def\|{%
+  % \vadjust can only be used in horizontal mode.
+  \leavevmode
+  %
+  % Append this vertical mode material after the current line in the output.
+  \vadjust{%
+    % We want to insert a rule with the height and depth of the current
+    % leading; that is exactly what \strutbox is supposed to record.
+    \vskip-\baselineskip
+    %
+    % \vadjust-items are inserted at the left edge of the type.  So
+    % the \llap here moves out into the left-hand margin.
+    \llap{%
+      %
+      % For a thicker or thinner bar, change the `1pt'.
+      \vrule height\baselineskip width1pt
+      %
+      % This is the space between the bar and the text.
+      \hskip 12pt
+    }%
+  }%
+}
+
 % @include FILE -- \input text of FILE.
 %
 \def\include{\parseargusing\filenamecatcodes\includezzz}
@@ -1095,109 +1014,6 @@
 }
 
 
-% @asis just yields its argument.  Used with @table, for example.
-%
-\def\asis#1{#1}
-
-% @math outputs its argument in math mode.
-%
-% One complication: _ usually means subscripts, but it could also mean
-% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
-% _ active, and distinguish by seeing if the current family is \slfam,
-% which is what @var uses.
-{
-  \catcode`\_ = \active
-  \gdef\mathunderscore{%
-    \catcode`\_=\active
-    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-  }
-}
-% Another complication: we want \\ (and @\) to output a \ character.
-% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
-% this is not advertised and we don't care.  Texinfo does not
-% otherwise define @\.
-%
-% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
-\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
-%
-\def\math{%
-  \tex
-  \mathunderscore
-  \let\\ = \mathbackslash
-  \mathactive
-  % make the texinfo accent commands work in math mode
-  \let\"=\ddot
-  \let\'=\acute
-  \let\==\bar
-  \let\^=\hat
-  \let\`=\grave
-  \let\u=\breve
-  \let\v=\check
-  \let\~=\tilde
-  \let\dotaccent=\dot
-  $\finishmath
-}
-\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
-
-% Some active characters (such as <) are spaced differently in math.
-% We have to reset their definitions in case the @math was an argument
-% to a command which sets the catcodes (such as @item or @section).
-%
-{
-  \catcode`^ = \active
-  \catcode`< = \active
-  \catcode`> = \active
-  \catcode`+ = \active
-  \catcode`' = \active
-  \gdef\mathactive{%
-    \let^ = \ptexhat
-    \let< = \ptexless
-    \let> = \ptexgtr
-    \let+ = \ptexplus
-    \let' = \ptexquoteright
-  }
-}
-
-% Some math mode symbols.
-\def\bullet{$\ptexbullet$}
-\def\geq{\ifmmode \ge\else $\ge$\fi}
-\def\leq{\ifmmode \le\else $\le$\fi}
-\def\minus{\ifmmode -\else $-$\fi}
-
-% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in the cm
-% typewriter fonts as three actual period characters; on the other hand,
-% in other typewriter fonts three periods are wider than 1.5em.  So do
-% whichever is larger.
-%
-\def\dots{%
-  \leavevmode
-  \setbox0=\hbox{...}% get width of three periods
-  \ifdim\wd0 > 1.5em
-    \dimen0 = \wd0
-  \else
-    \dimen0 = 1.5em
-  \fi
-  \hbox to \dimen0{%
-    \hskip 0pt plus.25fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus.5fil
-  }%
-}
-
-% @enddots{} is an end-of-sentence ellipsis.
-%
-\def\enddots{%
-  \dots
-  \spacefactor=\endofsentencespacefactor
-}
-
-% @comma{} is so commas can be inserted into text without messing up
-% Texinfo's parsing.
-%
-\let\comma = ,
-
 % @refill is a no-op.
 \let\refill=\relax
 
@@ -1285,7 +1101,7 @@
 % that's what we do).
 
 % double active backslashes.
-% 
+%
 {\catcode`\@=0 \catcode`\\=\active
  @gdef@activebackslashdouble{%
    @catcode`@\=@active
@@ -1297,11 +1113,11 @@
 % us) handles it with this amazing macro to replace tokens, with minor
 % changes for Texinfo.  It is included here under the GPL by permission
 % from the author, Heiko Oberdiek.
-% 
+%
 % #1 is the tokens to replace.
 % #2 is the replacement.
 % #3 is the control sequence with the string.
-% 
+%
 \def\HyPsdSubst#1#2#3{%
   \def\HyPsdReplace##1#1##2\END{%
     ##1%
@@ -1332,13 +1148,16 @@
 
 \ifpdf
   %
-  % Color manipulation macros based on pdfcolor.tex.
-  \def\cmykDarkRed{0.28 1 1 0.35}
-  \def\cmykBlack{0 0 0 1}
+  % Color manipulation macros based on pdfcolor.tex,
+  % except using rgb instead of cmyk; the latter is said to render as a
+  % very dark gray on-screen and a very dark halftone in print, instead
+  % of actual black.
+  \def\rgbDarkRed{0.50 0.09 0.12}
+  \def\rgbBlack{0 0 0}
   %
   % k sets the color for filling (usual text, etc.);
   % K sets the color for stroking (thin rules, e.g., normal _'s).
-  \def\pdfsetcolor#1{\pdfliteral{#1 k  #1 K}}
+  \def\pdfsetcolor#1{\pdfliteral{#1 rg  #1 RG}}
   %
   % Set color, and create a mark which defines \thiscolor accordingly,
   % so that \makeheadline knows which color to restore.
@@ -1348,7 +1167,7 @@
     \pdfsetcolor{#1}%
   }
   %
-  \def\maincolor{\cmykBlack}
+  \def\maincolor{\rgbBlack}
   \pdfsetcolor{\maincolor}
   \edef\thiscolor{\maincolor}
   \def\lastcolordefs{}
@@ -1443,8 +1262,8 @@
   %
   % by default, use a color that is dark enough to print on paper as
   % nearly black, but still distinguishable for online viewing.
-  \def\urlcolor{\cmykDarkRed}
-  \def\linkcolor{\cmykDarkRed}
+  \def\urlcolor{\rgbDarkRed}
+  \def\linkcolor{\rgbDarkRed}
   \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
   % Adding outlines to PDF; macros for calculating structure of outlines
@@ -1489,6 +1308,7 @@
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
       % Read toc silently, to get counts of subentries for \pdfoutline.
+      \def\partentry##1##2##3##4{}% ignore parts in the outlines
       \def\numchapentry##1##2##3##4{%
 	\def\thischapnum{##2}%
 	\def\thissecnum{0}%
@@ -1573,12 +1393,13 @@
       % tried to figure out what each command should do in the context
       % of @url.  for now, just make @/ a no-op, that's the only one
       % people have actually reported a problem with.
-      % 
+      %
       \normalturnoffactive
       \def\@{@}%
       \let\/=\empty
       \makevalueexpandable
-      % \indexnofonts -- is that what we want?
+      % do we want to go so far as to use \indexnofonts instead of just
+      % special-casing \var here?
       \def\var##1{##1}%
       %
       \leavevmode\setcolor{\urlcolor}%
@@ -1980,7 +1801,7 @@
 
 % Definitions for a main text size of 11pt.  This is the default in
 % Texinfo.
-% 
+%
 \def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
 \def\textnominalsize{11pt}
@@ -2101,8 +1922,8 @@
 \font\reducedsy=cmsy10
 \def\reducedecsize{1000}
 
-% reset the current fonts
-\textfonts
+\textleading = 13.2pt % line spacing for 11pt CM
+\textfonts            % reset the current fonts
 \rm
 } % end of 11pt text font size definitions
 
@@ -2111,7 +1932,7 @@
 % section, chapter, etc., sizes following suit.  This is for the GNU
 % Press printing of the Emacs 22 manual.  Maybe other manuals in the
 % future.  Used with @smallbook, which sets the leading to 12pt.
-% 
+%
 \def\definetextfontsizex{%
 % Text fonts (10pt).
 \def\textnominalsize{10pt}
@@ -2200,7 +2021,7 @@
 \setfont\secsf\sfbshape{12}{1000}{OT1}
 \let\secbf\secrm
 \setfont\secsc\scbshape{10}{\magstep1}{OT1}
-\font\seci=cmmi12 
+\font\seci=cmmi12
 \font\secsy=cmsy10 scaled \magstep1
 \def\sececsize{1200}
 
@@ -2232,11 +2053,9 @@
 \font\reducedsy=cmsy9
 \def\reducedecsize{0900}
 
-% reduce space between paragraphs
-\divide\parskip by 2
-
-% reset the current fonts
-\textfonts
+\divide\parskip by 2  % reduce space between paragraphs
+\textleading = 12pt   % line spacing for 10pt CM
+\textfonts            % reset the current fonts
 \rm
 } % end of 10pt text font size definitions
 
@@ -2244,9 +2063,10 @@
 % We provide the user-level command
 %   @fonttextsize 10
 % (or 11) to redefine the text font size.  pt is assumed.
-% 
-\def\xword{10}
+%
 \def\xiword{11}
+\def\xword{10}
+\def\xwordpt{10pt}
 %
 \parseargdef\fonttextsize{%
   \def\textsizearg{#1}%
@@ -2254,7 +2074,7 @@
   %
   % Set \globaldefs so that documents can use this inside @tex, since
   % makeinfo 4.8 does not support it, but we need it nonetheless.
-  % 
+  %
  \begingroup \globaldefs=1
   \ifx\textsizearg\xword \definetextfontsizex
   \else \ifx\textsizearg\xiword \definetextfontsizexi
@@ -2304,7 +2124,7 @@
   \let\tenttsl=\titlettsl
   \def\curfontsize{title}%
   \def\lsize{chap}\def\lllsize{subsec}%
-  \resetmathfonts \setleading{25pt}}
+  \resetmathfonts \setleading{27pt}}
 \def\titlefont#1{{\titlefonts\rmisbold #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
@@ -2456,14 +2276,19 @@
 
 \let\markupsetuplqcode \markupsetcodequoteleft
 \let\markupsetuprqcode \markupsetcodequoteright
+%
 \let\markupsetuplqexample \markupsetcodequoteleft
 \let\markupsetuprqexample \markupsetcodequoteright
+%
+\let\markupsetuplqsamp \markupsetcodequoteleft
+\let\markupsetuprqsamp \markupsetcodequoteright
+%
 \let\markupsetuplqverb \markupsetcodequoteleft
 \let\markupsetuprqverb \markupsetcodequoteright
+%
 \let\markupsetuplqverbatim \markupsetcodequoteleft
 \let\markupsetuprqverbatim \markupsetcodequoteright
 
-\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
 \let\markupsetuplqkbd \markupsetnoligaturesquoteleft
 
 % Allow an option to not replace quotes with a regular directed right
@@ -2471,8 +2296,8 @@
 % from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
 % the default, but it works for pasting with more pdf viewers (at least
 % evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.  
-% 
+% regular 0x27.
+%
 \def\codequoteright{%
   \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
     \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
@@ -2484,7 +2309,7 @@
 % and a similar option for the left quote char vs. a grave accent.
 % Modern fonts display ASCII 0x60 as a grave accent, so some people like
 % the code environments to do likewise.
-% 
+%
 \def\codequoteleft{%
   \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
     \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
@@ -2501,27 +2326,40 @@
 % Count depth in font-changes, for error checks
 \newcount\fontdepth \fontdepth=0
 
-%% Add scribe-like font environments, plus @l for inline lisp (usually sans
-%% serif) and @ii for TeX italic
+% Font commands.
+
+% #1 is the font command (\sl or \it), #2 is the text to slant.
+% If we are in a monospaced environment, however, 1) always use \ttsl,
+% and 2) do not add an italic correction.
+\def\dosmartslant#1#2{%
+  \ifusingtt 
+    {{\ttsl #2}\let\next=\relax}%
+    {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
+  \next
+}
+\def\smartslanted{\dosmartslant\sl}
+\def\smartitalic{\dosmartslant\it}
 
-% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
-% unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-                    \ptexslash\fi\fi\fi}
-\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
-\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
+% Output an italic correction unless \next (presumed to be the following
+% character) is such as not to need one.
+\def\smartitaliccorrection{%
+  \ifx\next,%
+  \else\ifx\next-%
+  \else\ifx\next.%
+  \else\ptexslash
+  \fi\fi\fi}
 
-% like \smartslanted except unconditionally uses \ttsl.
+% like \smartslanted except unconditionally uses \ttsl, and no ic.
 % @var is set to this for defun arguments.
-\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
+\def\ttslanted#1{{\ttsl #1}}
 
 % @cite is like \smartslanted except unconditionally use \sl.  We never want
 % ttsl for book titles, do we?
-\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
+\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
 
 \let\i=\smartitalic
 \let\slanted=\smartslanted
-\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
+\def\var#1{\smartslanted{#1}}
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
@@ -2668,7 +2506,7 @@
 % each of the four underscores in __typeof__.  This is undesirable in
 % some manuals, especially if they don't have long identifiers in
 % general.  @allowcodebreaks provides a way to control this.
-% 
+%
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
 \def\keywordtrue{true}
@@ -2759,65 +2597,245 @@
   \endlink
 \endgroup}
 
-% @url synonym for @uref, since that's how everyone uses it.
-%
-\let\url=\uref
+% @url synonym for @uref, since that's how everyone uses it.
+%
+\let\url=\uref
+
+% rms does not like angle brackets --karl, 17may97.
+% So now @email is just like @uref, unless we are pdf.
+%
+%\def\email#1{\angleleft{\tt #1}\angleright}
+\ifpdf
+  \def\email#1{\doemail#1,,\finish}
+  \def\doemail#1,#2,#3\finish{\begingroup
+    \unsepspaces
+    \pdfurl{mailto:#1}%
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
+    \endlink
+  \endgroup}
+\else
+  \let\email=\uref
+\fi
+
+% Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
+% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
+%
+\def\dmn#1{\thinspace #1}
+
+% @l was never documented to mean ``switch to the Lisp font'',
+% and it is not used as such in any manual I can find.  We need it for
+% Polish suppressed-l.  --karl, 22sep96.
+%\def\l#1{{\li #1}\null}
+
+% @acronym for "FBI", "NATO", and the like.
+% We print this one point size smaller, since it's intended for
+% all-uppercase.
+%
+\def\acronym#1{\doacronym #1,,\finish}
+\def\doacronym#1,#2,#3\finish{%
+  {\selectfonts\lsize #1}%
+  \def\temp{#2}%
+  \ifx\temp\empty \else
+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+  \fi
+}
+
+% @abbr for "Comput. J." and the like.
+% No font change, but don't do end-of-sentence spacing.
+%
+\def\abbr#1{\doabbr #1,,\finish}
+\def\doabbr#1,#2,#3\finish{%
+  {\plainfrenchspacing #1}%
+  \def\temp{#2}%
+  \ifx\temp\empty \else
+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+  \fi
+}
+
+% @asis just yields its argument.  Used with @table, for example.
+%
+\def\asis#1{#1}
+
+% @math outputs its argument in math mode.
+%
+% One complication: _ usually means subscripts, but it could also mean
+% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
+% _ active, and distinguish by seeing if the current family is \slfam,
+% which is what @var uses.
+{
+  \catcode`\_ = \active
+  \gdef\mathunderscore{%
+    \catcode`\_=\active
+    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
+  }
+}
+% Another complication: we want \\ (and @\) to output a math (or tt) \.
+% FYI, plain.tex uses \\ as a temporary control sequence (for no
+% particular reason), but this is not advertised and we don't care.
+%
+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
+%
+\def\math{%
+  \tex
+  \mathunderscore
+  \let\\ = \mathbackslash
+  \mathactive
+  % make the texinfo accent commands work in math mode
+  \let\"=\ddot
+  \let\'=\acute
+  \let\==\bar
+  \let\^=\hat
+  \let\`=\grave
+  \let\u=\breve
+  \let\v=\check
+  \let\~=\tilde
+  \let\dotaccent=\dot
+  $\finishmath
+}
+\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
+
+% Some active characters (such as <) are spaced differently in math.
+% We have to reset their definitions in case the @math was an argument
+% to a command which sets the catcodes (such as @item or @section).
+%
+{
+  \catcode`^ = \active
+  \catcode`< = \active
+  \catcode`> = \active
+  \catcode`+ = \active
+  \catcode`' = \active
+  \gdef\mathactive{%
+    \let^ = \ptexhat
+    \let< = \ptexless
+    \let> = \ptexgtr
+    \let+ = \ptexplus
+    \let' = \ptexquoteright
+  }
+}
+
+
+\message{glyphs,}
+% and logos.
+
+% @@ prints an @.
+\def\@{\char64 }
+
+% Used to generate quoted braces.  Unless we're in typewriter, use
+% \ecfont because the CM text fonts do not have braces, and we don't
+% want to switch into math.
+\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
+\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
+\let\{=\mylbrace
+\let\}=\myrbrace
+\begingroup
+  % Definitions to produce \{ and \} commands for indices,
+  % and @{ and @} for the aux/toc files.
+  \catcode`\{ = \other \catcode`\} = \other
+  \catcode`\[ = 1 \catcode`\] = 2
+  \catcode`\! = 0 \catcode`\\ = \other
+  !gdef!lbracecmd[\{]%
+  !gdef!rbracecmd[\}]%
+  !gdef!lbraceatcmd[@{]%
+  !gdef!rbraceatcmd[@}]%
+!endgroup
+
+% @comma{} to avoid , parsing problems.
+\let\comma = ,
+
+% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
+\let\, = \ptexc
+\let\dotaccent = \ptexdot
+\def\ringaccent#1{{\accent23 #1}}
+\let\tieaccent = \ptext
+\let\ubaraccent = \ptexb
+\let\udotaccent = \d
+
+% Other special characters: @questiondown @exclamdown @ordf @ordm
+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
+\def\questiondown{?`}
+\def\exclamdown{!`}
+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
+
+% Dotless i and dotless j, used for accents.
+\def\imacro{i}
+\def\jmacro{j}
+\def\dotless#1{%
+  \def\temp{#1}%
+  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
+  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
+  \else \errmessage{@dotless can be used only with i or j}%
+  \fi\fi
+}
 
-% rms does not like angle brackets --karl, 17may97.
-% So now @email is just like @uref, unless we are pdf.
+% The \TeX{} logo, as in plain, but resetting the spacing so that a
+% period following counts as ending a sentence.  (Idea found in latex.)
 %
-%\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
-  \def\email#1{\doemail#1,,\finish}
-  \def\doemail#1,#2,#3\finish{\begingroup
-    \unsepspaces
-    \pdfurl{mailto:#1}%
-    \setbox0 = \hbox{\ignorespaces #2}%
-    \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
-    \endlink
-  \endgroup}
-\else
-  \let\email=\uref
-\fi
+\edef\TeX{\TeX \spacefactor=1000 }
 
-% Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
-% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
+% @LaTeX{} logo.  Not quite the same results as the definition in
+% latex.ltx, since we use a different font for the raised A; it's most
+% convenient for us to use an explicitly smaller font, rather than using
+% the \scriptstyle font (since we don't reset \scriptstyle and
+% \scriptscriptstyle).
 %
-\def\dmn#1{\thinspace #1}
+\def\LaTeX{%
+  L\kern-.36em
+  {\setbox0=\hbox{T}%
+   \vbox to \ht0{\hbox{%
+     \ifx\textnominalsize\xwordpt
+       % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
+       % Revert to plain's \scriptsize, which is 7pt.
+       \count255=\the\fam $\fam\count255 \scriptstyle A$%
+     \else
+       % For 11pt, we can use our lllsize.
+       \selectfonts\lllsize A%
+     \fi
+     }%
+     \vss
+  }}%
+  \kern-.15em
+  \TeX
+}
 
-% @l was never documented to mean ``switch to the Lisp font'',
-% and it is not used as such in any manual I can find.  We need it for
-% Polish suppressed-l.  --karl, 22sep96.
-%\def\l#1{{\li #1}\null}
+% Some math mode symbols.
+\def\bullet{$\ptexbullet$}
+\def\geq{\ifmmode \ge\else $\ge$\fi}
+\def\leq{\ifmmode \le\else $\le$\fi}
+\def\minus{\ifmmode -\else $-$\fi}
 
-% @acronym for "FBI", "NATO", and the like.
-% We print this one point size smaller, since it's intended for
-% all-uppercase.
-% 
-\def\acronym#1{\doacronym #1,,\finish}
-\def\doacronym#1,#2,#3\finish{%
-  {\selectfonts\lsize #1}%
-  \def\temp{#2}%
-  \ifx\temp\empty \else
-    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+% @dots{} outputs an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
+%
+\def\dots{%
+  \leavevmode
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
   \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
+  }%
 }
 
-% @abbr for "Comput. J." and the like.
-% No font change, but don't do end-of-sentence spacing.
-% 
-\def\abbr#1{\doabbr #1,,\finish}
-\def\doabbr#1,#2,#3\finish{%
-  {\plainfrenchspacing #1}%
-  \def\temp{#2}%
-  \ifx\temp\empty \else
-    \space ({\unsepspaces \ignorespaces \temp \unskip})%
-  \fi
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+  \dots
+  \spacefactor=\endofsentencespacefactor
 }
 
-
-\message{glyphs,}
-
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
 % Since these characters are used in examples, they should be an even number of
@@ -2862,52 +2880,59 @@
 % Theiling, which support regular, slanted, bold and bold slanted (and
 % "outlined" (blackboard board, sort of) versions, which we don't need).
 % It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
-% 
+%
 % Although only regular is the truly official Euro symbol, we ignore
 % that.  The Euro is designed to be slightly taller than the regular
 % font height.
-% 
+%
 % feymr - regular
 % feymo - slanted
 % feybr - bold
 % feybo - bold slanted
-% 
+%
 % There is no good (free) typewriter version, to my knowledge.
 % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
 % Hmm.
-% 
+%
 % Also doesn't work in math.  Do we need to do math with euro symbols?
 % Hope not.
-% 
-% 
+%
+%
 \def\euro{{\eurofont e}}
 \def\eurofont{%
   % We set the font at each command, rather than predefining it in
   % \textfonts and the other font-switching commands, so that
   % installations which never need the symbol don't have to have the
   % font installed.
-  % 
+  %
   % There is only one designed size (nominal 10pt), so we always scale
   % that to the current nominal size.
-  % 
+  %
   % By the way, simply using "at 1em" works for cmr10 and the like, but
   % does not work for cmbx10 and other extended/shrunken fonts.
-  % 
+  %
   \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
   %
-  \ifx\curfontstyle\bfstylename 
+  \ifx\curfontstyle\bfstylename
     % bold:
     \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-  \else 
+  \else
     % regular:
     \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
   \fi
   \thiseurofont
 }
 
-% Hacks for glyphs from the EC fonts similar to \euro.  We don't
-% use \let for the aliases, because sometimes we redefine the original
-% macro, and the alias should reflect the redefinition.
+% Glyphs from the EC fonts.  We don't use \let for the aliases, because
+% sometimes we redefine the original macro, and the alias should reflect
+% the redefinition.
+%
+% Use LaTeX names for the Icelandic letters.
+\def\DH{{\ecfont \char"D0}} % Eth
+\def\dh{{\ecfont \char"F0}} % eth
+\def\TH{{\ecfont \char"DE}} % Thorn
+\def\th{{\ecfont \char"FE}} % thorn
+%
 \def\guillemetleft{{\ecfont \char"13}}
 \def\guillemotleft{\guillemetleft}
 \def\guillemetright{{\ecfont \char"14}}
@@ -2921,7 +2946,7 @@
 % we have the precomposed glyphs for the most common cases.  We put the
 % tests to use those glyphs in the single \ogonek macro so we have fewer
 % dummy definitions to worry about for index entries, etc.
-% 
+%
 % ogonek is also used with other letters in Lithuanian (IOU), but using
 % the precomposed glyphs for those is not so easy since they aren't in
 % the same EC font.
@@ -2944,6 +2969,7 @@
 \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
 \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
 %
+% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
 \def\ecfont{%
   % We can't distinguish serif/sans and italic/slanted, but this
   % is used for crude hacks anyway (like adding French and German
@@ -2978,7 +3004,7 @@
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
-% 
+%
 \ifx\Orb\undefined
 \def\Orb{\mathhexbox20D}
 \fi
@@ -3195,10 +3221,14 @@
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
-\def\HEADINGSoff{%
-\global\evenheadline={\hfil} \global\evenfootline={\hfil}
-\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
-\HEADINGSoff
+\def\headingsoff{% non-global headings elimination
+  \evenheadline={\hfil}\evenfootline={\hfil}%
+   \oddheadline={\hfil}\oddfootline={\hfil}%
+}
+
+\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
+\HEADINGSoff  % it's the default
+
 % When we turn headings on, set the page number to 1.
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
@@ -3310,7 +3340,7 @@
     \begingroup
       \advance\leftskip by-\tableindent
       \advance\hsize by\tableindent
-      \advance\rightskip by0pt plus1fil
+      \advance\rightskip by0pt plus1fil\relax
       \leavevmode\unhbox0\par
     \endgroup
     %
@@ -3324,7 +3354,7 @@
     % cause the example and the item to crash together.  So we use this
     % bizarre value of 10001 as a signal to \aboveenvbreak to insert
     % \parskip glue after all.  Section titles are handled this way also.
-    % 
+    %
     \penalty 10001
     \endgroup
     \itemxneedsnegativevskipfalse
@@ -3418,9 +3448,18 @@
   \parindent=0pt
   \parskip=\smallskipamount
   \ifdim\parskip=0pt \parskip=2pt \fi
+  %
+  % Try typesetting the item mark that if the document erroneously says
+  % something like @itemize @samp (intending @table), there's an error
+  % right away at the @itemize.  It's not the best error message in the
+  % world, but it's better than leaving it to the @item.  This means if
+  % the user wants an empty mark, they have to say @w{} not just @w.
   \def\itemcontents{#1}%
+  \setbox0 = \hbox{\itemcontents}%
+  %
   % @itemize with no arg is equivalent to @itemize @bullet.
   \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
+  %
   \let\item=\itemizeitem
 }
 
@@ -3441,6 +3480,7 @@
    \ifnum\lastpenalty<10000 \parskip=0in \fi
    \noindent
    \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
+   %
    \vadjust{\penalty 1200}}% not good to break after first line of item.
   \flushcr
 }
@@ -3662,12 +3702,19 @@
 %
 % @headitem starts a heading row, which we typeset in bold.
 % Assignments have to be global since we are inside the implicit group
-% of an alignment entry.  Note that \everycr resets \everytab.
-\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
+% of an alignment entry.  \everycr resets \everytab so we don't have to
+% undo it ourselves.
+\def\headitemfont{\b}% for people to use in the template row; not changeable
+\def\headitem{%
+  \checkenv\multitable
+  \crcr
+  \global\everytab={\bf}% can't use \headitemfont since the parsing differs
+  \the\everytab % for the first item
+}%
 %
 % A \tab used to include \hskip1sp.  But then the space in a template
 % line is not enough.  That is bad.  So let's go back to just `&' until
-% we encounter the problem it was intended to solve again.
+% we again encounter the problem the 1sp was intended to solve.
 %					--karl, nathan@acm.org, 20apr99.
 \def\tab{\checkenv\multitable &\the\everytab}%
 
@@ -4105,11 +4152,14 @@
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
   %
-  % Need these in case \tex is in effect and \{ is a \delimiter again.
-  % But can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.
-  \let\{ = \mylbrace
-  \let\} = \myrbrace
+  % Need these unexpandable (because we define \tt as a dummy)
+  % definitions when @{ or @} appear in index entry text.  Also, more
+  % complicated, when \tex is in effect and \{ is a \delimiter again.
+  % We can't use \lbracecmd and \rbracecmd because texindex assumes
+  % braces and backslashes are used only as delimiters.  Perhaps we
+  % should define @lbrace and @rbrace commands a la @comma.
+  \def\{{{\tt\char123}}%
+  \def\}{{\tt\char125}}%
   %
   % I don't entirely understand this, but when an index entry is
   % generated from a macro call, the \endinput which \scanmacro inserts
@@ -4120,7 +4170,7 @@
   % processing continues to some further point.  On the other hand, it
   % seems \endinput does not hurt in the printed index arg, since that
   % is still getting written without apparent harm.
-  % 
+  %
   % Sample source (mac-idx3.tex, reported by Graham Percival to
   % help-texinfo, 22may06):
   % @macro funindex {WORD}
@@ -4128,12 +4178,12 @@
   % @end macro
   % ...
   % @funindex commtest
-  % 
+  %
   % The above is not enough to reproduce the bug, but it gives the flavor.
-  % 
+  %
   % Sample whatsit resulting:
   % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-  % 
+  %
   % So:
   \let\endinput = \empty
   %
@@ -4162,7 +4212,7 @@
 \def\commondummies{%
   %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
-  % preventing its expansion.  This is used only for control% words,
+  % preventing its expansion.  This is used only for control words,
   % not control letters, because the \space would be incorrect for
   % control characters, but is needed to separate the control word
   % from whatever follows.
@@ -4181,23 +4231,28 @@
   \commondummiesnofonts
   %
   \definedummyletter\_%
+  \definedummyletter\-%
   %
   % Non-English letters.
   \definedummyword\AA
   \definedummyword\AE
+  \definedummyword\DH
   \definedummyword\L
-  \definedummyword\OE
   \definedummyword\O
+  \definedummyword\OE
+  \definedummyword\TH
   \definedummyword\aa
   \definedummyword\ae
+  \definedummyword\dh
+  \definedummyword\exclamdown
   \definedummyword\l
-  \definedummyword\oe
   \definedummyword\o
-  \definedummyword\ss
-  \definedummyword\exclamdown
-  \definedummyword\questiondown
+  \definedummyword\oe
   \definedummyword\ordf
   \definedummyword\ordm
+  \definedummyword\questiondown
+  \definedummyword\ss
+  \definedummyword\th
   %
   % Although these internal commands shouldn't show up, sometimes they do.
   \definedummyword\bf
@@ -4213,20 +4268,24 @@
   \definedummyword\TeX
   %
   % Assorted special characters.
+  \definedummyword\arrow
   \definedummyword\bullet
   \definedummyword\comma
   \definedummyword\copyright
   \definedummyword\registeredsymbol
   \definedummyword\dots
   \definedummyword\enddots
+  \definedummyword\entrybreak
   \definedummyword\equiv
   \definedummyword\error
   \definedummyword\euro
+  \definedummyword\expansion
+  \definedummyword\geq
   \definedummyword\guillemetleft
   \definedummyword\guillemetright
   \definedummyword\guilsinglleft
   \definedummyword\guilsinglright
-  \definedummyword\expansion
+  \definedummyword\leq
   \definedummyword\minus
   \definedummyword\ogonek
   \definedummyword\pounds
@@ -4283,7 +4342,9 @@
   \definedummyword\b
   \definedummyword\i
   \definedummyword\r
+  \definedummyword\sansserif
   \definedummyword\sc
+  \definedummyword\slanted
   \definedummyword\t
   %
   % Commands that take arguments.
@@ -4292,9 +4353,12 @@
   \definedummyword\code
   \definedummyword\command
   \definedummyword\dfn
+  \definedummyword\dmn
+  \definedummyword\email
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
+  \definedummyword\indicateurl
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
@@ -4322,7 +4386,7 @@
   \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
   \def\definedummyletter##1{\let##1\empty}%
-  % Hopefully, all control words can become @asis.
+  % All control words become @asis by default; overrides below.
   \let\definedummyword\definedummyaccent
   %
   \commondummiesnofonts
@@ -4334,48 +4398,60 @@
   %
   \def\ { }%
   \def\@{@}%
-  % how to handle braces?
   \def\_{\normalunderscore}%
+  \def\-{}% @- shouldn't affect sorting
+  %
+  % Unfortunately, texindex is not prepared to handle braces in the
+  % content at all.  So for index sorting, we map @{ and @} to strings
+  % starting with |, since that ASCII character is between ASCII { and }.
+  \def\{{|a}%
+  \def\}{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
   \def\AE{AE}%
+  \def\DH{DZZ}%
   \def\L{L}%
   \def\OE{OE}%
   \def\O{O}%
+  \def\TH{ZZZ}%
   \def\aa{aa}%
   \def\ae{ae}%
+  \def\dh{dzz}%
+  \def\exclamdown{!}%
   \def\l{l}%
   \def\oe{oe}%
-  \def\o{o}%
-  \def\ss{ss}%
-  \def\exclamdown{!}%
-  \def\questiondown{?}%
   \def\ordf{a}%
   \def\ordm{o}%
+  \def\o{o}%
+  \def\questiondown{?}%
+  \def\ss{ss}%
+  \def\th{zzz}%
   %
   \def\LaTeX{LaTeX}%
   \def\TeX{TeX}%
   %
   % Assorted special characters.
   % (The following {} will end up in the sort string, but that's ok.)
+  \def\arrow{->}%
   \def\bullet{bullet}%
   \def\comma{,}%
   \def\copyright{copyright}%
-  \def\registeredsymbol{R}%
   \def\dots{...}%
   \def\enddots{...}%
   \def\equiv{==}%
   \def\error{error}%
   \def\euro{euro}%
+  \def\expansion{==>}%
+  \def\geq{>=}%
   \def\guillemetleft{<<}%
   \def\guillemetright{>>}%
   \def\guilsinglleft{<}%
   \def\guilsinglright{>}%
-  \def\expansion{==>}%
+  \def\leq{<=}%
   \def\minus{-}%
-  \def\pounds{pounds}%
   \def\point{.}%
+  \def\pounds{pounds}%
   \def\print{-|}%
   \def\quotedblbase{"}%
   \def\quotedblleft{"}%
@@ -4383,22 +4459,31 @@
   \def\quoteleft{`}%
   \def\quoteright{'}%
   \def\quotesinglbase{,}%
+  \def\registeredsymbol{R}%
   \def\result{=>}%
-  \def\textdegree{degrees}%
+  \def\textdegree{o}%
+  %
+  \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax
+  \else \indexlquoteignore \fi
   %
   % We need to get rid of all macros, leaving only the arguments (if present).
   % Of course this is not nearly correct, but it is the best we can do for now.
   % makeinfo does not expand macros in the argument to @deffn, which ends up
   % writing an index entry, and texindex isn't prepared for an index sort entry
   % that starts with \.
-  % 
+  %
   % Since macro invocations are followed by braces, we can just redefine them
   % to take a single TeX argument.  The case of a macro invocation that
   % goes to end-of-line is not handled.
-  % 
+  %
   \macrolist
 }
 
+% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us
+% ignore left quotes in the sort term.
+{\catcode`\`=\active
+ \gdef\indexlquoteignore{\let`=\empty}}
+
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
 
@@ -4523,7 +4608,7 @@
     % to re-insert the same penalty (values >10000 are used for various
     % signals); since we just inserted a non-discardable item, any
     % following glue (such as a \parskip) would be a breakpoint.  For example:
-    % 
+    %
     %   @deffn deffn-whatever
     %   @vindex index-whatever
     %   Description.
@@ -4656,7 +4741,6 @@
 % But this freezes the catcodes in the argument, and can cause problems to
 % @code, which sets - active.  This problem was fixed by a kludge---
 % ``-'' was active throughout whole index, but this isn't really right.
-%
 % The right solution is to prevent \entry from swallowing the whole text.
 %                                 --kasal, 21nov03
 \def\entry{%
@@ -4693,10 +4777,17 @@
     % columns.
     \vskip 0pt plus1pt
     %
+    % When reading the text of entry, convert explicit line breaks
+    % from @* into spaces.  The user might give these in long section
+    % titles, for instance.
+    \def\*{\unskip\space\ignorespaces}%
+    \def\entrybreak{\hfil\break}%
+    %
     % Swallow the left brace of the text (first parameter):
     \afterassignment\doentry
     \let\temp =
 }
+\def\entrybreak{\unskip\space\ignorespaces}%
 \def\doentry{%
     \bgroup % Instead of the swallowed brace.
       \noindent
@@ -4929,7 +5020,22 @@
 \message{sectioning,}
 % Chapters, sections, etc.
 
-% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
+% Let's start with @part.
+\outer\parseargdef\part{\partzzz{#1}}
+\def\partzzz#1{%
+  \chapoddpage
+  \null
+  \vskip.3\vsize  % move it down on the page a bit
+  \begingroup
+    \noindent \titlefonts\rmisbold #1\par % the text
+    \let\lastnode=\empty      % no node to associate with
+    \writetocentry{part}{#1}{}% but put it in the toc
+    \headingsoff              % no headline or footline on the part page
+    \chapoddpage
+  \endgroup
+}
+
+% \unnumberedno is an oxymoron.  But we count the unnumbered
 % sections so that we can refer to them unambiguously in the pdf
 % outlines by their "section number".  We avoid collisions with chapter
 % numbers by starting them at 10000.  (If a document ever has 10000
@@ -5008,8 +5114,8 @@
 \chardef\maxseclevel = 3
 %
 % A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
-\chardef\unmlevel = \maxseclevel
+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
+\chardef\unnlevel = \maxseclevel
 %
 % Trace whether the current chapter is an appendix or not:
 % \chapheadtype is "N" or "A", unnumbered chapters are ignored.
@@ -5034,8 +5140,8 @@
   % The heading type:
   \def\headtype{#1}%
   \if \headtype U%
-    \ifnum \absseclevel < \unmlevel
-      \chardef\unmlevel = \absseclevel
+    \ifnum \absseclevel < \unnlevel
+      \chardef\unnlevel = \absseclevel
     \fi
   \else
     % Check for appendix sections:
@@ -5047,10 +5153,10 @@
       \fi\fi
     \fi
     % Check for numbered within unnumbered:
-    \ifnum \absseclevel > \unmlevel
+    \ifnum \absseclevel > \unnlevel
       \def\headtype{U}%
     \else
-      \chardef\unmlevel = 3
+      \chardef\unnlevel = 3
     \fi
   \fi
   % Now print the heading:
@@ -5104,7 +5210,9 @@
   \gdef\chaplevelprefix{\the\chapno.}%
   \resetallfloatnos
   %
-  \message{\putwordChapter\space \the\chapno}%
+  % \putwordChapter can contain complex things in translations.
+  \toks0=\expandafter{\putwordChapter}%
+  \message{\the\toks0 \space \the\chapno}%
   %
   % Write the actual heading.
   \chapmacro{#1}{Ynumbered}{\the\chapno}%
@@ -5115,15 +5223,17 @@
   \global\let\subsubsection = \numberedsubsubsec
 }
 
-\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
+\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
+%
 \def\appendixzzz#1{%
   \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
     \global\advance\appendixno by 1
   \gdef\chaplevelprefix{\appendixletter.}%
   \resetallfloatnos
   %
-  \def\appendixnum{\putwordAppendix\space \appendixletter}%
-  \message{\appendixnum}%
+  % \putwordAppendix can contain complex things in translations.
+  \toks0=\expandafter{\putwordAppendix}%
+  \message{\the\toks0 \space \appendixletter}%
   %
   \chapmacro{#1}{Yappendix}{\appendixletter}%
   %
@@ -5298,9 +5408,8 @@
   \chappager
   \ifodd\pageno \else
     \begingroup
-      \evenheadline={\hfil}\evenfootline={\hfil}%
-      \oddheadline={\hfil}\oddfootline={\hfil}%
-      \hbox to 0pt{}%
+      \headingsoff
+      \null
       \chappager
     \endgroup
   \fi
@@ -5356,7 +5465,10 @@
     \xdef\lastchapterdefs{%
       \gdef\noexpand\thischaptername{\the\toks0}%
       \gdef\noexpand\thischapternum{\appendixletter}%
-      \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
+      % \noexpand\putwordAppendix avoids expanding indigestible
+      % commands in some of the translations.
+      \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
+                                 \noexpand\thischapternum:
                                  \noexpand\thischaptername}%
     }%
   \else
@@ -5364,7 +5476,10 @@
     \xdef\lastchapterdefs{%
       \gdef\noexpand\thischaptername{\the\toks0}%
       \gdef\noexpand\thischapternum{\the\chapno}%
-      \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
+      % \noexpand\putwordChapter avoids expanding indigestible
+      % commands in some of the translations.
+      \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
+                                 \noexpand\thischapternum:
                                  \noexpand\thischaptername}%
     }%
   \fi\fi\fi
@@ -5507,7 +5622,10 @@
         \xdef\lastsectiondefs{%
           \gdef\noexpand\thissectionname{\the\toks0}%
           \gdef\noexpand\thissectionnum{#4}%
-          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+          % \noexpand\putwordSection avoids expanding indigestible
+          % commands in some of the translations.
+          \gdef\noexpand\thissection{\noexpand\putwordSection{}
+                                     \noexpand\thissectionnum:
                                      \noexpand\thissectionname}%
         }%
       \fi
@@ -5517,7 +5635,10 @@
         \xdef\lastsectiondefs{%
           \gdef\noexpand\thissectionname{\the\toks0}%
           \gdef\noexpand\thissectionnum{#4}%
-          \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
+          % \noexpand\putwordSection avoids expanding indigestible
+          % commands in some of the translations.
+          \gdef\noexpand\thissection{\noexpand\putwordSection{}
+                                     \noexpand\thissectionnum:
                                      \noexpand\thissectionname}%
         }%
       \fi
@@ -5593,11 +5714,11 @@
   % glue accumulate.  (Not a breakpoint because it's preceded by a
   % discardable item.)
   \vskip-\parskip
-  % 
+  %
   % This is purely so the last item on the list is a known \penalty >
   % 10000.  This is so \startdefun can avoid allowing breakpoints after
   % section headings.  Otherwise, it would insert a valid breakpoint between:
-  % 
+  %
   %   @section sec-whatever
   %   @deffn def-whatever
   \penalty 10001
@@ -5655,7 +5776,7 @@
 % These characters do not print properly in the Computer Modern roman
 % fonts, so we must take special care.  This is more or less redundant
 % with the Texinfo input format setup at the end of this file.
-% 
+%
 \def\activecatcodes{%
   \catcode`\"=\active
   \catcode`\$=\active
@@ -5705,7 +5826,7 @@
 
 % redefined for the two-volume lispref.  We always output on
 % \jobname.toc even if this is redefined.
-% 
+%
 \def\tocreadfilename{\jobname.toc}
 
 % Normal (long) toc.
@@ -5731,6 +5852,7 @@
 \def\summarycontents{%
   \startcontents{\putwordShortTOC}%
     %
+    \let\partentry = \shortpartentry
     \let\numchapentry = \shortchapentry
     \let\appentry = \shortchapentry
     \let\unnchapentry = \shortunnchapentry
@@ -5786,6 +5908,19 @@
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 
+% Parts, in the main contents.  Replace the part number, which doesn't
+% exist, with an empty box.  Let's hope all the numbers have the same width.
+% Also ignore the page number, which is conventionally not printed.
+\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}}
+\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}}
+%
+% Parts, in the short toc.
+\def\shortpartentry#1#2#3#4{%
+  \penalty-300
+  \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip
+  \shortchapentry{{\bf #1}}{\numeralbox}{}{}%
+}
+
 % Chapters, in the main contents.
 \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
 %
@@ -5875,9 +6010,9 @@
 \message{environments,}
 % @foo ... @end foo.
 
-% @tex ... @end tex    escapes into raw Tex temporarily.
+% @tex ... @end tex    escapes into raw TeX temporarily.
 % One exception: @ is still an escape character, so that @end tex works.
-% But \@ or @@ will get a plain tex @ character.
+% But \@ or @@ will get a plain @ character.
 
 \envdef\tex{%
   \setupmarkupstyle{tex}%
@@ -5894,6 +6029,10 @@
   \catcode`\'=\other
   \escapechar=`\\
   %
+  % ' is active in math mode (mathcode"8000).  So reset it, and all our
+  % other math active characters (just in case), to plain's definitions.
+  \mathactive
+  %
   \let\b=\ptexb
   \let\bullet=\ptexbullet
   \let\c=\ptexc
@@ -6096,41 +6235,42 @@
 }
 
 % We often define two environments, @foo and @smallfoo.
-% Let's do it by one command:
-\def\makedispenv #1#2{
-  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
+% Let's do it in one command.  #1 is the env name, #2 the definition.
+\def\makedispenvdef#1#2{%
+  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}%
+  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}%
   \expandafter\let\csname E#1\endcsname \afterenvbreak
   \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
 }
 
-% Define two synonyms:
-\def\maketwodispenvs #1#2#3{
-  \makedispenv{#1}{#3}
-  \makedispenv{#2}{#3}
+% Define two environment synonyms (#1 and #2) for an environment.
+\def\maketwodispenvdef#1#2#3{%
+  \makedispenvdef{#1}{#3}%
+  \makedispenvdef{#2}{#3}%
 }
-
-% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+%
+% @lisp: indented, narrowed, typewriter font;
+% @example: same as @lisp.
 %
 % @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
 %
-\maketwodispenvs {lisp}{example}{%
+\maketwodispenvdef{lisp}{example}{%
   \nonfillstart
   \tt\setupmarkupstyle{example}%
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble       % eat return
+  \gobble % eat return
 }
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
-\makedispenv {display}{%
+\makedispenvdef{display}{%
   \nonfillstart
   \gobble
 }
 
 % @format/@smallformat: same as @display except don't narrow margins.
 %
-\makedispenv{format}{%
+\makedispenvdef{format}{%
   \let\nonarrowing = t%
   \nonfillstart
   \gobble
@@ -6149,7 +6289,7 @@
 \envdef\flushright{%
   \let\nonarrowing = t%
   \nonfillstart
-  \advance\leftskip by 0pt plus 1fill
+  \advance\leftskip by 0pt plus 1fill\relax
   \gobble
 }
 \let\Eflushright = \afterenvbreak
@@ -6184,6 +6324,8 @@
 % we're doing normal filling.  So, when using \aboveenvbreak and
 % \afterenvbreak, temporarily make \parskip 0.
 %
+\makedispenvdef{quotation}{\quotationstart}
+%
 \def\quotationstart{%
   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
   \parindent=0pt
@@ -6199,17 +6341,6 @@
   \parsearg\quotationlabel
 }
 
-\envdef\quotation{%
-  \setnormaldispenv
-  \quotationstart
-}
-
-\envdef\smallquotation{%
-  \setsmalldispenv
-  \quotationstart
-}
-\let\Esmallquotation = \Equotation
-
 % We have retained a nonzero parskip for the environment, since we're
 % doing normal filling.
 %
@@ -6221,6 +6352,7 @@
   \fi
   {\parskip=0pt \afterenvbreak}%
 }
+\def\Esmallquotation{\Equotation}
 
 % If we're given an argument, typeset it in bold with a colon after.
 \def\quotationlabel#1{%
@@ -6277,21 +6409,28 @@
 
 % Setup for the @verbatim environment
 %
-% Real tab expansion
+% Real tab expansion.
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
-\def\starttabbox{\setbox0=\hbox\bgroup}
+% We typeset each line of the verbatim in an \hbox, so we can handle
+% tabs.  The \global is in case the verbatim line starts with an accent,
+% or some other command that starts with a begin-group.  Otherwise, the
+% entire \verbbox would disappear at the corresponding end-group, before
+% it is typeset.  Meanwhile, we can't have nested verbatim commands
+% (can we?), so the \global won't be overwriting itself.
+\newbox\verbbox
+\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup}
 %
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
     \catcode`\^^I=\active
     \def^^I{\leavevmode\egroup
-      \dimen0=\wd0 % the width so far, or since the previous tab
-      \divide\dimen0 by\tabw
-      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
-      \wd0=\dimen0 \box0 \starttabbox
+      \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab
+      \divide\dimen\verbbox by\tabw
+      \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw
+      \advance\dimen\verbbox by\tabw  % advance to next multiple of \tabw
+      \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox
     }%
   }
 \endgroup
@@ -6300,15 +6439,16 @@
 \def\setupverbatim{%
   \let\nonarrowing = t%
   \nonfillstart
-  % Easiest (and conventionally used) font for verbatim
-  \tt
-  \def\par{\leavevmode\egroup\box0\endgraf}%
+  \tt % easiest (and conventionally used) font for verbatim
+  % The \leavevmode here is for blank lines.  Otherwise, we would
+  % never \starttabox and the \egroup would end verbatim mode.
+  \def\par{\leavevmode\egroup\box\verbbox\endgraf}%
   \tabexpand
   \setupmarkupstyle{verbatim}%
   % Respect line breaks,
   % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
+  % make each space count.
+  % Must do in this order:
   \obeylines \uncatcodespecials \sepspaces
   \everypar{\starttabbox}%
 }
@@ -6451,7 +6591,7 @@
     #1#2 \endheader
     % common ending:
     \interlinepenalty = 10000
-    \advance\rightskip by 0pt plus 1fil
+    \advance\rightskip by 0pt plus 1fil\relax
     \endgraf
     \nobreak\vskip -\parskip
     \penalty\defunpenalty  % signal to \startdefun and \dodefunx
@@ -6751,25 +6891,28 @@
   }
 \fi
 
-\def\scanmacro#1{%
-  \begingroup
-    \newlinechar`\^^M
-    \let\xeatspaces\eatspaces
-    % Undo catcode changes of \startcontents and \doprintindex
-    % When called from @insertcopying or (short)caption, we need active
-    % backslash to get it printed correctly.  Previously, we had
-    % \catcode`\\=\other instead.  We'll see whether a problem appears
-    % with macro expansion.				--kasal, 19aug04
-    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-    % ... and \example
-    \spaceisspace
-    %
-    % Append \endinput to make sure that TeX does not see the ending newline.
-    % I've verified that it is necessary both for e-TeX and for ordinary TeX
-    %							--kasal, 29nov03
-    \scantokens{#1\endinput}%
-  \endgroup
-}
+\def\scanmacro#1{\begingroup
+  \newlinechar`\^^M
+  \let\xeatspaces\eatspaces
+  %
+  % Undo catcode changes of \startcontents and \doprintindex
+  % When called from @insertcopying or (short)caption, we need active
+  % backslash to get it printed correctly.  Previously, we had
+  % \catcode`\\=\other instead.  We'll see whether a problem appears
+  % with macro expansion.				--kasal, 19aug04
+  \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
+  %
+  % ... and for \example:
+  \spaceisspace
+  %
+  % The \empty here causes a following catcode 5 newline to be eaten
+  % as part of reading whitespace after a control sequence.  It does
+  % not eat a catcode 13 newline.  There's no good way to handle the
+  % two cases.  See the Macro Details node in the manual for the
+  % workaround we currently have to recommend for macros and
+  % line-oriented commands.
+  \scantokens{#1\empty}%
+\endgroup}
 
 \def\scanexp#1{%
   \edef\temp{\noexpand\scanmacro{#1}}%
@@ -6797,7 +6940,7 @@
 % This does \let #1 = #2, with \csnames; that is,
 %   \let \csname#1\endcsname = \csname#2\endcsname
 % (except of course we have to play expansion games).
-% 
+%
 \def\cslet#1#2{%
   \expandafter\let
   \csname#1\expandafter\endcsname
@@ -6823,17 +6966,18 @@
 
 % Macro bodies are absorbed as an argument in a context where
 % all characters are catcode 10, 11 or 12, except \ which is active
-% (as in normal texinfo). It is necessary to change the definition of \.
-
+% (as in normal texinfo). It is necessary to change the definition of \
+% to recognize macro arguments; this is the job of \mbodybackslash.
+%
 % Non-ASCII encodings make 8-bit characters active, so un-activate
 % them to avoid their expansion.  Must do this non-globally, to
 % confine the change to the current group.
-
+%
 % It's necessary to have hard CRs when the macro is executed. This is
-% done by  making ^^M (\endlinechar) catcode 12 when reading the macro
+% done by making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
-
-\def\scanctxt{%
+%
+\def\scanctxt{% used as subroutine
   \catcode`\"=\other
   \catcode`\+=\other
   \catcode`\<=\other
@@ -6846,13 +6990,13 @@
   \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
-\def\scanargctxt{%
+\def\scanargctxt{% used for copying and captions, not macros.
   \scanctxt
   \catcode`\\=\other
   \catcode`\^^M=\other
 }
 
-\def\macrobodyctxt{%
+\def\macrobodyctxt{% used for @macro definitions
   \scanctxt
   \catcode`\{=\other
   \catcode`\}=\other
@@ -6860,30 +7004,48 @@
   \usembodybackslash
 }
 
-\def\macroargctxt{%
+\def\macroargctxt{% used when scanning invocations
   \scanctxt
-  \catcode`\\=\other
+  \catcode`\\=0
 }
+% why catcode 0 for \ in the above?  To recognize \\ \{ \} as "escapes"
+% for the single characters \ { }.  Thus, we end up with the "commands"
+% that would be written @\ @{ @} in a Texinfo document.
+% 
+% We already have @{ and @}.  For @\, we define it here, and only for
+% this purpose, to produce a typewriter backslash (so, the @\ that we
+% define for @math can't be used with @macro calls):
+%
+\def\\{\normalbackslash}%
+% 
+% We would like to do this for \, too, since that is what makeinfo does.
+% But it is not possible, because Texinfo already has a command @, for a
+% cedilla accent.  Documents must use @comma{} instead.
+%
+% \anythingelse will almost certainly be an error of some kind.
+
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
 % where N is the macro parameter number.
 % We define \csname macarg.\endcsname to be \realbackslash, so
 % \\ in macro replacement text gets you a backslash.
-
+%
 {\catcode`@=0 @catcode`@\=@active
  @gdef@usembodybackslash{@let\=@mbodybackslash}
  @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
 }
 \expandafter\def\csname macarg.\endcsname{\realbackslash}
 
+\def\margbackslash#1{\char`\#1 }
+
 \def\macro{\recursivefalse\parsearg\macroxxx}
 \def\rmacro{\recursivetrue\parsearg\macroxxx}
 
 \def\macroxxx#1{%
-  \getargs{#1}%           now \macname is the macname and \argl the arglist
+  \getargs{#1}% now \macname is the macname and \argl the arglist
   \ifx\argl\empty       % no arguments
-     \paramno=0%
+     \paramno=0
   \else
      \expandafter\parsemargdef \argl;%
   \fi
@@ -6932,28 +7094,32 @@
 % an opening brace, and that opening brace is not consumed.
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
-\def\getmacname #1 #2\relax{\macname={#1}}
+\def\getmacname#1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
 
 % Parse the optional {params} list.  Set up \paramno and \paramlist
 % so \defmacro knows what to do.  Define \macarg.blah for each blah
-% in the params list, to be ##N where N is the position in that list.
+% in the params list to be ##N where N is the position in that list.
 % That gets used by \mbodybackslash (above).
-
+%
 % We need to get `macro parameter char #' into several definitions.
-% The technique used is stolen from LaTeX:  let \hash be something
+% The technique used is stolen from LaTeX: let \hash be something
 % unexpandable, insert that wherever you need a #, and then redefine
 % it to # just before using the token list produced.
 %
 % The same technique is used to protect \eatspaces till just before
 % the macro is used.
 
-\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-        \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
+\def\parsemargdef#1;{%
+  \paramno=0\def\paramlist{}%
+  \let\hash\relax
+  \let\xeatspaces\relax
+  \parsemargdefxxx#1,;,%
+}
 \def\parsemargdefxxx#1,{%
   \if#1;\let\next=\relax
   \else \let\next=\parsemargdefxxx
-    \advance\paramno by 1%
+    \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
         {\xeatspaces{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
@@ -6961,7 +7127,7 @@
 
 % These two commands read recursive and nonrecursive macro bodies.
 % (They're different since rec and nonrec macros end differently.)
-
+%
 \long\def\parsemacbody#1@end macro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
 \long\def\parsermacbody#1@end rmacro%
@@ -6972,6 +7138,7 @@
 % Much magic with \expandafter here.
 % \xdef is used so that macro definitions will survive the file
 % they're defined in; @include reads the file inside a group.
+%
 \def\defmacro{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifrecursive
@@ -7035,7 +7202,8 @@
 % \braceorline decides whether the next nonwhitespace character is a
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg)
+% as an argument (by \parsebrace or \parsearg).
+% 
 \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
@@ -7045,7 +7213,8 @@
 
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
-% sign.  Just make them active and then expand them all to nothing.
+% sign.  Make them active and then expand them all to nothing.
+%
 \def\alias{\parseargusing\obeyspaces\aliasxxx}
 \def\aliasxxx #1{\aliasyyy#1\relax}
 \def\aliasyyy #1=#2\relax{%
@@ -7303,7 +7472,8 @@
     \angleleft un\-de\-fined\angleright
     \iflinks
       \ifhavexrefs
-        \message{\linenumber Undefined cross reference `#1'.}%
+        {\toks0 = {#1}% avoid expansion of possibly-complex value
+         \message{\linenumber Undefined cross reference `\the\toks0'.}}%
       \else
         \ifwarnedxrefs\else
           \global\warnedxrefstrue
@@ -7633,7 +7803,7 @@
 % #2 is (optional) width, #3 is (optional) height.
 % #4 is (ignored optional) html alt text.
 % #5 is (ignored optional) extension.
-% #6 is just the usual extra ignored arg for parsing this stuff.
+% #6 is just the usual extra ignored arg for parsing stuff.
 \newif\ifimagevmode
 \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
   \catcode`\^^M = 5     % in case we're inside an example
@@ -7957,21 +8127,22 @@
     \closein 1
   \endgroup % end raw TeX
 \endgroup}
-}
 %
 % If they passed de_DE, and txi-de_DE.tex doesn't exist,
 % try txi-de.tex.
-% 
-\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
+%
+\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
   \openin 1 txi-#1.tex
   \ifeof 1
     \errhelp = \nolanghelp
     \errmessage{Cannot read language file txi-#1.tex}%
   \else
+    \globaldefs = 1  % everything in the txi-LL files needs to persist
     \input txi-#1.tex
   \fi
   \closein 1
 }
+}% end of special _ catcode
 %
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  Putting it in the current
@@ -7980,16 +8151,16 @@
 % This macro is called from txi-??.tex files; the first argument is the
 % \language name to set (without the "\lang@" prefix), the second and
 % third args are \{left,right}hyphenmin.
-% 
+%
 % The language names to pass are determined when the format is built.
 % See the etex.log file created at that time, e.g.,
 % /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
-% 
+%
 % With TeX Live 2008, etex now includes hyphenation patterns for all
 % available languages.  This means we can support hyphenation in
 % Texinfo, at least to some extent.  (This still doesn't solve the
 % accented characters problem.)
-% 
+%
 \catcode`@=11
 \def\txisetlanguage#1#2#3{%
   % do not set the language if the name is undefined in the current TeX.
@@ -8044,7 +8215,7 @@
      \setnonasciicharscatcode\active
      \lattwochardefs
   %
-  \else \ifx \declaredencoding \latone 
+  \else \ifx \declaredencoding \latone
      \setnonasciicharscatcode\active
      \latonechardefs
   %
@@ -8056,7 +8227,7 @@
      \setnonasciicharscatcode\active
      \utfeightchardefs
   %
-  \else 
+  \else
     \message{Unknown document encoding #1, ignoring.}%
   %
   \fi % utfeight
@@ -8068,7 +8239,7 @@
 
 % A message to be logged when using a character that isn't available
 % the default font encoding (OT1).
-% 
+%
 \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
 
 % Take account of \c (plain) vs. \, (Texinfo) difference.
@@ -8081,21 +8252,21 @@
 %
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
-  \gdef^^a0{~} 
+  \gdef^^a0{~}
   \gdef^^a1{\exclamdown}
-  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a2{\missingcharmsg{CENT SIGN}}
   \gdef^^a3{{\pounds}}
   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
   \gdef^^a5{\missingcharmsg{YEN SIGN}}
-  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}}
   \gdef^^a7{\S}
-  \gdef^^a8{\"{}} 
-  \gdef^^a9{\copyright} 
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\copyright}
   \gdef^^aa{\ordf}
   \gdef^^ab{\guillemetleft}
   \gdef^^ac{$\lnot$}
-  \gdef^^ad{\-} 
-  \gdef^^ae{\registeredsymbol} 
+  \gdef^^ad{\-}
+  \gdef^^ae{\registeredsymbol}
   \gdef^^af{\={}}
   %
   \gdef^^b0{\textdegree}
@@ -8122,7 +8293,7 @@
   \gdef^^c2{\^A}
   \gdef^^c3{\~A}
   \gdef^^c4{\"A}
-  \gdef^^c5{\ringaccent A} 
+  \gdef^^c5{\ringaccent A}
   \gdef^^c6{\AE}
   \gdef^^c7{\cedilla C}
   \gdef^^c8{\`E}
@@ -8134,7 +8305,7 @@
   \gdef^^ce{\^I}
   \gdef^^cf{\"I}
   %
-  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
+  \gdef^^d0{\DH}
   \gdef^^d1{\~N}
   \gdef^^d2{\`O}
   \gdef^^d3{\'O}
@@ -8148,7 +8319,7 @@
   \gdef^^db{\^U}
   \gdef^^dc{\"U}
   \gdef^^dd{\'Y}
-  \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
+  \gdef^^de{\TH}
   \gdef^^df{\ss}
   %
   \gdef^^e0{\`a}
@@ -8168,7 +8339,7 @@
   \gdef^^ee{\^{\dotless i}}
   \gdef^^ef{\"{\dotless i}}
   %
-  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
+  \gdef^^f0{\dh}
   \gdef^^f1{\~n}
   \gdef^^f2{\`o}
   \gdef^^f3{\'o}
@@ -8182,7 +8353,7 @@
   \gdef^^fb{\^u}
   \gdef^^fc{\"u}
   \gdef^^fd{\'y}
-  \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
+  \gdef^^fe{\th}
   \gdef^^ff{\"y}
 }
 
@@ -8254,7 +8425,7 @@
   \gdef^^ce{\^I}
   \gdef^^cf{\v D}
   %
-  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
+  \gdef^^d0{\DH}
   \gdef^^d1{\'N}
   \gdef^^d2{\v N}
   \gdef^^d3{\'O}
@@ -8263,7 +8434,7 @@
   \gdef^^d6{\"O}
   \gdef^^d7{$\times$}
   \gdef^^d8{\v R}
-  \gdef^^d9{\ringaccent U} 
+  \gdef^^d9{\ringaccent U}
   \gdef^^da{\'U}
   \gdef^^db{\H U}
   \gdef^^dc{\"U}
@@ -8284,11 +8455,11 @@
   \gdef^^ea{\ogonek{e}}
   \gdef^^eb{\"e}
   \gdef^^ec{\v e}
-  \gdef^^ed{\'\i}
-  \gdef^^ee{\^\i}
+  \gdef^^ed{\'{\dotless{i}}}
+  \gdef^^ee{\^{\dotless{i}}}
   \gdef^^ef{\v d}
   %
-  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
+  \gdef^^f0{\dh}
   \gdef^^f1{\'n}
   \gdef^^f2{\v n}
   \gdef^^f3{\'o}
@@ -8307,11 +8478,11 @@
 }
 
 % UTF-8 character definitions.
-% 
+%
 % This code to support UTF-8 is based on LaTeX's utf8.def, with some
 % changes for Texinfo conventions.  It is included here under the GPL by
 % permission from Frank Mittelbach and the LaTeX team.
-% 
+%
 \newcount\countUTFx
 \newcount\countUTFy
 \newcount\countUTFz
@@ -8461,6 +8632,7 @@
   \DeclareUnicodeCharacter{00CE}{\^I}
   \DeclareUnicodeCharacter{00CF}{\"I}
 
+  \DeclareUnicodeCharacter{00D0}{\DH}
   \DeclareUnicodeCharacter{00D1}{\~N}
   \DeclareUnicodeCharacter{00D2}{\`O}
   \DeclareUnicodeCharacter{00D3}{\'O}
@@ -8473,6 +8645,7 @@
   \DeclareUnicodeCharacter{00DB}{\^U}
   \DeclareUnicodeCharacter{00DC}{\"U}
   \DeclareUnicodeCharacter{00DD}{\'Y}
+  \DeclareUnicodeCharacter{00DE}{\TH}
   \DeclareUnicodeCharacter{00DF}{\ss}
 
   \DeclareUnicodeCharacter{00E0}{\`a}
@@ -8492,6 +8665,7 @@
   \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
   \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
 
+  \DeclareUnicodeCharacter{00F0}{\dh}
   \DeclareUnicodeCharacter{00F1}{\~n}
   \DeclareUnicodeCharacter{00F2}{\`o}
   \DeclareUnicodeCharacter{00F3}{\'o}
@@ -8504,6 +8678,7 @@
   \DeclareUnicodeCharacter{00FB}{\^u}
   \DeclareUnicodeCharacter{00FC}{\"u}
   \DeclareUnicodeCharacter{00FD}{\'y}
+  \DeclareUnicodeCharacter{00FE}{\th}
   \DeclareUnicodeCharacter{00FF}{\"y}
 
   \DeclareUnicodeCharacter{0100}{\=A}
@@ -8840,8 +9015,8 @@
 % Prevent underfull vbox error messages.
 \vbadness = 10000
 
-% Don't be so finicky about underfull hboxes, either.
-\hbadness = 2000
+% Don't be very finicky about underfull hboxes, either.
+\hbadness = 6666
 
 % Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
@@ -9160,7 +9335,7 @@
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
 % the literal character `\'.
-% 
+%
 @def@normalturnoffactive{%
   @let\=@normalbackslash
   @let"=@normaldoublequote
@@ -9216,7 +9391,7 @@
 @catcode`@`=@active
 @markupsetuplqdefault
 @markupsetuprqdefault
- 
+
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
 @c page-delimiter: "^\\\\message"
diff -ruN groff-1.20.1/doc/webpage.ms groff-1.21/doc/webpage.ms
--- groff-1.20.1/doc/webpage.ms	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/doc/webpage.ms	2010-12-31 08:33:09.000000000 +0100
@@ -292,6 +292,81 @@
 .
 .
 .SH
+NEWS VERSION 1.21
+.LP
+.SH 2
+troff
+
+.ULS
+.LI
+The new `lsm' request specifies a macro to be invoked when leading
+spaces in an input line are encountered (which are removed then).
+Number registers `lsn' and `lss' hold the number of removed leading
+spaces and the corresponding horizontal space, respectively.
+
+.LI
+There is a new warning category `file', enabled by default.
+The `mso' request emits warnings in this category when the requested
+macro file does not exist.
+
+.LI
+The new `class' request assigns a short name to a set of characters
+which can be referred to in the `cflags' request.
+This is especially useful to control line-breaking and hyphenation
+rules in CJK languages.
+
+.LI
+Three new values for the `cflags' request have been added, which are
+needed for proper CJK support.
+
+.in 2m
+128  prohibit before but allow break after character
+.br
+256  prohibit after but allow break before character
+.br
+512  allow break before and after character
+.in
+.ULE
+.
+.
+.SH 2
+tbl
+
+.ULS
+.LI
+A new global option `nowarn' suppresses warnings if tables are longer
+than the current line width.
+.ULE
+.
+.
+.SH 2
+afmtodit
+
+.ULS
+.LI
+New option `\-o' to specify the name of the output file.
+.ULE
+.
+.
+.SH 2
+macro packages
+
+.ULS
+.LI
+A new macro `%U' has been added to the mdoc package to indicate a URL
+reference within an .Rs/.Re environment.
+
+.LI
+Rudimentary support for the Japanese script has been added, most
+suitable for man page handling as output by grotty.
+The file `ja.tmac' contains the necessary setup to allow line breaks
+before and after CJK characters (with proper exceptions).
+Note, however, that no inter-character spacing is implemented yet \[en]
+this usually causes many warnings about bad line breaks.
+.ULE
+.
+.
+.SH
 NEWS VERSION 1.20.1
 .LP
 A packaging error made it necessary to publish this release.
@@ -1613,7 +1688,7 @@
 .ULS
 .LI
 Color support has been added to troff and pic (and to the device drivers
-grops, grodvi, grotty, and grohtml -- other preprocessors and drivers will
+grops, grodvi, grotty, and grohtml \[en] other preprocessors and drivers will
 follow).
 A new function `defcolor' defines colors; the escape sequence `\em' sets the
 drawing color, the escape sequence `\eM' specifies the background color for
@@ -1655,7 +1730,7 @@
 
 .LI
 The new escape \eF is the same as `.fam'; \eF[] switches back to previous
-family -- \eF[P] selects family `P'.
+family \[en] \eF[P] selects family `P'.
 
 .LI
 Two new glyph symbols are available: `eu' is the official Euro symbol;
diff -ruN groff-1.20.1/font/devps/AB groff-1.21/font/devps/AB
--- groff-1.20.1/font/devps/AB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/AB	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Demi
-#   Version 001.007
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:46:34 1991
-#   Comment UniqueID 34370
-#   Comment VMusage 24954 31846
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:42:33 1999
+#   Comment UniqueID 44726
+#   Comment VMusage 27573 34509
 
 name AB
 internalname AvantGarde-Demi
@@ -19,247 +19,428 @@
 ligatures fi fl 0
 
 kernpairs
+A T -73
+A V -127
+A W -96
+A Y -139
+A 'Y -139
+A :Y -139
+A v -50
+A w -50
 A y -50
-A w -65
-A v -70
-A u -20
-A ' -90
-A cq -90
-A Y -80
-A W -60
-A V -102
-A U -40
-A T -25
-A Q -50
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -45
-D W -25
-D V -50
-D A -50
-F . -129
-F e -20
-F , -162
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -15
-J . -15
-J a -20
-J A -30
-K y -20
-K u -15
-K o -45
-K e -40
-K O -30
-L y -23
-L ' -30
-L cq -30
-L rq -30
-L Y -80
-L W -55
-L V -85
-L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -45
-O T -15
-O A -60
-P . -200
-P o -20
-P e -20
-P , -220
-P a -20
+A 'y -50
+A :y -50
+'A T -73
+'A V -127
+'A W -96
+'A Y -139
+'A 'Y -139
+'A :Y -139
+'A v -50
+'A w -50
+'A y -50
+'A 'y -50
+'A :y -50
+^A T -73
+^A V -127
+^A W -96
+^A Y -139
+^A 'Y -139
+^A :Y -139
+^A v -50
+^A w -50
+^A y -50
+^A 'y -50
+^A :y -50
+:A T -73
+:A V -127
+:A W -96
+:A Y -139
+:A 'Y -139
+:A :Y -139
+:A v -50
+:A w -50
+:A y -50
+:A 'y -50
+:A :y -50
+`A T -73
+`A V -127
+`A W -96
+`A Y -139
+`A 'Y -139
+`A :Y -139
+`A v -50
+`A w -50
+`A y -50
+`A 'y -50
+`A :y -50
+oA T -73
+oA V -127
+oA W -96
+oA Y -139
+oA 'Y -139
+oA :Y -139
+oA v -50
+oA w -50
+oA y -50
+oA 'y -50
+oA :y -50
+~A T -73
+~A V -127
+~A W -96
+~A Y -139
+~A 'Y -139
+~A :Y -139
+~A v -50
+~A w -50
+~A y -50
+~A 'y -50
+~A :y -50
+F A -95
+F 'A -95
+F ^A -95
+F :A -95
+F `A -95
+F oA -95
+F ~A -95
+F , -42
+F . -42
+L T -50
+L V -90
+L W -90
+L Y -90
+L 'Y -90
+L :Y -90
+L y -75
+L 'y -75
+L :y -75
+/L T -50
+/L V -90
+/L W -90
+/L Y -90
+/L 'Y -90
+/L :Y -90
+/L y -75
+/L 'y -75
+/L :y -75
 P A -100
-Q , 20
-R W 25
-R V -10
-R U 25
-R T 40
-R O 25
-S , 20
-T y -10
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -49
-T - -75
-T hy -75
-T e -49
-T , -82
-T : -15
-T a -70
-T O -15
-T A -25
-U . -20
-U , -20
-U A -40
-V u -55
-V ; -33
-V . -145
-V o -101
-V i -15
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
-V a -95
-V O -45
-V G -20
-V A -102
-W y -15
-W u -30
-W ; -33
-W . -106
-W o -46
-W i -10
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+P 'A -100
+P ^A -100
+P :A -100
+P `A -100
+P oA -100
+P ~A -100
+P , -16
+P . -16
+R T 16
+R V -26
+R W -20
+R Y -20
+R 'Y -20
+R :Y -20
+R y 31
+R 'y 31
+R :y 31
+T A -70
+T 'A -70
+T ^A -70
+T :A -70
+T `A -70
+T oA -70
+T ~A -70
+T a -40
+T 'a -40
+T ^a -40
+T :a -40
+T `a -40
+T oa -40
+T ~a -40
+T c -50
+T ,c -50
+T : -12
+T , 4
+T e -50
+T 'e -50
+T ^e -50
+T :e -50
+T `e -50
+T - -10
+T hy -10
+T i -5
+T 'i 10
+T ^i 10
+T :i 10
+T `i 10
+T o -50
+T 'o -50
+T ^o -50
+T :o -50
+T `o -50
+T /o -50
+T ~o -50
+T . 4
+T r -42
+T s -43
+T ; -12
+T u -56
+T 'u -56
+T ^u -56
+T :u -56
+T `u -56
+T w -15
+T y -12
+T 'y -12
+T :y -12
+V A -125
+V 'A -125
+V ^A -125
+V :A -125
+V `A -125
+V oA -125
+V ~A -125
+V a -80
+V 'a -80
+V ^a -80
+V :a -80
+V `a -80
+V oa -80
+V ~a -80
+V : -13
+V , -13
+V e -80
+V 'e -80
+V ^e -80
+V :e -80
+V `e -80
+V - -20
+V hy -20
+V i -9
+V 'i -9
+V o -80
+V 'o -80
+V ^o -80
+V :o -80
+V `o -80
+V /o -80
+V ~o -80
+V . -13
+V r -40
+V ; -13
+V u -68
+V 'u -68
+V ^u -68
+V :u -68
+V `u -68
+V y -15
+V 'y -15
+V :y -15
+W A -94
+W 'A -94
+W ^A -94
+W :A -94
+W `A -94
+W oA -94
+W ~A -94
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -145
-Y o -89
-Y - -100
-Y hy -100
-Y e -89
-Y , -145
-Y : -10
-Y a -93
-Y O -30
-Y A -80
-a t 5
-a p 20
-a b 5
-b y -20
-b v -20
-c y -20
-c l -15
-c k -15
-, u0020 -50
-, ' -70
-, cq -70
-, rq -70
-e y -20
-e x -20
-e w -20
-e v -20
-f . -40
-f o -20
-f l -15
-f i -15
-f f -20
-f .i -15
-f , -40
-f a -15
-g i 25
-g a 15
-h y -30
-k y -5
-k o -30
-k e -40
-m y -20
-m u -20
-n y -15
-n v -30
-o y -20
-o x -30
-o w -20
-o v -30
-p y -20
-. u0020 -50
-. ' -70
-. cq -70
-. rq -70
-lq A -50
-rq u0020 -50
-` ` -80
-` oq -80
-oq ` -80
-oq oq -80
-` A -50
-oq A -50
-' v -10
-cq v -10
-' t 10
-cq t 10
-' u0020 -50
-cq u0020 -50
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -80
-' cq -80
-cq ' -80
-cq cq -80
-' d -50
-cq d -50
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -15
-r n 21
-r m 15
-r l 20
-r k 5
-r i 20
-r - -60
-r hy -60
-r g 1
-r e -4
-r d -6
-r , -75
-r c -7
-s . 20
-s , 20
-u0020 ` -50
-u0020 oq -50
-u0020 lq -50
-u0020 Y -60
-u0020 W -25
-u0020 V -80
-u0020 T -25
-u0020 A -20
-v . -90
-v o -20
-v e -20
-v , -90
-v a -30
-w . -90
-w o -30
-w e -20
-w , -90
-w a -30
-x e -20
-y . -100
-y o -30
-y e -20
-y , -100
-y c -35
-y a -30
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -12
+W , -12
+W e -50
+W 'e -50
+W ^e -50
+W :e -50
+W `e -50
+W - -10
+W hy -10
+W i -7
+W 'i 10
+W ^i 10
+W :i 10
+W `i 10
+W o -50
+W 'o -50
+W ^o -50
+W :o -50
+W `o -50
+W /o -50
+W ~o -50
+W . -12
+W r -39
+W ; -12
+W u -40
+W 'u -40
+W ^u -40
+W :u -40
+W `u -40
+W y 1
+W 'y 1
+W :y 1
+Y A -138
+Y 'A -138
+Y ^A -138
+Y :A -138
+Y `A -138
+Y oA -138
+Y ~A -138
+Y a -100
+Y 'a -100
+Y ^a -100
+Y :a -100
+Y `a -100
+Y oa -100
+Y ~a -100
+Y : -8
+Y , -8
+Y e -100
+Y 'e -100
+Y ^e -100
+Y :e -100
+Y `e -100
+Y - -60
+Y hy -60
+Y i -5
+Y 'i -5
+Y ^i 10
+Y :i 10
+Y `i 10
+Y o -100
+Y 'o -100
+Y ^o -100
+Y :o -100
+Y `o -100
+Y /o -100
+Y ~o -100
+Y p -60
+Y . -8
+Y q -100
+Y ; -8
+Y u -82
+Y 'u -82
+Y ^u -82
+Y :u -82
+Y `u -82
+Y v -25
+'Y A -138
+'Y 'A -138
+'Y ^A -138
+'Y :A -138
+'Y `A -138
+'Y oA -138
+'Y ~A -138
+'Y a -100
+'Y 'a -100
+'Y ^a -100
+'Y :a -100
+'Y `a -100
+'Y oa -100
+'Y ~a -100
+'Y : -8
+'Y , -8
+'Y e -100
+'Y 'e -100
+'Y ^e -100
+'Y :e -100
+'Y `e -100
+'Y - -60
+'Y hy -60
+'Y i -5
+'Y 'i -5
+'Y ^i 10
+'Y :i 10
+'Y `i 10
+'Y o -100
+'Y 'o -100
+'Y ^o -100
+'Y :o -100
+'Y `o -100
+'Y /o -100
+'Y ~o -100
+'Y p -60
+'Y . -8
+'Y q -100
+'Y ; -8
+'Y u -82
+'Y 'u -82
+'Y ^u -82
+'Y :u -82
+'Y `u -82
+'Y v -25
+:Y A -138
+:Y 'A -138
+:Y ^A -138
+:Y :A -138
+:Y `A -138
+:Y oA -138
+:Y ~A -138
+:Y a -100
+:Y 'a -100
+:Y ^a -100
+:Y :a -100
+:Y `a -100
+:Y oa -100
+:Y ~a -100
+:Y : -8
+:Y , -8
+:Y e -100
+:Y 'e -100
+:Y ^e -100
+:Y :e -100
+:Y `e -100
+:Y - -60
+:Y hy -60
+:Y i -5
+:Y 'i -5
+:Y ^i 10
+:Y :i 10
+:Y `i 10
+:Y o -100
+:Y 'o -100
+:Y ^o -100
+:Y :o -100
+:Y `o -100
+:Y /o -100
+:Y ~o -100
+:Y p -60
+:Y . -8
+:Y q -100
+:Y ; -8
+:Y u -82
+:Y 'u -82
+:Y ^u -82
+:Y :u -82
+:Y `u -82
+:Y v -25
+f f 38
+r c -27
+r ,c -27
+r , 9
+r d -8
+r e -8
+r 'e -8
+r ^e -8
+r :e -8
+r `e -8
+r f 38
+r g -8
+r - -10
+r hy -10
+r m 5
+r n 5
+r ~n 5
+r o -18
+r 'o -18
+r ^o -18
+r :o -18
+r `o -18
+r /o -18
+r ~o -18
+r . 9
+r q -18
 
 charset
 ha	600,740	2	0	asciicircum
@@ -271,6 +452,7 @@
 :Y	620,939,0,2,2	2	6	Ydieresis
 tm	1000,740	2	7	trademark
 aq	220,740	2	8	quotesingle
+Eu	560,755,15,1	2	9	Euro
 space	280	0	32	space
 !	280,740	2	33	exclam
 "	360,740	2	34	quotedbl
@@ -343,8 +525,8 @@
 rs	"
 ]	320,754,157	2	93	bracketright
 rB	"
-a^	540,774	2	94	circumflex
-^	"
+^	540,774	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	280,740	2	96	quoteleft
 oq	"
@@ -352,7 +534,7 @@
 b	660,740,18	2	98	b
 c	640,574,18	0	99	c
 d	660,740,18	2	100	d
-e	640,577,18	0	101	e
+e	640,574,18	0	101	e
 f	280,755	2	102	f
 g	660,574,226	1	103	g
 h	600,740	2	104	h
@@ -374,14 +556,14 @@
 x	560,555	0	120	x
 y	580,555,185	1	121	y
 z	460,555	0	122	z
-lC	340,747,191,0,3	3	123	braceleft
-{	"
-ba	600,740,100	2	124	bar
-|	"
-rC	340,747,191,3	3	125	braceright
-}	"
-a~	480,767	2	126	tilde
-~	"
+{	340,747,191,0,3	3	123	braceleft
+lC	"
+|	600,750,250	3	124	bar
+ba	"
+}	340,747,191,3	3	125	braceright
+rC	"
+~	480,767	2	126	tilde
+a~	"
 bq	280,133,141	0	128	quotesinglbase
 Fo	460,469	0	129	guillemotleft
 Fc	460,469	0	130	guillemotright
@@ -397,7 +579,7 @@
 fl	520,755	2	141	fl
 .i	240,555	0	144	dotlessi
 ga	420,851	2	146	grave
-a"	700,862	2	147	hungarumlaut
+a"	700,849	2	147	hungarumlaut
 a.	280,769	2	148	dotaccent
 ab	480,770	2	149	breve
 ah	540,774	2	150	caron
@@ -415,7 +597,7 @@
 Po	560,755,0,2,2	2	163	sterling
 Cs	560,577	0	164	currency
 Ye	560,740,0,10,10	2	165	yen
-bb	600,740,100	2	166	brokenbar
+bb	600,675,175	0	166	brokenbar
 sc	560,755,158	2	167	section
 ad	500,769	2	168	dieresis
 co	740,752,12,12,12	2	169	copyright
@@ -429,8 +611,9 @@
 t+-	600,556,62	0	177	plusminus
 S2	336,749	2	178	twosuperior
 S3	336,749	2	179	threesuperior
-aa	420,849	2	180	acute
-mc	576,555,187	1	181	mu
+aa	420,851	2	180	acute
+*m	600,555,192	1	181	mu
+mc	"
 ps	600,740,103,7,7	2	182	paragraph
 pc	280,320	0	183	periodcentered
 ac	340,6,251	1	184	cedilla
@@ -442,7 +625,7 @@
 34	840,749	2	190	threequarters
 r?	560,555,200	1	191	questiondown
 `A	740,1021	2	192	Agrave
-'A	740,1019	2	193	Aacute
+'A	740,1021	2	193	Aacute
 ^A	740,944	2	194	Acircumflex
 ~A	740,937	2	195	Atilde
 :A	740,939	2	196	Adieresis
@@ -450,31 +633,31 @@
 AE	900,740,0,0,5	2	198	AE
 ,C	780,755,251	3	199	Ccedilla
 `E	520,1021	2	200	Egrave
-'E	520,1019	2	201	Eacute
+'E	520,1021	2	201	Eacute
 ^E	520,944	2	202	Ecircumflex
 :E	520,939	2	203	Edieresis
 `I	280,1021,0,0,45	2	204	Igrave
-'I	280,1019,0,45	2	205	Iacute
+'I	280,1021,0,43	2	205	Iacute
 ^I	280,944,0,60,59	2	206	Icircumflex
 :I	280,939,0,32,32	2	207	Idieresis
 -D	742,740	2	208	Eth
 ~N	740,937	2	209	Ntilde
 `O	840,1021,15	2	210	Ograve
-'O	840,1019,15	2	211	Oacute
+'O	840,1021,15	2	211	Oacute
 ^O	840,944,15	2	212	Ocircumflex
 ~O	840,937,15	2	213	Otilde
 :O	840,939,15	2	214	Odieresis
 tmu	600,494	0	215	multiply
 /O	840,814,71	2	216	Oslash
 `U	640,1021,15	2	217	Ugrave
-'U	640,1019,15	2	218	Uacute
+'U	640,1021,15	2	218	Uacute
 ^U	640,944,15	2	219	Ucircumflex
 :U	640,939,15	2	220	Udieresis
-'Y	620,1019,0,2,2	2	221	Yacute
+'Y	620,1021,0,2,2	2	221	Yacute
 TP	560,740	2	222	Thorn
 ss	600,755,18	2	223	germandbls
 `a	660,851,18	2	224	agrave
-'a	660,849,18	2	225	aacute
+'a	660,851,18	2	225	aacute
 ^a	660,774,18	2	226	acircumflex
 ~a	660,767,18	2	227	atilde
 :a	660,769,18	2	228	adieresis
@@ -482,27 +665,27 @@
 ae	1080,574,18	0	230	ae
 ,c	640,574,251	1	231	ccedilla
 `e	640,851,18	2	232	egrave
-'e	640,849,18	2	233	eacute
+'e	640,851,18	2	233	eacute
 ^e	640,774,18	2	234	ecircumflex
 :e	640,769,18	2	235	edieresis
 `i	240,851,0,0,65	2	236	igrave
-'i	240,849,0,65	2	237	iacute
+'i	240,851,0,63	2	237	iacute
 ^i	240,774,0,80,79	2	238	icircumflex
 :i	240,769,0,52,52	2	239	idieresis
 Sd	640,754,18	2	240	eth
 ~n	600,767	2	241	ntilde
 `o	640,851,18	2	242	ograve
-'o	640,849,18	2	243	oacute
+'o	640,851,18	2	243	oacute
 ^o	640,774,18	2	244	ocircumflex
 ~o	640,767,18	2	245	otilde
 :o	640,769,18	2	246	odieresis
 tdi	600,526,20	0	247	divide
 /o	660,608,50	0	248	oslash
 `u	600,851,18	2	249	ugrave
-'u	600,849,18	2	250	uacute
+'u	600,851,18	2	250	uacute
 ^u	600,774,18	2	251	ucircumflex
 :u	600,769,18	2	252	udieresis
-'y	580,849,185	3	253	yacute
+'y	580,851,185	3	253	yacute
 Tp	660,740,185	3	254	thorn
 :y	580,769,185	3	255	ydieresis
 u2026	1000,133	0	256	ellipsis
diff -ruN groff-1.20.1/font/devps/ABI groff-1.21/font/devps/ABI
--- groff-1.20.1/font/devps/ABI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/ABI	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Demi Oblique
-#   Version 001.007
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:49:44 1991
-#   Comment UniqueID 34373
-#   Comment VMusage 6550 39938
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:43:21 1999
+#   Comment UniqueID 44727
+#   Comment VMusage 9292 47373
 
 name ABI
 internalname AvantGarde-DemiOblique
@@ -20,490 +20,673 @@
 ligatures fi fl 0
 
 kernpairs
+A T -73
+A V -127
+A W -96
+A Y -139
+A 'Y -139
+A :Y -139
+A v -50
+A w -50
 A y -50
-A w -65
-A v -70
-A u -20
-A ' -90
-A cq -90
-A Y -80
-A W -60
-A V -102
-A U -40
-A T -25
-A Q -50
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -45
-D W -25
-D V -50
-D A -50
-F . -129
-F e -20
-F , -162
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -15
-J . -15
-J a -20
-J A -30
-K y -20
-K u -15
-K o -45
-K e -40
-K O -30
-L y -23
-L ' -30
-L cq -30
-L rq -30
-L Y -80
-L W -55
-L V -85
-L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -45
-O T -15
-O A -60
-P . -200
-P o -20
-P e -20
-P , -220
-P a -20
+A 'y -50
+A :y -50
+'A T -73
+'A V -127
+'A W -96
+'A Y -139
+'A 'Y -139
+'A :Y -139
+'A v -50
+'A w -50
+'A y -50
+'A 'y -50
+'A :y -50
+^A T -73
+^A V -127
+^A W -96
+^A Y -139
+^A 'Y -139
+^A :Y -139
+^A v -50
+^A w -50
+^A y -50
+^A 'y -50
+^A :y -50
+:A T -73
+:A V -127
+:A W -96
+:A Y -139
+:A 'Y -139
+:A :Y -139
+:A v -50
+:A w -50
+:A y -50
+:A 'y -50
+:A :y -50
+`A T -73
+`A V -127
+`A W -96
+`A Y -139
+`A 'Y -139
+`A :Y -139
+`A v -50
+`A w -50
+`A y -50
+`A 'y -50
+`A :y -50
+oA T -73
+oA V -127
+oA W -96
+oA Y -139
+oA 'Y -139
+oA :Y -139
+oA v -50
+oA w -50
+oA y -50
+oA 'y -50
+oA :y -50
+~A T -73
+~A V -127
+~A W -96
+~A Y -139
+~A 'Y -139
+~A :Y -139
+~A v -50
+~A w -50
+~A y -50
+~A 'y -50
+~A :y -50
+F A -95
+F 'A -95
+F ^A -95
+F :A -95
+F `A -95
+F oA -95
+F ~A -95
+F , -42
+F . -42
+L T -50
+L V -90
+L W -90
+L Y -90
+L 'Y -90
+L :Y -90
+L y -75
+L 'y -75
+L :y -75
+/L T -50
+/L V -90
+/L W -90
+/L Y -90
+/L 'Y -90
+/L :Y -90
+/L y -75
+/L 'y -75
+/L :y -75
 P A -100
-Q , 20
-R W 25
-R V -10
-R U 25
-R T 40
-R O 25
-S , 20
-T y -10
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -49
-T - -75
-T hy -75
-T e -49
-T , -82
-T : -15
-T a -70
-T O -15
-T A -25
-U . -20
-U , -20
-U A -40
-V u -55
-V ; -33
-V . -145
-V o -101
-V i -15
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
-V a -95
-V O -45
-V G -20
-V A -102
-W y -15
-W u -30
-W ; -33
-W . -106
-W o -46
-W i -10
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+P 'A -100
+P ^A -100
+P :A -100
+P `A -100
+P oA -100
+P ~A -100
+P , -16
+P . -16
+R T 16
+R V -26
+R W -20
+R Y -20
+R 'Y -20
+R :Y -20
+R y 31
+R 'y 31
+R :y 31
+T A -70
+T 'A -70
+T ^A -70
+T :A -70
+T `A -70
+T oA -70
+T ~A -70
+T a -40
+T 'a -40
+T ^a -40
+T :a -40
+T `a -40
+T oa -40
+T ~a -40
+T c -50
+T ,c -50
+T : -12
+T , 4
+T e -50
+T 'e -50
+T ^e -50
+T :e -50
+T `e -50
+T - -10
+T hy -10
+T i -5
+T 'i 10
+T ^i 10
+T :i 10
+T `i 10
+T o -50
+T 'o -50
+T ^o -50
+T :o -50
+T `o -50
+T /o -50
+T ~o -50
+T . 4
+T r -42
+T s -43
+T ; -12
+T u -56
+T 'u -56
+T ^u -56
+T :u -56
+T `u -56
+T w -15
+T y -12
+T 'y -12
+T :y -12
+V A -125
+V 'A -125
+V ^A -125
+V :A -125
+V `A -125
+V oA -125
+V ~A -125
+V a -80
+V 'a -80
+V ^a -80
+V :a -80
+V `a -80
+V oa -80
+V ~a -80
+V : -13
+V , -13
+V e -80
+V 'e -80
+V ^e -80
+V :e -80
+V `e -80
+V - -20
+V hy -20
+V i -9
+V 'i -9
+V o -80
+V 'o -80
+V ^o -80
+V :o -80
+V `o -80
+V /o -80
+V ~o -80
+V . -13
+V r -40
+V ; -13
+V u -68
+V 'u -68
+V ^u -68
+V :u -68
+V `u -68
+V y -15
+V 'y -15
+V :y -15
+W A -94
+W 'A -94
+W ^A -94
+W :A -94
+W `A -94
+W oA -94
+W ~A -94
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -145
-Y o -89
-Y - -100
-Y hy -100
-Y e -89
-Y , -145
-Y : -10
-Y a -93
-Y O -30
-Y A -80
-a t 5
-a p 20
-a b 5
-b y -20
-b v -20
-c y -20
-c l -15
-c k -15
-, u0020 -50
-, ' -70
-, cq -70
-, rq -70
-e y -20
-e x -20
-e w -20
-e v -20
-f . -40
-f o -20
-f l -15
-f i -15
-f f -20
-f .i -15
-f , -40
-f a -15
-g i 25
-g a 15
-h y -30
-k y -5
-k o -30
-k e -40
-m y -20
-m u -20
-n y -15
-n v -30
-o y -20
-o x -30
-o w -20
-o v -30
-p y -20
-. u0020 -50
-. ' -70
-. cq -70
-. rq -70
-lq A -50
-rq u0020 -50
-` ` -80
-` oq -80
-oq ` -80
-oq oq -80
-` A -50
-oq A -50
-' v -10
-cq v -10
-' t 10
-cq t 10
-' u0020 -50
-cq u0020 -50
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -80
-' cq -80
-cq ' -80
-cq cq -80
-' d -50
-cq d -50
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -15
-r n 21
-r m 15
-r l 20
-r k 5
-r i 20
-r - -60
-r hy -60
-r g 1
-r e -4
-r d -6
-r , -75
-r c -7
-s . 20
-s , 20
-u0020 ` -50
-u0020 oq -50
-u0020 lq -50
-u0020 Y -60
-u0020 W -25
-u0020 V -80
-u0020 T -25
-u0020 A -20
-v . -90
-v o -20
-v e -20
-v , -90
-v a -30
-w . -90
-w o -30
-w e -20
-w , -90
-w a -30
-x e -20
-y . -100
-y o -30
-y e -20
-y , -100
-y c -35
-y a -30
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -12
+W , -12
+W e -50
+W 'e -50
+W ^e -50
+W :e -50
+W `e -50
+W - -10
+W hy -10
+W i -7
+W 'i 10
+W ^i 10
+W :i 10
+W `i 10
+W o -50
+W 'o -50
+W ^o -50
+W :o -50
+W `o -50
+W /o -50
+W ~o -50
+W . -12
+W r -39
+W ; -12
+W u -40
+W 'u -40
+W ^u -40
+W :u -40
+W `u -40
+W y 1
+W 'y 1
+W :y 1
+Y A -138
+Y 'A -138
+Y ^A -138
+Y :A -138
+Y `A -138
+Y oA -138
+Y ~A -138
+Y a -100
+Y 'a -100
+Y ^a -100
+Y :a -100
+Y `a -100
+Y oa -100
+Y ~a -100
+Y : -8
+Y , -8
+Y e -100
+Y 'e -100
+Y ^e -100
+Y :e -100
+Y `e -100
+Y - -60
+Y hy -60
+Y i -5
+Y 'i -5
+Y ^i 10
+Y :i 10
+Y `i 10
+Y o -100
+Y 'o -100
+Y ^o -100
+Y :o -100
+Y `o -100
+Y /o -100
+Y ~o -100
+Y p -60
+Y . -8
+Y q -100
+Y ; -8
+Y u -82
+Y 'u -82
+Y ^u -82
+Y :u -82
+Y `u -82
+Y v -25
+'Y A -138
+'Y 'A -138
+'Y ^A -138
+'Y :A -138
+'Y `A -138
+'Y oA -138
+'Y ~A -138
+'Y a -100
+'Y 'a -100
+'Y ^a -100
+'Y :a -100
+'Y `a -100
+'Y oa -100
+'Y ~a -100
+'Y : -8
+'Y , -8
+'Y e -100
+'Y 'e -100
+'Y ^e -100
+'Y :e -100
+'Y `e -100
+'Y - -60
+'Y hy -60
+'Y i -5
+'Y 'i -5
+'Y ^i 10
+'Y :i 10
+'Y `i 10
+'Y o -100
+'Y 'o -100
+'Y ^o -100
+'Y :o -100
+'Y `o -100
+'Y /o -100
+'Y ~o -100
+'Y p -60
+'Y . -8
+'Y q -100
+'Y ; -8
+'Y u -82
+'Y 'u -82
+'Y ^u -82
+'Y :u -82
+'Y `u -82
+'Y v -25
+:Y A -138
+:Y 'A -138
+:Y ^A -138
+:Y :A -138
+:Y `A -138
+:Y oA -138
+:Y ~A -138
+:Y a -100
+:Y 'a -100
+:Y ^a -100
+:Y :a -100
+:Y `a -100
+:Y oa -100
+:Y ~a -100
+:Y : -8
+:Y , -8
+:Y e -100
+:Y 'e -100
+:Y ^e -100
+:Y :e -100
+:Y `e -100
+:Y - -60
+:Y hy -60
+:Y i -5
+:Y 'i -5
+:Y ^i 10
+:Y :i 10
+:Y `i 10
+:Y o -100
+:Y 'o -100
+:Y ^o -100
+:Y :o -100
+:Y `o -100
+:Y /o -100
+:Y ~o -100
+:Y p -60
+:Y . -8
+:Y q -100
+:Y ; -8
+:Y u -82
+:Y 'u -82
+:Y ^u -82
+:Y :u -82
+:Y `u -82
+:Y v -25
+f f 38
+r c -27
+r ,c -27
+r , 9
+r d -8
+r e -8
+r 'e -8
+r ^e -8
+r :e -8
+r `e -8
+r f 38
+r g -8
+r - -10
+r hy -10
+r m 5
+r n 5
+r ~n 5
+r o -18
+r 'o -18
+r ^o -18
+r :o -18
+r `o -18
+r /o -18
+r ~o -18
+r . 9
+r q -18
 
 charset
-ha	600,740,0,46,-92,46	2	0	asciicircum
-ti	600,347,0,29,-64,29	0	1	asciitilde
-vS	520,944,15,165,1,82	2	2	Scaron
+ha	600,740,0,47,-92,47	2	0	asciicircum
+ti	600,347,0,30,-64,30	0	1	asciitilde
+vS	520,944,15,165,2,82	2	2	Scaron
 vZ	500,944,0,200,31,82	2	3	Zcaron
-vs	440,774,18,173,1,82	2	4	scaron
-vz	460,774,0,188,30,82	2	5	zcaron
-:Y	620,939,0,189,-85,82	2	6	Ydieresis
-tm	1000,740,0,8,-81,8	2	7	trademark
-aq	220,740,0,144,-102,82	2	8	quotesingle
+vs	440,774,18,174,1,82	2	4	scaron
+vz	460,774,0,169,30,82	2	5	zcaron
+:Y	620,939,0,190,-85,82	2	6	Ydieresis
+tm	1000,740,0,9,-80,9	2	7	trademark
+aq	220,740,0,145,-102,82	2	8	quotesingle
+Eu	560,755,15,172,3,82	2	9	Euro
 space	280	0	32	space
-!	280,740,0,113,-23,82	2	33	exclam
-"	360,740,0,168,-77,82	2	34	quotedbl
+!	280,740,0,114,-23,82	2	33	exclam
+"	360,740,0,169,-77,82	2	34	quotedbl
 dq	"
-#	560,700,0,108,-16,82	0	35	numbersign
+#	560,700,0,109,-15,82	0	35	numbersign
 sh	"
 $	560,857,86,72,-49,72	2	36	dollar
 Do	"
 %	860,755,15,46,-89,46	2	37	percent
-&	680,755,15,112,-21,82	2	38	ampersand
-'	280,740,0,112,-109,82	2	39	quoteright
+&	680,755,15,112,-20,82	2	38	ampersand
+'	280,740,0,113,-109,82	2	39	quoteright
 cq	"
-(	380,754,157,160,-70,82	2	40	parenleft
-)	380,754,157,48,42,48	2	41	parenright
-*	440,755,0,102,-124,82	2	42	asterisk
-+	600,506,0,60,-34,60	0	43	plus
-,	280,133,141,1,2,1	0	44	comma
--	420,348,0,43,-64,43	0	45	hyphen
+(	380,754,157,160,-69,82	2	40	parenleft
+)	380,754,157,48,43,48	2	41	parenright
+*	440,755,0,103,-123,82	2	42	asterisk
++	600,506,0,61,-33,61	0	43	plus
+,	280,133,141,1,3,1	0	44	comma
+-	420,348,0,44,-63,44	0	45	hyphen
 hy	"
 .	280,133,0,1,-23,1	0	46	period
-/	460,740,100,181,63,82	2	47	slash
+/	460,740,100,182,63,82	2	47	slash
 sl	"
-0	560,755,15,118,-20,82	2	48	zero
+0	560,755,15,118,-19,82	2	48	zero
 1	560,740,0,0,-180	2	49	one
 2	560,755,0,112,6,82	2	50	two
-3	560,755,15,75,-17,75	2	51	three
-4	560,740,0,94,14,82	2	52	four
-5	560,740,15,90,-14,82	2	53	five
-6	560,739,15,77,-14,77	2	54	six
-7	560,740,0,125,-33,82	2	55	seven
-8	560,755,15,80,-21,80	2	56	eight
-9	560,754,0,123,-60,82	2	57	nine
+3	560,755,15,76,-17,76	2	51	three
+4	560,740,0,95,15,82	2	52	four
+5	560,740,15,91,-13,82	2	53	five
+6	560,739,15,78,-14,78	2	54	six
+7	560,740,0,126,-33,82	2	55	seven
+8	560,755,15,80,-20,80	2	56	eight
+9	560,754,0,123,-59,82	2	57	nine
 :	280,555,0,79,-23,79	0	58	colon
-;	280,555,141,79,2,79	0	59	semicolon
-<	600,514,8,99,-34,82	0	60	less
+;	280,555,141,79,3,79	0	59	semicolon
+<	600,514,8,100,-34,82	0	60	less
 =	600,425,0,81,-13,81	0	61	equal
->	600,514,8,60,5,60	0	62	greater
-?	560,755,0,83,-85,82	2	63	question
-@	740,712,12,142,-59,82	0	64	at
+>	600,514,8,60,6,60	0	62	greater
+?	560,755,0,84,-85,82	2	63	question
+@	740,712,12,142,-58,82	0	64	at
 at	"
 A	740,740,0,42,43,42	2	65	A
-B	580,740,0,80,-20,80	2	66	B
-C	780,755,15,134,-47,82	2	67	C
+B	580,740,0,81,-20,81	2	66	B
+C	780,755,15,135,-46,82	2	67	C
 D	700,740,0,82,-13,82	2	68	D
-E	520,740,0,126,-11,82	2	69	E
-F	480,740,0,145,-11,82	2	70	F
+E	520,740,0,127,-11,82	2	69	E
+F	480,740,0,146,-11,82	2	70	F
 G	840,755,15,97,-39,82	2	71	G
-H	680,740,0,117,-21,82	2	72	H
-I	280,740,0,116,-22,82	2	73	I
-J	480,740,15,116,16,82	2	74	J
-K	620,740,0,187,-39,82	2	75	K
+H	680,740,0,118,-21,82	2	72	H
+I	280,740,0,117,-22,82	2	73	I
+J	480,740,15,117,16,82	2	74	J
+K	620,740,0,188,-39,82	2	75	K
 L	440,740,0,69,-22,69	2	76	L
-M	900,740,0,124,-13,82	2	77	M
-N	740,740,0,118,-20,82	2	78	N
-O	840,755,15,92,-45,82	2	79	O
+M	900,740,0,125,-13,82	2	77	M
+N	740,740,0,119,-20,82	2	78	N
+O	840,755,15,92,-44,82	2	79	O
 P	560,740,0,135,-22,82	2	80	P
-Q	840,755,15,92,-44,82	2	81	Q
-R	580,740,0,126,-14,82	2	82	R
-S	520,755,15,108,1,82	2	83	S
-T	420,740,0,185,-69,82	2	84	T
-U	640,740,15,132,-47,82	2	85	U
-V	700,740,0,182,-95,82	2	86	V
-W	900,740,0,186,-94,82	2	87	W
-X	680,740,0,183,46,82	2	88	X
-Y	620,740,0,189,-85,82	2	89	Y
-Z	500,740,0,149,31,82	2	90	Z
-[	320,754,157,154,-39,82	2	91	bracketleft
+Q	840,755,15,92,-43,82	2	81	Q
+R	580,740,0,127,-14,82	2	82	R
+S	520,755,15,109,2,82	2	83	S
+T	420,740,0,186,-69,82	2	84	T
+U	640,740,15,133,-46,82	2	85	U
+V	700,740,0,183,-95,82	2	86	V
+W	900,740,0,187,-94,82	2	87	W
+X	680,740,0,184,46,82	2	88	X
+Y	620,740,0,190,-85,82	2	89	Y
+Z	500,740,0,150,31,82	2	90	Z
+[	320,754,157,154,-38,82	2	91	bracketleft
 lB	"
 \	640,740,100,0,-183	2	92	backslash
 rs	"
-]	320,754,157,72,43,72	2	93	bracketright
+]	320,754,157,72,44,72	2	93	bracketright
 rB	"
-a^	540,774,0,98,-139,82	2	94	circumflex
-^	"
-_	500,0,125,36,73,36	0	95	underscore
-`	280,740,0,111,-108,82	2	96	quoteleft
+^	540,774,0,98,-138,82	2	94	circumflex
+a^	"
+_	500,0,125,37,74,37	0	95	underscore
+`	280,740,0,112,-108,82	2	96	quoteleft
 oq	"
-a	660,574,18,106,-23,82	0	97	a
+a	660,574,18,106,-22,82	0	97	a
 b	660,740,18,79,3,79	2	98	b
-c	640,574,18,89,-34,82	0	99	c
-d	660,740,18,145,-30,82	2	100	d
-e	640,577,18,77,-27,77	0	101	e
+c	640,574,18,89,-33,82	0	99	c
+d	660,740,18,146,-29,82	2	100	d
+e	640,574,18,78,-26,78	0	101	e
 f	280,755,0,190,-12,82	2	102	f
 g	660,574,226,116,17,82	1	103	g
 h	600,740,0,64,-4,64	2	104	h
-i	240,740,0,133,-3,82	2	105	i
-j	260,740,185,132,68,82	3	106	j
+i	240,740,0,134,-3,82	2	105	i
+j	260,740,185,133,69,82	3	106	j
 k	580,740,0,118,-30,82	2	107	k
-l	240,740,0,134,-4,82	2	108	l
-m	940,574,0,64,-4,64	0	109	m
-n	600,574,0,63,-4,63	0	110	n
+l	240,740,0,135,-4,82	2	108	l
+m	940,574,0,65,-4,65	0	109	m
+n	600,574,0,64,-4,64	0	110	n
 o	640,574,18,82,-21,82	0	111	o
-p	660,574,185,76,37,76	1	112	p
+p	660,574,185,77,38,77	1	112	p
 q	660,574,185,106,-28,82	1	113	q
-r	320,574,0,153,-13,82	0	114	r
+r	320,574,0,154,-13,82	0	114	r
 s	440,574,18,93,1,82	0	115	s
 t	300,740,0,152,-36,82	2	116	t
-u	600,555,18,97,-37,82	0	117	u
-v	560,555,0,149,-56,82	0	118	v
-w	800,555,0,142,-64,82	0	119	w
+u	600,555,18,97,-36,82	0	117	u
+v	560,555,0,149,-55,82	0	118	v
+w	800,555,0,142,-63,82	0	119	w
 x	560,555,0,122,47,82	0	120	x
-y	580,555,185,144,-25,82	1	121	y
+y	580,555,185,144,-24,82	1	121	y
 z	460,555,0,118,30,82	0	122	z
-lC	340,747,191,165,10,82	3	123	braceleft
-{	"
-ba	600,740,100,0,-164	2	124	bar
-|	"
-rC	340,747,191,115,62,82	3	125	braceright
-}	"
-a~	480,767,0,134,-128,82	2	126	tilde
-~	"
-bq	280,133,141,0,3	0	128	quotesinglbase
+{	340,747,191,166,10,82	3	123	braceleft
+lC	"
+|	600,750,250,0,-136	3	124	bar
+ba	"
+}	340,747,191,115,63,82	3	125	braceright
+rC	"
+~	480,767,0,134,-128,82	2	126	tilde
+a~	"
+bq	280,133,141,0,4	0	128	quotesinglbase
 Fo	460,469,0,77,-55,77	0	129	guillemotleft
-Fc	460,469,0,53,-31,53	0	130	guillemotright
+Fc	460,469,0,54,-31,54	0	130	guillemotright
 bu	600,532,0,0,-165	0	131	bullet
-Fn	560,824,151,154,77,82	2	132	florin
-f/	160,740,0,309,173,82	2	133	fraction
+Fn	560,824,151,155,77,82	2	132	florin
+f/	160,740,0,310,173,82	2	133	fraction
 %0	1280,755,15,26,-89,26	2	134	perthousand
-dg	560,740,142,102,-83,82	2	135	dagger
+dg	560,740,142,102,-82,82	2	135	dagger
 dd	560,740,142,108,-13,82	2	136	daggerdbl
-en	500,348,0,79,-28,79	0	137	endash
-em	1000,348,0,79,-28,79	0	138	emdash
-fi	520,755,0,128,-22,82	2	140	fi
-fl	520,755,0,128,-22,82	2	141	fl
+en	500,348,0,80,-27,80	0	137	endash
+em	1000,348,0,80,-27,80	0	138	emdash
+fi	520,755,0,129,-22,82	2	140	fi
+fl	520,755,0,129,-22,82	2	141	fl
 .i	240,555,0,99,-3,82	0	144	dotlessi
-ga	420,851,0,92,-139,82	2	146	grave
-a"	700,862,0,104,-208,82	2	147	hungarumlaut
-a.	280,769,0,120,-142,82	2	148	dotaccent
-ab	480,770,0,152,-135,82	2	149	breve
-ah	540,774,0,123,-164,82	2	150	caron
-ao	360,834,0,114,-156,82	2	151	ring
+ga	420,851,0,92,-138,82	2	146	grave
+a"	700,849,0,117,-197,82	2	147	hungarumlaut
+a.	280,769,0,120,-141,82	2	148	dotaccent
+ab	480,770,0,152,-134,82	2	149	breve
+ah	540,774,0,124,-164,82	2	150	caron
+ao	360,834,0,115,-155,82	2	151	ring
 ho	340,9,195,0,-9	1	152	ogonek
-lq	480,740,0,116,-106,82	2	153	quotedblleft
-rq	480,740,0,117,-107,82	2	154	quotedblright
-oe	1080,574,18,78,-26,78	0	155	oe
-/l	320,740,0,134,-24,82	2	156	lslash
-Bq	480,133,141,5,5,5	0	157	quotedblbase
-OE	1060,755,15,134,-48,82	2	158	OE
-/L	480,740,0,54,-18,54	2	159	Lslash
-r!	280,555,185,80,10,80	1	161	exclamdown
-ct	560,715,0,89,-60,82	0	162	cent
-Po	560,755,0,105,12,82	2	163	sterling
-Cs	560,577,0,118,-3,82	0	164	currency
-Ye	560,740,0,197,-33,82	2	165	yen
-bb	600,740,100,0,-164	2	166	brokenbar
+lq	480,740,0,117,-106,82	2	153	quotedblleft
+rq	480,740,0,118,-107,82	2	154	quotedblright
+oe	1080,574,18,79,-26,79	0	155	oe
+/l	320,740,0,135,-24,82	2	156	lslash
+Bq	480,133,141,5,6,5	0	157	quotedblbase
+OE	1060,755,15,135,-48,82	2	158	OE
+/L	480,740,0,54,-17,54	2	159	Lslash
+r!	280,555,185,80,11,80	1	161	exclamdown
+ct	560,715,0,90,-60,82	0	162	cent
+Po	560,755,0,106,12,82	2	163	sterling
+Cs	560,577,0,118,-2,82	0	164	currency
+Ye	560,740,0,198,-33,82	2	165	yen
+bb	600,675,175,0,-150	0	166	brokenbar
 sc	560,755,158,92,-15,82	2	167	section
-ad	500,769,0,115,-146,82	2	168	dieresis
-co	740,752,12,137,0,82	2	169	copyright
-Of	360,755,0,162,-77,82	2	170	ordfeminine
+ad	500,769,0,115,-145,82	2	168	dieresis
+co	740,752,12,138,0,82	2	169	copyright
+Of	360,755,0,163,-76,82	2	170	ordfeminine
 fo	240,469,0,87,-44,82	0	171	guilsinglleft
-tno	600,425,0,81,-55,81	0	172	logicalnot
-\-	600,313,0,60,-34,60	0	173	minus
-rg	740,752,12,137,0,82	2	174	registered
+tno	600,425,0,81,-54,81	0	172	logicalnot
+\-	600,313,0,61,-33,61	0	173	minus
+rg	740,752,12,138,0,82	2	174	registered
 a-	420,759,0,120,-142,82	2	175	macron
-de	400,712,0,101,-110,82	0	176	degree
-t+-	600,556,62,76,13,76	0	177	plusminus
-S2	336,749,0,150,-23,82	2	178	twosuperior
-S3	336,749,0,127,-37,82	2	179	threesuperior
-aa	420,849,0,138,-174,82	2	180	acute
-mc	576,555,187,116,47,82	1	181	mu
-ps	600,740,103,194,-40,82	2	182	paragraph
-pc	280,320,0,35,-58,35	0	183	periodcentered
-ac	340,6,251,0,-17	1	184	cedilla
-S1	336,740,0,74,-132,74	2	185	onesuperior
-Om	360,755,0,141,-81,82	2	186	ordmasculine
-fc	240,469,0,63,-20,63	0	187	guilsinglright
+de	400,712,0,101,-109,82	0	176	degree
+t+-	600,556,62,77,14,77	0	177	plusminus
+S2	336,749,0,150,-22,82	2	178	twosuperior
+S3	336,749,0,128,-37,82	2	179	threesuperior
+aa	420,851,0,137,-171,82	2	180	acute
+*m	600,555,192,97,36,82	1	181	mu
+mc	"
+ps	600,740,103,195,-39,82	2	182	paragraph
+pc	280,320,0,36,-57,36	0	183	periodcentered
+ac	340,6,251,0,-16	1	184	cedilla
+S1	336,740,0,75,-131,75	2	185	onesuperior
+Om	360,755,0,142,-80,82	2	186	ordmasculine
+fc	240,469,0,64,-20,64	0	187	guilsinglright
 14	840,740,0,0,-137	2	188	onequarter
-12	840,740,0,40,-107,40	2	189	onehalf
-34	840,749,0,46,-47,46	2	190	threequarters
-r?	560,555,200,17,-19,17	1	191	questiondown
+12	840,740,0,41,-107,41	2	189	onehalf
+34	840,749,0,47,-47,47	2	190	threequarters
+r?	560,555,200,17,-18,17	1	191	questiondown
 `A	740,1021,0,42,43,42	2	192	Agrave
-'A	740,1019,0,42,43,42	2	193	Aacute
+'A	740,1021,0,42,43,42	2	193	Aacute
 ^A	740,944,0,42,43,42	2	194	Acircumflex
 ~A	740,937,0,42,43,42	2	195	Atilde
 :A	740,939,0,42,43,42	2	196	Adieresis
 oA	740,969,0,42,43,42	2	197	Aring
-AE	900,740,0,111,55,82	2	198	AE
-,C	780,755,251,134,-47,82	3	199	Ccedilla
-`E	520,1021,0,126,-11,82	2	200	Egrave
-'E	520,1019,0,126,-11,82	2	201	Eacute
-^E	520,944,0,139,-11,82	2	202	Ecircumflex
-:E	520,939,0,136,-11,82	2	203	Edieresis
-`I	280,1021,0,168,-22,82	2	204	Igrave
-'I	280,1019,0,264,-22,82	2	205	Iacute
-^I	280,944,0,259,-22,82	2	206	Icircumflex
-:I	280,939,0,256,-22,82	2	207	Idieresis
--D	742,740,0,74,-33,74	2	208	Eth
-~N	740,937,0,118,-20,82	2	209	Ntilde
-`O	840,1021,15,92,-45,82	2	210	Ograve
-'O	840,1019,15,92,-45,82	2	211	Oacute
-^O	840,944,15,92,-45,82	2	212	Ocircumflex
-~O	840,937,15,92,-45,82	2	213	Otilde
-:O	840,939,15,92,-45,82	2	214	Odieresis
-tmu	600,494,0,67,-26,67	0	215	multiply
-/O	840,814,71,101,-44,82	2	216	Oslash
-`U	640,1021,15,132,-47,82	2	217	Ugrave
-'U	640,1019,15,132,-47,82	2	218	Uacute
-^U	640,944,15,132,-47,82	2	219	Ucircumflex
-:U	640,939,15,132,-47,82	2	220	Udieresis
-'Y	620,1019,0,189,-85,82	2	221	Yacute
+AE	900,740,0,112,55,82	2	198	AE
+,C	780,755,251,135,-46,82	3	199	Ccedilla
+`E	520,1021,0,127,-11,82	2	200	Egrave
+'E	520,1021,0,127,-11,82	2	201	Eacute
+^E	520,944,0,140,-11,82	2	202	Ecircumflex
+:E	520,939,0,137,-11,82	2	203	Edieresis
+`I	280,1021,0,169,-22,82	2	204	Igrave
+'I	280,1021,0,264,-22,82	2	205	Iacute
+^I	280,944,0,260,-22,82	2	206	Icircumflex
+:I	280,939,0,257,-22,82	2	207	Idieresis
+-D	742,740,0,74,-32,74	2	208	Eth
+~N	740,937,0,119,-20,82	2	209	Ntilde
+`O	840,1021,15,92,-44,82	2	210	Ograve
+'O	840,1021,15,92,-44,82	2	211	Oacute
+^O	840,944,15,92,-44,82	2	212	Ocircumflex
+~O	840,937,15,92,-44,82	2	213	Otilde
+:O	840,939,15,92,-44,82	2	214	Odieresis
+tmu	600,494,0,68,-26,68	0	215	multiply
+/O	840,814,71,101,-43,82	2	216	Oslash
+`U	640,1021,15,133,-46,82	2	217	Ugrave
+'U	640,1021,15,133,-46,82	2	218	Uacute
+^U	640,944,15,133,-46,82	2	219	Ucircumflex
+:U	640,939,15,133,-46,82	2	220	Udieresis
+'Y	620,1021,0,190,-85,82	2	221	Yacute
 TP	560,740,0,109,-22,82	2	222	Thorn
 ss	600,755,18,79,-1,79	2	223	germandbls
-`a	660,851,18,106,-23,82	2	224	agrave
-'a	660,849,18,106,-23,82	2	225	aacute
-^a	660,774,18,106,-23,82	2	226	acircumflex
-~a	660,767,18,106,-23,82	2	227	atilde
-:a	660,769,18,106,-23,82	2	228	adieresis
-oa	660,834,18,106,-23,82	2	229	aring
-ae	1080,574,18,75,-25,75	0	230	ae
+`a	660,851,18,106,-22,82	2	224	agrave
+'a	660,851,18,106,-22,82	2	225	aacute
+^a	660,774,18,106,-22,82	2	226	acircumflex
+~a	660,767,18,106,-22,82	2	227	atilde
+:a	660,769,18,106,-22,82	2	228	adieresis
+oa	660,834,18,106,-22,82	2	229	aring
+ae	1080,574,18,76,-25,76	0	230	ae
 ,c	640,574,251,89,-33,82	1	231	ccedilla
-`e	640,851,18,77,-27,77	2	232	egrave
-'e	640,849,18,77,-27,77	2	233	eacute
-^e	640,774,18,77,-27,77	2	234	ecircumflex
-:e	640,769,18,77,-27,77	2	235	edieresis
+`e	640,851,18,78,-26,78	2	232	egrave
+'e	640,851,18,78,-26,78	2	233	eacute
+^e	640,774,18,78,-26,78	2	234	ecircumflex
+:e	640,769,18,78,-26,78	2	235	edieresis
 `i	240,851,0,157,-3,82	2	236	igrave
-'i	240,849,0,253,-3,82	2	237	iacute
-^i	240,774,0,248,11,82	2	238	icircumflex
+'i	240,851,0,252,-3,82	2	237	iacute
+^i	240,774,0,248,12,82	2	238	icircumflex
 :i	240,769,0,245,-3,82	2	239	idieresis
 Sd	640,754,18,109,-23,82	2	240	eth
 ~n	600,767,0,74,-4,74	2	241	ntilde
 `o	640,851,18,82,-21,82	2	242	ograve
-'o	640,849,18,82,-21,82	2	243	oacute
+'o	640,851,18,82,-21,82	2	243	oacute
 ^o	640,774,18,82,-21,82	2	244	ocircumflex
 ~o	640,767,18,82,-21,82	2	245	otilde
 :o	640,769,18,82,-21,82	2	246	odieresis
-tdi	600,526,20,60,-34,60	0	247	divide
+tdi	600,526,20,61,-33,61	0	247	divide
 /o	660,608,50,75,-31,75	0	248	oslash
-`u	600,851,18,97,-37,82	2	249	ugrave
-'u	600,849,18,97,-37,82	2	250	uacute
-^u	600,774,18,97,-37,82	2	251	ucircumflex
-:u	600,769,18,97,-37,82	2	252	udieresis
-'y	580,849,185,144,-25,82	3	253	yacute
-Tp	660,740,185,76,37,76	3	254	thorn
-:y	580,769,185,144,-25,82	3	255	ydieresis
+`u	600,851,18,97,-36,82	2	249	ugrave
+'u	600,851,18,97,-36,82	2	250	uacute
+^u	600,774,18,97,-36,82	2	251	ucircumflex
+:u	600,769,18,97,-36,82	2	252	udieresis
+'y	580,851,185,144,-24,82	3	253	yacute
+Tp	660,740,185,77,38,77	3	254	thorn
+:y	580,769,185,144,-24,82	3	255	ydieresis
 u2026	1000,133,0,0,-50	0	256	ellipsis
diff -ruN groff-1.20.1/font/devps/AI groff-1.21/font/devps/AI
--- groff-1.20.1/font/devps/AI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/AI	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Book Oblique
-#   Version 001.006
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:41:11 1991
-#   Comment UniqueID 34367
-#   Comment VMusage 6555 39267
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:40:18 1999
+#   Comment UniqueID 44725
+#   Comment VMusage 9065 45991
 
 name AI
 internalname AvantGarde-BookOblique
@@ -20,427 +20,597 @@
 ligatures fi fl 0
 
 kernpairs
-A y -62
+A T -81
+A V -122
+A W -95
+A Y -122
+A 'Y -122
+A :Y -122
+A v -73
 A w -65
-A v -70
-A u -20
-A ' -100
-A cq -100
-A rq -100
-A Y -92
-A W -60
-A V -102
-A U -40
-A T -45
-A Q -40
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -30
-D W -10
-D V -50
-D A -50
-F . -160
-F e -20
-F , -180
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -20
-J . -15
-J a -20
-J A -30
-K o -15
-K e -20
-K O -20
-L y -23
-L ' -130
-L cq -130
-L rq -130
-L Y -91
-L W -67
-L V -113
+A y -72
+A 'y -72
+A :y -72
+'A T -81
+'A V -122
+'A W -95
+'A Y -122
+'A 'Y -122
+'A :Y -122
+'A v -73
+'A w -65
+'A y -72
+'A 'y -72
+'A :y -72
+^A T -81
+^A V -122
+^A W -95
+^A Y -122
+^A 'Y -122
+^A :Y -122
+^A v -73
+^A w -65
+^A y -72
+^A 'y -72
+^A :y -72
+:A T -81
+:A V -122
+:A W -95
+:A Y -122
+:A 'Y -122
+:A :Y -122
+:A v -73
+:A w -65
+:A y -72
+:A 'y -72
+:A :y -72
+`A T -81
+`A V -122
+`A W -95
+`A Y -122
+`A 'Y -122
+`A :Y -122
+`A v -73
+`A w -65
+`A y -72
+`A 'y -72
+`A :y -72
+oA T -81
+oA V -122
+oA W -95
+oA Y -122
+oA 'Y -122
+oA :Y -122
+oA v -73
+oA w -65
+oA y -72
+oA 'y -72
+oA :y -72
+~A T -81
+~A V -122
+~A W -95
+~A Y -122
+~A 'Y -122
+~A :Y -122
+~A v -73
+~A w -65
+~A y -72
+~A 'y -72
+~A :y -72
+F A -60
+F 'A -60
+F ^A -60
+F :A -60
+F `A -60
+F oA -60
+F ~A -60
+F , -122
+F . -79
 L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -60
-O T -30
-O A -60
-P . -300
-P o -60
-P e -20
-P , -280
-P a -20
-P A -114
-Q , 20
-R Y -10
-R W 10
-R V -10
+L V -113
+L W -67
+L Y -91
+L 'Y -91
+L :Y -91
+L y -23
+L 'y -23
+L :y -23
+/L T -46
+/L V -113
+/L W -67
+/L Y -91
+/L 'Y -91
+/L :Y -91
+/L y -23
+/L 'y -23
+/L :y -23
+P A -74
+P 'A -74
+P ^A -74
+P :A -74
+P `A -74
+P oA -74
+P ~A -74
+P , -123
+P . -91
 R T 6
-S , 20
-T y -50
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -70
-T i 10
-T - -75
-T hy -75
+R V -39
+R W 2
+R Y -20
+R 'Y -20
+R :Y -20
+R y 32
+R 'y 32
+R :y 32
+T A -81
+T 'A -81
+T ^A -81
+T :A -81
+T `A -81
+T oA -81
+T ~A -81
+T a -52
+T 'a -52
+T ^a -52
+T :a -52
+T `a -52
+T oa -52
+T ~a -52
+T c -51
+T ,c -51
+T : 3
+T , -102
 T e -49
-T , -82
-T : -15
-T a -90
-T O -30
-T A -45
-U . -20
-U , -20
-U A -40
-V u -40
-V ; -33
-V . -165
-V o -101
-V i -5
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
+T 'e -49
+T ^e -49
+T :e -49
+T `e -49
+T i 31
+T 'i 31
+T ^i 31
+T :i 31
+T `i 31
+T o -49
+T 'o -49
+T ^o -49
+T :o -49
+T `o -49
+T /o -49
+T ~o -49
+T . -71
+T r -30
+T s -23
+T ; -29
+T u -46
+T 'u -46
+T ^u -46
+T :u -46
+T `u -46
+T w 7
+T y 5
+T 'y 5
+T :y 5
+V A -122
+V 'A -122
+V ^A -122
+V :A -122
+V `A -122
+V oA -122
+V ~A -122
 V a -104
-V O -60
-V G -20
-V A -102
-W y -2
-W u -30
-W ; -33
-W . -106
-W o -46
-W i 6
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+V 'a -104
+V ^a -104
+V :a -104
+V `a -104
+V oa -104
+V ~a -104
+V : -1
+V , -106
+V e -101
+V 'e -101
+V ^e -101
+V :e -101
+V `e -101
+V i 5
+V 'i 5
+V o -101
+V 'o -101
+V ^o -101
+V :o -101
+V `o -101
+V /o -101
+V ~o -101
+V . -75
+V r -40
+V ; -33
+V u -40
+V 'u -40
+V ^u -40
+V :u -40
+V `u -40
+V y -25
+V 'y -25
+V :y -25
+W A -73
+W 'A -73
+W ^A -73
+W :A -73
+W `A -73
+W oA -73
+W ~A -73
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -175
-Y o -89
-Y - -85
-Y hy -85
-Y e -89
-Y , -145
-Y : -10
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -1
+W , -106
+W e -47
+W 'e -47
+W ^e -47
+W :e -47
+W `e -47
+W i 6
+W 'i 6
+W ^i 16
+W :i 16
+W `i 16
+W o -46
+W 'o -46
+W ^o -46
+W :o -46
+W `o -46
+W /o -46
+W ~o -46
+W . -74
+W r -29
+W ; -33
+W u -30
+W 'u -30
+W ^u -30
+W :u -30
+W `u -30
+W y -2
+W 'y -2
+W :y -2
+Y A -122
+Y 'A -122
+Y ^A -122
+Y :A -122
+Y `A -122
+Y oA -122
+Y ~A -122
 Y a -93
-Y O -30
-Y A -92
-a p 20
-a b 20
-b y -20
-b v -20
-c y -20
-c k -15
-, u0020 -110
-, ' -120
-, cq -120
-, rq -120
-e y -20
-e w -20
-e v -20
-f . -50
-f o -40
-f l -30
-f i -34
-f f -60
-f e -20
-f .i -34
-f , -50
-f a -40
-g a -15
-h y -30
-k y -5
-k e -15
-m y -20
-m u -20
-m a -20
-n y -15
-n v -20
-o y -20
-o x -15
-o w -20
-o v -30
-p y -20
-. u0020 -110
-. ' -120
-. cq -120
-. rq -120
-lq ` -35
-lq oq -35
-lq A -100
-rq u0020 -110
-` ` -203
-` oq -203
-oq ` -203
-oq oq -203
-` A -100
-oq A -100
-' v -30
-cq v -30
-' t 10
-cq t 10
-' u0020 -110
-cq u0020 -110
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -203
-' cq -203
-cq ' -203
-cq cq -203
-' rq -35
-cq rq -35
-' d -110
-cq d -110
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -20
-r n 21
-r m 28
-r l 20
-r k 20
-r i 20
-r - -60
-r hy -60
-r g -15
-r e -4
+Y 'a -93
+Y ^a -93
+Y :a -93
+Y `a -93
+Y oa -93
+Y ~a -93
+Y : 9
+Y , -97
+Y e -89
+Y 'e -89
+Y ^e -89
+Y :e -89
+Y `e -89
+Y i 13
+Y 'i 13
+Y ^i 23
+Y :i 23
+Y `i 23
+Y o -89
+Y 'o -89
+Y ^o -89
+Y :o -89
+Y `o -89
+Y /o -89
+Y ~o -89
+Y p -67
+Y . -65
+Y q -93
+Y ; -23
+Y u -69
+Y 'u -69
+Y ^u -69
+Y :u -69
+Y `u -69
+Y v -17
+'Y A -122
+'Y 'A -122
+'Y ^A -122
+'Y :A -122
+'Y `A -122
+'Y oA -122
+'Y ~A -122
+'Y a -93
+'Y 'a -93
+'Y ^a -93
+'Y :a -93
+'Y `a -93
+'Y oa -93
+'Y ~a -93
+'Y : 9
+'Y , -97
+'Y e -89
+'Y 'e -89
+'Y ^e -89
+'Y :e -89
+'Y `e -89
+'Y i 13
+'Y 'i 13
+'Y ^i 23
+'Y :i 23
+'Y `i 23
+'Y o -89
+'Y 'o -89
+'Y ^o -89
+'Y :o -89
+'Y `o -89
+'Y /o -89
+'Y ~o -89
+'Y p -67
+'Y . -65
+'Y q -93
+'Y ; -23
+'Y u -69
+'Y 'u -69
+'Y ^u -69
+'Y :u -69
+'Y `u -69
+'Y v -17
+:Y A -122
+:Y 'A -122
+:Y ^A -122
+:Y :A -122
+:Y `A -122
+:Y oA -122
+:Y ~A -122
+:Y a -93
+:Y 'a -93
+:Y ^a -93
+:Y :a -93
+:Y `a -93
+:Y oa -93
+:Y ~a -93
+:Y : 9
+:Y , -97
+:Y e -89
+:Y 'e -89
+:Y ^e -89
+:Y :e -89
+:Y `e -89
+:Y i 13
+:Y 'i 13
+:Y ^i 23
+:Y :i 23
+:Y `i 23
+:Y o -89
+:Y 'o -89
+:Y ^o -89
+:Y :o -89
+:Y `o -89
+:Y /o -89
+:Y ~o -89
+:Y p -67
+:Y . -65
+:Y q -93
+:Y ; -23
+:Y u -69
+:Y 'u -69
+:Y ^u -69
+:Y :u -69
+:Y `u -69
+:Y v -17
+f f 3
+r c -7
+r ,c -7
+r , -105
 r d -6
-r , -75
-r c -20
-r a -20
-s . 20
-s , 20
-u0020 ` -110
-u0020 oq -110
-u0020 lq -110
-u0020 Y -60
-u0020 W -25
-u0020 V -50
-u0020 T -25
-u0020 A -20
-v . -130
-v o -30
-v e -20
-v , -100
-v a -30
-w . -100
-w o -30
-w h 15
-w e -20
-w , -90
-w a -30
-y . -125
-y o -30
-y e -20
-y , -110
-y a -30
+r e -4
+r 'e -4
+r ^e -4
+r :e -4
+r `e -4
+r f 48
+r g 1
+r h 29
+r m 28
+r n 21
+r ~n 21
+r o -4
+r 'o -4
+r ^o -4
+r :o -4
+r `o -4
+r /o -4
+r ~o -4
+r . -73
+r q -8
 
 charset
-ha	606,740,0,54,-60,54	2	0	asciicircum
+ha	606,740,0,54,-59,54	2	0	asciicircum
 ti	606,319,0,28,-64,28	0	1	asciitilde
-vS	498,927,13,145,-7,81	2	2	Scaron
-vZ	480,927,0,166,38,81	2	3	Zcaron
+vS	498,927,13,145,-6,81	2	2	Scaron
+vZ	480,927,0,167,38,81	2	3	Zcaron
 vs	388,764,13,170,1,81	2	4	scaron
 vz	425,764,0,152,40,81	2	5	zcaron
-:Y	592,928,0,187,-88,81	2	6	Ydieresis
-tm	1000,740,0,3,-87,3	2	7	trademark
-aq	198,740,0,129,-103,81	2	8	quotesingle
+:Y	592,928,0,188,-88,81	2	6	Ydieresis
+tm	1000,740,0,4,-87,4	2	7	trademark
+aq	198,740,0,130,-103,81	2	8	quotesingle
+Eu	554,753,13,177,-8,81	2	9	Euro
 space	277	0	32	space
-!	295,740,0,77,-61,77	2	33	exclam
-"	309,740,0,151,-80,81	2	34	quotedbl
+!	295,740,0,78,-61,78	2	33	exclam
+"	309,740,0,152,-80,81	2	34	quotedbl
 dq	"
 #	554,740,0,116,-21,81	2	35	numbersign
 sh	"
-$	554,811,70,77,-57,77	2	36	dollar
+$	554,811,70,78,-56,78	2	36	dollar
 Do	"
 %	775,751,13,62,-74,62	2	37	percent
-&	757,753,12,68,-42,68	2	38	ampersand
-'	351,740,0,92,-145,81	2	39	quoteright
+&	757,753,12,69,-42,69	2	38	ampersand
+'	351,740,0,93,-145,81	2	39	quoteright
 cq	"
-(	369,757,205,176,-39,81	3	40	parenleft
-)	369,757,205,63,74,63	3	41	parenright
-*	425,740,0,104,-120,81	2	42	asterisk
-+	606,506,0,52,-42,52	0	43	plus
-,	277,126,67,0,48	0	44	comma
--	332,315,0,78,-26,78	0	45	hyphen
+(	369,757,205,177,-39,81	3	40	parenleft
+)	369,757,205,64,74,64	3	41	parenright
+*	425,740,0,105,-120,81	2	42	asterisk
++	606,506,0,53,-41,53	0	43	plus
+,	277,126,67,0,49	0	44	comma
+-	332,315,0,79,-25,79	0	45	hyphen
 hy	"
 .	277,126,0,0,-52	0	46	period
-/	437,740,100,153,25,81	2	47	slash
+/	437,740,100,154,25,81	2	47	slash
 sl	"
-0	554,753,13,118,-21,81	2	48	zero
-1	554,740,0,0,-210	2	49	one
-2	554,753,0,111,10,81	2	50	two
+0	554,753,13,118,-20,81	2	48	zero
+1	554,740,0,0,-209	2	49	one
+2	554,753,0,112,10,81	2	50	two
 3	554,753,13,61,-23,61	2	51	three
-4	554,740,0,94,11,81	2	52	four
-5	554,740,13,101,-19,81	2	53	five
-6	554,739,13,76,-15,76	2	54	six
-7	554,740,0,124,-60,81	2	55	seven
+4	554,740,0,95,11,81	2	52	four
+5	554,740,13,102,-18,81	2	53	five
+6	554,739,13,77,-15,77	2	54	six
+7	554,740,0,125,-60,81	2	55	seven
 8	554,753,13,76,-27,76	2	56	eight
-9	554,752,0,122,-61,81	2	57	nine
+9	554,752,0,122,-60,81	2	57	nine
 :	277,548,0,51,-52,51	0	58	colon
-;	277,548,67,51,48,51	0	59	semicolon
-<	606,514,8,93,-37,81	0	60	less
-=	606,388,0,71,-23,71	0	61	equal
->	606,514,8,57,-1,57	0	62	greater
-?	591,752,0,87,-108,81	2	63	question
-@	867,753,13,71,-76,71	2	64	at
+;	277,548,67,51,49,51	0	59	semicolon
+<	606,514,8,94,-37,81	0	60	less
+=	606,388,0,71,-22,71	0	61	equal
+>	606,514,8,57,0,57	0	62	greater
+?	591,752,0,88,-108,81	2	63	question
+@	867,753,13,72,-76,72	2	64	at
 at	"
 A	740,740,0,39,38,39	2	65	A
 B	574,740,0,82,-24,81	2	66	B
-C	813,752,13,107,-55,81	2	67	C
-D	744,740,0,79,-24,79	2	68	D
-E	536,740,0,126,-20,81	2	69	E
-F	485,740,0,146,-20,81	2	70	F
-G	872,753,13,69,-53,69	2	71	G
-H	683,740,0,111,-26,81	2	72	H
-I	226,740,0,111,-26,81	2	73	I
-J	482,740,13,107,13,81	2	74	J
-K	591,740,0,187,-31,81	2	75	K
-L	462,740,0,62,-32,62	2	76	L
-M	919,740,0,111,-26,81	2	77	M
-N	740,740,0,111,-25,81	2	78	N
-O	869,753,13,82,-55,81	2	79	O
-P	592,740,0,122,-25,81	2	80	P
-Q	871,753,13,91,-52,81	2	81	Q
-R	607,740,0,112,-20,81	2	82	R
-S	498,753,13,113,-7,81	2	83	S
-T	426,740,0,180,-81,81	2	84	T
-U	655,740,13,111,-68,81	2	85	U
-V	702,740,0,178,-95,81	2	86	V
-W	960,740,0,177,-98,81	2	87	W
-X	609,740,0,165,42,81	2	88	X
-Y	592,740,0,187,-88,81	2	89	Y
-Z	480,740,0,166,38,81	2	90	Z
-[	351,753,179,176,-95,81	2	91	bracketleft
+C	813,752,13,107,-54,81	2	67	C
+D	744,740,0,80,-24,80	2	68	D
+E	536,740,0,127,-20,81	2	69	E
+F	485,740,0,147,-20,81	2	70	F
+G	872,753,13,70,-52,70	2	71	G
+H	683,740,0,112,-26,81	2	72	H
+I	226,740,0,112,-26,81	2	73	I
+J	482,740,13,108,14,81	2	74	J
+K	591,740,0,188,-31,81	2	75	K
+L	462,740,0,63,-32,63	2	76	L
+M	919,740,0,112,-26,81	2	77	M
+N	740,740,0,112,-25,81	2	78	N
+O	869,753,13,82,-54,81	2	79	O
+P	592,740,0,123,-25,81	2	80	P
+Q	871,753,13,91,-51,81	2	81	Q
+R	607,740,0,113,-20,81	2	82	R
+S	498,753,13,113,-6,81	2	83	S
+T	426,740,0,181,-80,81	2	84	T
+U	655,740,13,112,-68,81	2	85	U
+V	702,740,0,179,-95,81	2	86	V
+W	960,740,0,178,-98,81	2	87	W
+X	609,740,0,166,42,81	2	88	X
+Y	592,740,0,188,-88,81	2	89	Y
+Z	480,740,0,167,38,81	2	90	Z
+[	351,753,179,176,-94,81	2	91	bracketleft
 lB	"
 \	605,740,100,0,-205	2	92	backslash
 rs	"
-]	351,753,179,11,69,11	2	93	bracketright
+]	351,753,179,12,70,12	2	93	bracketright
 rB	"
-a^	502,764,0,94,-142,81	2	94	circumflex
-^	"
-_	500,0,125,36,73,36	0	95	underscore
-`	351,740,0,57,-182,57	2	96	quoteleft
+^	502,764,0,95,-142,81	2	94	circumflex
+a^	"
+_	500,0,125,37,74,37	0	95	underscore
+`	351,740,0,58,-182,58	2	96	quoteleft
 oq	"
-a	683,561,13,89,-38,81	0	97	a
+a	683,561,13,90,-37,81	0	97	a
 b	682,740,13,71,-18,71	2	98	b
-c	647,561,13,81,-37,81	0	99	c
-d	685,740,13,120,-35,81	2	100	d
-e	650,561,13,64,-34,64	0	101	e
+c	647,561,13,81,-36,81	0	99	c
+d	685,740,13,121,-34,81	2	100	d
+e	650,561,13,64,-33,64	0	101	e
 f	314,753,0,190,-54,81	2	102	f
-g	673,561,215,84,-6,81	1	103	g
+g	673,561,215,85,-6,81	1	103	g
 h	610,740,0,46,-12,46	2	104	h
-i	200,740,0,122,-15,81	2	105	i
-j	203,740,192,121,130,81	3	106	j
-k	502,740,0,136,-20,81	2	107	k
-l	200,740,0,122,-15,81	2	108	l
+i	200,740,0,123,-15,81	2	105	i
+j	203,740,192,122,130,81	3	106	j
+k	502,740,0,137,-20,81	2	107	k
+l	200,740,0,123,-15,81	2	108	l
 m	938,561,0,50,-16,50	0	109	m
 n	610,561,0,49,-15,49	0	110	n
-o	655,561,13,64,-38,64	0	111	o
+o	655,561,13,65,-37,65	0	111	o
 p	682,561,192,67,22,67	1	112	p
-q	682,561,192,85,-33,81	1	113	q
+q	682,561,192,86,-32,81	1	113	q
 r	301,561,0,144,-15,81	0	114	r
-s	388,561,13,86,1,81	0	115	s
-t	339,740,0,142,-54,81	2	116	t
-u	608,547,13,84,-50,81	0	117	u
-v	554,547,0,143,-58,81	0	118	v
-w	831,547,0,140,-64,81	0	119	w
-x	480,547,0,139,38,81	0	120	x
-y	536,547,192,138,-47,81	1	121	y
-z	425,547,0,123,40,81	0	122	z
-lC	351,740,189,167,-65,81	2	123	braceleft
-{	"
-ba	672,740,100,0,-230	2	124	bar
-|	"
-rC	351,740,189,37,65,37	2	125	braceright
-}	"
-a~	439,754,0,131,-129,81	2	126	tilde
-~	"
+s	388,561,13,87,1,81	0	115	s
+t	339,740,0,143,-53,81	2	116	t
+u	608,547,13,85,-49,81	0	117	u
+v	554,547,0,144,-58,81	0	118	v
+w	831,547,0,141,-64,81	0	119	w
+x	480,547,0,140,38,81	0	120	x
+y	536,547,192,139,-47,81	1	121	y
+z	425,547,0,124,40,81	0	122	z
+{	351,740,189,168,-65,81	2	123	braceleft
+lC	"
+|	672,778,222,0,-207	3	124	bar
+ba	"
+}	351,740,189,37,66,37	2	125	braceright
+rC	"
+~	439,754,0,131,-128,81	2	126	tilde
+a~	"
 bq	354,126,68,0,-26	0	128	quotesinglbase
-Fo	425,481,0,94,-42,81	0	129	guillemotleft
-Fc	425,481,0,62,-10,62	0	130	guillemotright
+Fo	425,481,0,95,-42,81	0	129	guillemotleft
+Fc	425,481,0,63,-10,63	0	130	guillemotright
 bu	606,532,0,0,-167	0	131	bullet
-Fn	554,818,153,165,89,81	2	132	florin
-f/	166,740,0,301,163,81	2	133	fraction
+Fn	554,818,153,166,90,81	2	132	florin
+f/	166,740,0,302,163,81	2	133	fraction
 %0	1174,751,13,58,-78,58	2	134	perthousand
 dg	553,740,133,90,-96,81	2	135	dagger
-dd	553,740,133,90,-22,81	2	136	daggerdbl
-en	500,315,0,73,-31,73	0	137	endash
-em	1000,315,0,73,-31,73	0	138	emdash
-fi	487,753,0,122,-54,81	2	140	fi
-fl	485,753,0,122,-54,81	2	141	fl
-.i	200,547,0,86,-15,81	0	144	dotlessi
-ga	378,786,0,97,-154,81	2	146	grave
-a"	552,800,0,92,-189,81	2	147	hungarumlaut
+dd	553,740,133,90,-21,81	2	136	daggerdbl
+en	500,315,0,74,-30,74	0	137	endash
+em	1000,315,0,74,-30,74	0	138	emdash
+fi	487,753,0,123,-54,81	2	140	fi
+fl	485,753,0,123,-54,81	2	141	fl
+.i	200,547,0,87,-15,81	0	144	dotlessi
+ga	378,786,0,98,-153,81	2	146	grave
+a"	552,786,0,122,-179,81	2	147	hungarumlaut
 a.	222,765,0,118,-142,81	2	148	dotaccent
-ab	453,754,0,138,-142,81	2	149	breve
-ah	502,764,0,113,-160,81	2	150	caron
-ao	332,807,0,119,-141,81	2	151	ring
-ho	302,0,191,0,-3	1	152	ogonek
-lq	502,740,0,55,-184,55	2	153	quotedblleft
-rq	484,740,0,108,-147,81	2	154	quotedblright
-oe	1137,561,13,73,-30,73	0	155	oe
+ab	453,754,0,138,-141,81	2	149	breve
+ah	502,764,0,113,-159,81	2	150	caron
+ao	332,807,0,120,-140,81	2	151	ring
+ho	302,0,191,0,-2	1	152	ogonek
+lq	502,740,0,56,-184,56	2	153	quotedblleft
+rq	484,740,0,109,-147,81	2	154	quotedblright
+oe	1137,561,13,73,-29,73	0	155	oe
 /l	300,740,0,104,-45,81	2	156	lslash
 Bq	502,126,68,0,-26	0	157	quotedblbase
-OE	1194,753,13,135,-57,81	2	158	OE
-/L	517,740,0,62,-57,62	2	159	Lslash
+OE	1194,753,13,136,-56,81	2	158	OE
+/L	517,740,0,63,-56,63	2	159	Lslash
 r!	295,548,192,41,-24,41	1	161	exclamdown
-ct	554,707,0,92,-65,81	0	162	cent
+ct	554,707,0,92,-64,81	0	162	cent
 Po	554,753,0,110,21,81	2	163	sterling
-Cs	554,580,0,141,26,81	0	164	currency
-Ye	554,740,0,183,-25,81	2	165	yen
-bb	672,740,100,0,-230	2	166	brokenbar
-sc	615,753,141,32,-68,32	2	167	section
+Cs	554,580,0,142,27,81	0	164	currency
+Ye	554,740,0,184,-25,81	2	165	yen
+bb	672,703,147,0,-221	0	166	brokenbar
+sc	615,753,141,33,-67,33	2	167	section
 ad	369,765,0,118,-141,81	2	168	dieresis
-co	747,752,12,133,-3,81	2	169	copyright
-Of	369,753,0,175,-52,81	2	170	ordfeminine
-fo	251,481,0,94,-42,81	0	171	guilsinglleft
+co	747,752,12,134,-3,81	2	169	copyright
+Of	369,753,0,176,-51,81	2	170	ordfeminine
+fo	251,481,0,95,-42,81	0	171	guilsinglleft
 tno	606,388,0,71,-60,71	0	172	logicalnot
-\-	606,287,0,52,-42,52	0	173	minus
-rg	747,752,12,133,-3,81	2	174	registered
-a-	485,736,0,112,-147,81	0	175	macron
-de	400,709,0,101,-108,81	0	176	degree
-t+-	606,518,24,62,3,62	0	177	plusminus
-S2	332,747,0,151,-24,81	2	178	twosuperior
-S3	332,747,0,126,-48,81	2	179	threesuperior
+\-	606,287,0,53,-41,53	0	173	minus
+rg	747,752,12,134,-3,81	2	174	registered
+a-	485,736,0,113,-146,81	0	175	macron
+de	400,709,0,102,-108,81	0	176	degree
+t+-	606,518,24,63,4,63	0	177	plusminus
+S2	332,747,0,152,-23,81	2	178	twosuperior
+S3	332,747,0,126,-47,81	2	179	threesuperior
 aa	375,786,0,119,-153,81	2	180	acute
-mc	608,547,184,70,4,70	0	181	mu
-ps	564,740,110,174,-69,81	2	182	paragraph
+*m	608,547,192,85,24,81	1	181	mu
+mc	"
+ps	564,740,110,175,-68,81	2	182	paragraph
 pc	277,316,0,8,-87,8	0	183	periodcentered
-ac	324,0,222,0,-2	1	184	cedilla
-S1	332,740,0,53,-140,53	2	185	onesuperior
-Om	369,753,0,147,-66,81	2	186	ordmasculine
-fc	251,481,0,62,-10,62	0	187	guilsinglright
+ac	324,3,222,0,-2	1	184	cedilla
+S1	332,740,0,54,-140,54	2	185	onesuperior
+Om	369,753,0,148,-66,81	2	186	ordmasculine
+fc	251,481,0,63,-10,63	0	187	guilsinglright
 14	831,740,0,0,-133	2	188	onequarter
-12	831,740,0,29,-114,29	2	189	onehalf
-34	831,747,0,44,-76,44	2	190	threequarters
+12	831,740,0,30,-114,30	2	189	onehalf
+34	831,747,0,45,-75,45	2	190	threequarters
 r?	591,548,205,0,-14	1	191	questiondown
 `A	740,949,0,39,38,39	2	192	Agrave
 'A	740,949,0,39,38,39	2	193	Aacute
@@ -448,62 +618,62 @@
 ~A	740,917,0,39,38,39	2	195	Atilde
 :A	740,928,0,39,38,39	2	196	Adieresis
 oA	740,955,0,39,38,39	2	197	Aring
-AE	992,740,0,102,70,81	2	198	AE
-,C	813,752,222,107,-55,81	3	199	Ccedilla
-`E	536,949,0,126,-20,81	2	200	Egrave
-'E	536,949,0,126,-20,81	2	201	Eacute
-^E	536,927,0,126,-20,81	2	202	Ecircumflex
-:E	536,928,0,126,-20,81	2	203	Edieresis
+AE	992,740,0,103,70,81	2	198	AE
+,C	813,752,222,107,-54,81	3	199	Ccedilla
+`E	536,949,0,127,-20,81	2	200	Egrave
+'E	536,949,0,127,-20,81	2	201	Eacute
+^E	536,927,0,127,-20,81	2	202	Ecircumflex
+:E	536,928,0,127,-20,81	2	203	Edieresis
 `I	226,949,0,164,-26,81	2	204	Igrave
-'I	226,949,0,264,-26,81	2	205	Iacute
+'I	226,949,0,263,-26,81	2	205	Iacute
 ^I	226,927,0,263,-26,81	2	206	Icircumflex
 :I	226,928,0,220,-26,81	2	207	Idieresis
 -D	790,740,0,73,-54,73	2	208	Eth
-~N	740,917,0,111,-25,81	2	209	Ntilde
-`O	869,949,13,82,-55,81	2	210	Ograve
-'O	869,949,13,82,-55,81	2	211	Oacute
-^O	869,927,13,82,-55,81	2	212	Ocircumflex
-~O	869,917,13,82,-55,81	2	213	Otilde
-:O	869,928,13,82,-55,81	2	214	Odieresis
-tmu	606,482,0,56,-37,56	0	215	multiply
-/O	868,819,83,111,-26,81	2	216	Oslash
-`U	655,949,13,111,-68,81	2	217	Ugrave
-'U	655,949,13,111,-68,81	2	218	Uacute
-^U	655,927,13,111,-68,81	2	219	Ucircumflex
-:U	655,928,13,111,-68,81	2	220	Udieresis
-'Y	592,949,0,187,-88,81	2	221	Yacute
-TP	592,740,0,79,-10,79	2	222	Thorn
-ss	554,753,13,74,-11,74	2	223	germandbls
-`a	683,786,13,89,-38,81	2	224	agrave
-'a	683,786,13,89,-38,81	2	225	aacute
-^a	683,764,13,89,-38,81	2	226	acircumflex
-~a	683,754,13,89,-38,81	2	227	atilde
-:a	683,765,13,89,-38,81	2	228	adieresis
-oa	683,807,13,89,-38,81	2	229	aring
-ae	1157,561,13,62,-30,62	0	230	ae
-,c	647,561,222,81,-37,81	1	231	ccedilla
-`e	650,786,13,64,-34,64	2	232	egrave
-'e	650,786,13,64,-34,64	2	233	eacute
-^e	650,764,13,64,-34,64	2	234	ecircumflex
-:e	650,765,13,64,-34,64	2	235	edieresis
-`i	200,786,0,146,-15,81	2	236	igrave
-'i	200,786,0,247,-15,81	2	237	iacute
-^i	200,764,0,245,9,81	2	238	icircumflex
+~N	740,917,0,112,-25,81	2	209	Ntilde
+`O	869,949,13,82,-54,81	2	210	Ograve
+'O	869,949,13,82,-54,81	2	211	Oacute
+^O	869,927,13,82,-54,81	2	212	Ocircumflex
+~O	869,917,13,82,-54,81	2	213	Otilde
+:O	869,928,13,82,-54,81	2	214	Odieresis
+tmu	606,482,0,57,-37,57	0	215	multiply
+/O	868,819,83,112,-26,81	2	216	Oslash
+`U	655,949,13,112,-68,81	2	217	Ugrave
+'U	655,949,13,112,-68,81	2	218	Uacute
+^U	655,927,13,112,-68,81	2	219	Ucircumflex
+:U	655,928,13,112,-68,81	2	220	Udieresis
+'Y	592,949,0,188,-88,81	2	221	Yacute
+TP	592,740,0,80,-10,80	2	222	Thorn
+ss	554,753,13,75,-11,75	2	223	germandbls
+`a	683,786,13,90,-37,81	2	224	agrave
+'a	683,786,13,90,-37,81	2	225	aacute
+^a	683,764,13,90,-37,81	2	226	acircumflex
+~a	683,754,13,90,-37,81	2	227	atilde
+:a	683,765,13,90,-37,81	2	228	adieresis
+oa	683,807,13,90,-37,81	2	229	aring
+ae	1157,561,13,63,-30,63	0	230	ae
+,c	647,561,222,81,-36,81	1	231	ccedilla
+`e	650,786,13,64,-33,64	2	232	egrave
+'e	650,786,13,64,-33,64	2	233	eacute
+^e	650,764,13,64,-33,64	2	234	ecircumflex
+:e	650,765,13,64,-33,64	2	235	edieresis
+`i	200,786,0,147,-15,81	2	236	igrave
+'i	200,786,0,246,-15,81	2	237	iacute
+^i	200,764,0,246,9,81	2	238	icircumflex
 :i	200,765,0,203,-15,81	2	239	idieresis
 Sd	655,753,12,70,-38,70	2	240	eth
 ~n	610,754,0,49,-15,49	2	241	ntilde
-`o	655,786,13,64,-38,64	2	242	ograve
-'o	655,786,13,64,-38,64	2	243	oacute
-^o	655,764,13,64,-38,64	2	244	ocircumflex
-~o	655,754,13,64,-38,64	2	245	otilde
-:o	655,765,13,64,-38,64	2	246	odieresis
-tdi	606,519,13,52,-42,52	0	247	divide
-/o	653,614,64,100,-1,81	0	248	oslash
-`u	608,786,13,84,-50,81	2	249	ugrave
-'u	608,786,13,84,-50,81	2	250	uacute
-^u	608,764,13,84,-50,81	2	251	ucircumflex
-:u	608,765,13,84,-50,81	2	252	udieresis
-'y	536,786,192,138,-47,81	3	253	yacute
+`o	655,786,13,65,-37,65	2	242	ograve
+'o	655,786,13,65,-37,65	2	243	oacute
+^o	655,764,13,65,-37,65	2	244	ocircumflex
+~o	655,754,13,65,-37,65	2	245	otilde
+:o	655,765,13,65,-37,65	2	246	odieresis
+tdi	606,519,13,53,-41,53	0	247	divide
+/o	653,614,64,101,-1,81	0	248	oslash
+`u	608,786,13,85,-49,81	2	249	ugrave
+'u	608,786,13,85,-49,81	2	250	uacute
+^u	608,764,13,85,-49,81	2	251	ucircumflex
+:u	608,765,13,85,-49,81	2	252	udieresis
+'y	536,786,192,139,-47,81	3	253	yacute
 Tp	682,740,192,67,22,67	3	254	thorn
-:y	536,765,192,138,-47,81	3	255	ydieresis
+:y	536,765,192,139,-47,81	3	255	ydieresis
 u2026	1000,126,0,0,-80	0	256	ellipsis
diff -ruN groff-1.20.1/font/devps/AR groff-1.21/font/devps/AR
--- groff-1.20.1/font/devps/AR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/AR	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Avant Garde Gothic Book
-#   Version 001.006
+#   Version 003.001
 #   FamilyName ITC Avant Garde Gothic
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Mon Mar  4 13:37:31 1991
-#   Comment UniqueID 34364
-#   Comment VMusage 24225 31117
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Avant Garde Gothic is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:39:30 1999
+#   Comment UniqueID 44724
+#   Comment VMusage 26533 33469
 
 name AR
 internalname AvantGarde-Book
@@ -19,247 +19,415 @@
 ligatures fi fl 0
 
 kernpairs
-A y -62
+A T -81
+A V -122
+A W -95
+A Y -122
+A 'Y -122
+A :Y -122
+A v -73
 A w -65
-A v -70
-A u -20
-A ' -100
-A cq -100
-A rq -100
-A Y -92
-A W -60
-A V -102
-A U -40
-A T -45
-A Q -40
-A O -50
-A G -40
-A C -40
-B A -10
-C A -40
-D . -20
-D , -20
-D Y -30
-D W -10
-D V -50
-D A -50
-F . -160
-F e -20
-F , -180
-F a -20
-F A -75
-G . -20
-G , -20
-G Y -20
-J . -15
-J a -20
-J A -30
-K o -15
-K e -20
-K O -20
-L y -23
-L ' -130
-L cq -130
-L rq -130
-L Y -91
-L W -67
-L V -113
+A y -72
+A 'y -72
+A :y -72
+'A T -81
+'A V -122
+'A W -95
+'A Y -122
+'A 'Y -122
+'A :Y -122
+'A v -73
+'A w -65
+'A y -72
+'A 'y -72
+'A :y -72
+^A T -81
+^A V -122
+^A W -95
+^A Y -122
+^A 'Y -122
+^A :Y -122
+^A v -73
+^A w -65
+^A y -72
+^A 'y -72
+^A :y -72
+:A T -81
+:A V -122
+:A W -95
+:A Y -122
+:A 'Y -122
+:A :Y -122
+:A v -73
+:A w -65
+:A y -72
+:A 'y -72
+:A :y -72
+`A T -81
+`A V -122
+`A W -95
+`A Y -122
+`A 'Y -122
+`A :Y -122
+`A v -73
+`A w -65
+`A y -72
+`A 'y -72
+`A :y -72
+oA T -81
+oA V -122
+oA W -95
+oA Y -122
+oA 'Y -122
+oA :Y -122
+oA v -73
+oA w -65
+oA y -72
+oA 'y -72
+oA :y -72
+~A T -81
+~A V -122
+~A W -95
+~A Y -122
+~A 'Y -122
+~A :Y -122
+~A v -73
+~A w -65
+~A y -72
+~A 'y -72
+~A :y -72
+F A -60
+F 'A -60
+F ^A -60
+F :A -60
+F `A -60
+F oA -60
+F ~A -60
+F , -122
+F . -79
 L T -46
-O . -30
-O , -30
-O Y -30
-O X -30
-O W -20
-O V -60
-O T -30
-O A -60
-P . -300
-P o -60
-P e -20
-P , -280
-P a -20
-P A -114
-Q , 20
-R Y -10
-R W 10
-R V -10
+L V -113
+L W -67
+L Y -91
+L 'Y -91
+L :Y -91
+L y -23
+L 'y -23
+L :y -23
+/L T -46
+/L V -113
+/L W -67
+/L Y -91
+/L 'Y -91
+/L :Y -91
+/L y -23
+/L 'y -23
+/L :y -23
+P A -74
+P 'A -74
+P ^A -74
+P :A -74
+P `A -74
+P oA -74
+P ~A -74
+P , -123
+P . -91
 R T 6
-S , 20
-T y -50
-T w -55
-T u -46
-T ; -29
-T r -30
-T . -91
-T o -70
-T i 10
-T - -75
-T hy -75
+R V -39
+R W 2
+R Y -20
+R 'Y -20
+R :Y -20
+R y 32
+R 'y 32
+R :y 32
+T A -81
+T 'A -81
+T ^A -81
+T :A -81
+T `A -81
+T oA -81
+T ~A -81
+T a -52
+T 'a -52
+T ^a -52
+T :a -52
+T `a -52
+T oa -52
+T ~a -52
+T c -51
+T ,c -51
+T : 3
+T , -102
 T e -49
-T , -82
-T : -15
-T a -90
-T O -30
-T A -45
-U . -20
-U , -20
-U A -40
-V u -40
-V ; -33
-V . -165
-V o -101
-V i -5
-V - -75
-V hy -75
-V e -101
-V , -145
-V : -18
+T 'e -49
+T ^e -49
+T :e -49
+T `e -49
+T i 31
+T 'i 31
+T ^i 31
+T :i 31
+T `i 31
+T o -49
+T 'o -49
+T ^o -49
+T :o -49
+T `o -49
+T /o -49
+T ~o -49
+T . -71
+T r -30
+T s -23
+T ; -29
+T u -46
+T 'u -46
+T ^u -46
+T :u -46
+T `u -46
+T w 7
+T y 5
+T 'y 5
+T :y 5
+V A -122
+V 'A -122
+V ^A -122
+V :A -122
+V `A -122
+V oA -122
+V ~A -122
 V a -104
-V O -60
-V G -20
-V A -102
-W y -2
-W u -30
-W ; -33
-W . -106
-W o -46
-W i 6
-W - -35
-W hy -35
-W e -47
-W , -106
-W : -15
+V 'a -104
+V ^a -104
+V :a -104
+V `a -104
+V oa -104
+V ~a -104
+V : -1
+V , -106
+V e -101
+V 'e -101
+V ^e -101
+V :e -101
+V `e -101
+V i 5
+V 'i 5
+V o -101
+V 'o -101
+V ^o -101
+V :o -101
+V `o -101
+V /o -101
+V ~o -101
+V . -75
+V r -40
+V ; -33
+V u -40
+V 'u -40
+V ^u -40
+V :u -40
+V `u -40
+V y -25
+V 'y -25
+V :y -25
+W A -73
+W 'A -73
+W ^A -73
+W :A -73
+W `A -73
+W oA -73
+W ~A -73
 W a -50
-W O -20
-W A -58
-Y u -52
-Y ; -23
-Y . -175
-Y o -89
-Y - -85
-Y hy -85
-Y e -89
-Y , -145
-Y : -10
+W 'a -50
+W ^a -50
+W :a -50
+W `a -50
+W oa -50
+W ~a -50
+W : -1
+W , -106
+W e -47
+W 'e -47
+W ^e -47
+W :e -47
+W `e -47
+W i 6
+W 'i 6
+W ^i 16
+W :i 16
+W `i 16
+W o -46
+W 'o -46
+W ^o -46
+W :o -46
+W `o -46
+W /o -46
+W ~o -46
+W . -74
+W r -29
+W ; -33
+W u -30
+W 'u -30
+W ^u -30
+W :u -30
+W `u -30
+W y -2
+W 'y -2
+W :y -2
+Y A -122
+Y 'A -122
+Y ^A -122
+Y :A -122
+Y `A -122
+Y oA -122
+Y ~A -122
 Y a -93
-Y O -30
-Y A -92
-a p 20
-a b 20
-b y -20
-b v -20
-c y -20
-c k -15
-, u0020 -110
-, ' -120
-, cq -120
-, rq -120
-e y -20
-e w -20
-e v -20
-f . -50
-f o -40
-f l -30
-f i -34
-f f -60
-f e -20
-f .i -34
-f , -50
-f a -40
-g a -15
-h y -30
-k y -5
-k e -15
-m y -20
-m u -20
-m a -20
-n y -15
-n v -20
-o y -20
-o x -15
-o w -20
-o v -30
-p y -20
-. u0020 -110
-. ' -120
-. cq -120
-. rq -120
-lq ` -35
-lq oq -35
-lq A -100
-rq u0020 -110
-` ` -203
-` oq -203
-oq ` -203
-oq oq -203
-` A -100
-oq A -100
-' v -30
-cq v -30
-' t 10
-cq t 10
-' u0020 -110
-cq u0020 -110
-' s -15
-cq s -15
-' r -20
-cq r -20
-' ' -203
-' cq -203
-cq ' -203
-cq cq -203
-' rq -35
-cq rq -35
-' d -110
-cq d -110
-r y 40
-r v 40
-r u 20
-r t 20
-r s 20
-r q -8
-r . -73
-r p 20
-r o -20
-r n 21
-r m 28
-r l 20
-r k 20
-r i 20
-r - -60
-r hy -60
-r g -15
-r e -4
+Y 'a -93
+Y ^a -93
+Y :a -93
+Y `a -93
+Y oa -93
+Y ~a -93
+Y : 9
+Y , -97
+Y e -89
+Y 'e -89
+Y ^e -89
+Y :e -89
+Y `e -89
+Y i 13
+Y 'i 13
+Y ^i 23
+Y :i 23
+Y `i 23
+Y o -89
+Y 'o -89
+Y ^o -89
+Y :o -89
+Y `o -89
+Y /o -89
+Y ~o -89
+Y p -67
+Y . -65
+Y q -93
+Y ; -23
+Y u -69
+Y 'u -69
+Y ^u -69
+Y :u -69
+Y `u -69
+Y v -17
+'Y A -122
+'Y 'A -122
+'Y ^A -122
+'Y :A -122
+'Y `A -122
+'Y oA -122
+'Y ~A -122
+'Y a -93
+'Y 'a -93
+'Y ^a -93
+'Y :a -93
+'Y `a -93
+'Y oa -93
+'Y ~a -93
+'Y : 9
+'Y , -97
+'Y e -89
+'Y 'e -89
+'Y ^e -89
+'Y :e -89
+'Y `e -89
+'Y i 13
+'Y 'i 13
+'Y ^i 23
+'Y :i 23
+'Y `i 23
+'Y o -89
+'Y 'o -89
+'Y ^o -89
+'Y :o -89
+'Y `o -89
+'Y /o -89
+'Y ~o -89
+'Y p -67
+'Y . -65
+'Y q -93
+'Y ; -23
+'Y u -69
+'Y 'u -69
+'Y ^u -69
+'Y :u -69
+'Y `u -69
+'Y v -17
+:Y A -122
+:Y 'A -122
+:Y ^A -122
+:Y :A -122
+:Y `A -122
+:Y oA -122
+:Y ~A -122
+:Y a -93
+:Y 'a -93
+:Y ^a -93
+:Y :a -93
+:Y `a -93
+:Y oa -93
+:Y ~a -93
+:Y : 9
+:Y , -97
+:Y e -89
+:Y 'e -89
+:Y ^e -89
+:Y :e -89
+:Y `e -89
+:Y i 13
+:Y 'i 13
+:Y ^i 23
+:Y :i 23
+:Y `i 23
+:Y o -89
+:Y 'o -89
+:Y ^o -89
+:Y :o -89
+:Y `o -89
+:Y /o -89
+:Y ~o -89
+:Y p -67
+:Y . -65
+:Y q -93
+:Y ; -23
+:Y u -69
+:Y 'u -69
+:Y ^u -69
+:Y :u -69
+:Y `u -69
+:Y v -17
+f f 3
+r c -7
+r ,c -7
+r , -105
 r d -6
-r , -75
-r c -20
-r a -20
-s . 20
-s , 20
-u0020 ` -110
-u0020 oq -110
-u0020 lq -110
-u0020 Y -60
-u0020 W -25
-u0020 V -50
-u0020 T -25
-u0020 A -20
-v . -130
-v o -30
-v e -20
-v , -100
-v a -30
-w . -100
-w o -30
-w h 15
-w e -20
-w , -90
-w a -30
-y . -125
-y o -30
-y e -20
-y , -110
-y a -30
+r e -4
+r 'e -4
+r ^e -4
+r :e -4
+r `e -4
+r f 48
+r g 1
+r h 29
+r m 28
+r n 21
+r ~n 21
+r o -4
+r 'o -4
+r ^o -4
+r :o -4
+r `o -4
+r /o -4
+r ~o -4
+r . -73
+r q -8
 
 charset
 ha	606,740	2	0	asciicircum
@@ -271,6 +439,7 @@
 :Y	592,928	2	6	Ydieresis
 tm	1000,740	2	7	trademark
 aq	198,740	2	8	quotesingle
+Eu	554,753,13,4	2	9	Euro
 space	277	0	32	space
 !	295,740	2	33	exclam
 "	309,740	2	34	quotedbl
@@ -343,8 +512,8 @@
 rs	"
 ]	351,753,179	2	93	bracketright
 rB	"
-a^	502,764	2	94	circumflex
-^	"
+^	502,764	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	351,740	2	96	quoteleft
 oq	"
@@ -374,14 +543,14 @@
 x	480,547	0	120	x
 y	536,547,192	1	121	y
 z	425,547	0	122	z
-lC	351,740,189	2	123	braceleft
-{	"
-ba	672,740,100	2	124	bar
-|	"
-rC	351,740,189	2	125	braceright
-}	"
-a~	439,754	2	126	tilde
-~	"
+{	351,740,189	2	123	braceleft
+lC	"
+|	672,778,222	3	124	bar
+ba	"
+}	351,740,189	2	125	braceright
+rC	"
+~	439,754	2	126	tilde
+a~	"
 bq	354,126,68	0	128	quotesinglbase
 Fo	425,481	0	129	guillemotleft
 Fc	425,481	0	130	guillemotright
@@ -397,7 +566,7 @@
 fl	485,753	2	141	fl
 .i	200,547	0	144	dotlessi
 ga	378,786	2	146	grave
-a"	552,800	2	147	hungarumlaut
+a"	552,786	2	147	hungarumlaut
 a.	222,765	2	148	dotaccent
 ab	453,754	2	149	breve
 ah	502,764	2	150	caron
@@ -415,7 +584,7 @@
 Po	554,753	2	163	sterling
 Cs	554,580	0	164	currency
 Ye	554,740	2	165	yen
-bb	672,740,100	2	166	brokenbar
+bb	672,703,147	0	166	brokenbar
 sc	615,753,141	2	167	section
 ad	369,765	2	168	dieresis
 co	747,752,12,8,9	2	169	copyright
@@ -430,10 +599,11 @@
 S2	332,747	2	178	twosuperior
 S3	332,747	2	179	threesuperior
 aa	375,786	2	180	acute
-mc	608,547,184	0	181	mu
+*m	608,547,192	1	181	mu
+mc	"
 ps	564,740,110	2	182	paragraph
 pc	277,316	0	183	periodcentered
-ac	324,0,222	1	184	cedilla
+ac	324,3,222	1	184	cedilla
 S1	332,740	2	185	onesuperior
 Om	369,753	2	186	ordmasculine
 fc	251,481	0	187	guilsinglright
@@ -454,7 +624,7 @@
 ^E	536,927	2	202	Ecircumflex
 :E	536,928	2	203	Edieresis
 `I	226,949,0,0,47	2	204	Igrave
-'I	226,949,0,49	2	205	Iacute
+'I	226,949,0,48	2	205	Iacute
 ^I	226,927,0,64,64	2	206	Icircumflex
 :I	226,928	2	207	Idieresis
 -D	790,740	2	208	Eth
@@ -486,7 +656,7 @@
 ^e	650,764,13	2	234	ecircumflex
 :e	650,765,13	2	235	edieresis
 `i	200,786,0,0,60	2	236	igrave
-'i	200,786,0,62	2	237	iacute
+'i	200,786,0,61	2	237	iacute
 ^i	200,764,0,77,77	2	238	icircumflex
 :i	200,765,0,11,11	2	239	idieresis
 Sd	655,753,12	2	240	eth
diff -ruN groff-1.20.1/font/devps/BMB groff-1.21/font/devps/BMB
--- groff-1.20.1/font/devps/BMB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/BMB	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Demi
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:13:29 1992
-#   Comment UniqueID 37831
-#   Comment VMusage 31983 38875
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:32:33 1999
+#   Comment UniqueID 44721
+#   Comment VMusage 35828 42764
 
 name BMB
 internalname Bookman-Demi
@@ -19,101 +19,424 @@
 ligatures fi fl 0
 
 kernpairs
-A y -1
-A w -9
-A v -8
-A Y -52
-A W -20
-A V -68
 A T -40
-F . -132
-F , -130
+A V -68
+A W -20
+A Y -52
+A 'Y -52
+A :Y -52
+A v -8
+A w -9
+A y -1
+A 'y -1
+A :y -1
+'A T -40
+'A V -68
+'A W -20
+'A Y -52
+'A 'Y -52
+'A :Y -52
+'A v -8
+'A w -9
+'A y -1
+'A 'y -1
+'A :y -1
+^A T -40
+^A V -68
+^A W -20
+^A Y -52
+^A 'Y -52
+^A :Y -52
+^A v -8
+^A w -9
+^A y -1
+^A 'y -1
+^A :y -1
+:A T -40
+:A V -68
+:A W -20
+:A Y -52
+:A 'Y -52
+:A :Y -52
+:A v -8
+:A w -9
+:A y -1
+:A 'y -1
+:A :y -1
+`A T -40
+`A V -68
+`A W -20
+`A Y -52
+`A 'Y -52
+`A :Y -52
+`A v -8
+`A w -9
+`A y -1
+`A 'y -1
+`A :y -1
+oA T -40
+oA V -68
+oA W -20
+oA Y -52
+oA 'Y -52
+oA :Y -52
+oA v -8
+oA w -9
+oA y -1
+oA 'y -1
+oA :y -1
+~A T -40
+~A V -68
+~A W -20
+~A Y -52
+~A 'Y -52
+~A :Y -52
+~A v -8
+~A w -9
+~A y -1
+~A 'y -1
+~A :y -1
 F A -59
-L y 19
-L Y -35
-L W -41
-L V -50
+F 'A -59
+F ^A -59
+F :A -59
+F `A -59
+F oA -59
+F ~A -59
+F , -130
+F . -132
 L T -4
-P . -128
-P , -129
+L V -50
+L W -41
+L Y -35
+L 'Y -35
+L :Y -35
+L y 19
+L 'y 19
+L :y 19
+/L T -4
+/L V -50
+/L W -41
+/L Y -35
+/L 'Y -35
+/L :Y -35
+/L y 19
+/L 'y 19
+/L :y 19
 P A -46
-R y -8
-R Y -20
-R W -24
-R V -29
+P 'A -46
+P ^A -46
+P :A -46
+P `A -46
+P oA -46
+P ~A -46
+P , -129
+P . -128
 R T -4
-T ; 5
-T s -10
-T r 27
-T . -122
-T o -28
-T i 27
+R V -29
+R W -24
+R Y -20
+R 'Y -20
+R :Y -20
+R y -8
+R 'y -8
+R :y -8
+T A -42
+T 'A -42
+T ^A -42
+T :A -42
+T `A -42
+T oA -42
+T ~A -42
+T a -24
+T 'a -24
+T ^a -24
+T :a -24
+T `a -24
+T oa -24
+T ~a -24
+T c -29
+T ,c -29
+T : 7
+T , -122
+T e -29
+T 'e -29
+T ^e -29
+T :e -29
+T `e -29
 T - -10
 T hy -10
-T e -29
-T , -122
-T : 7
-T c -29
-T a -24
-T A -42
-V y 12
-V u -11
-V ; -38
-V r -15
-V . -105
-V o -79
-V i 15
+T i 27
+T 'i 27
+T ^i 27
+T :i 27
+T `i 27
+T o -28
+T 'o -28
+T ^o -28
+T :o -28
+T `o -28
+T /o -28
+T ~o -28
+T . -122
+T r 27
+T s -10
+T vs -10
+T ; 5
+V A -88
+V 'A -88
+V ^A -88
+V :A -88
+V `A -88
+V oA -88
+V ~A -88
+V a -74
+V 'a -74
+V ^a -74
+V :a -74
+V `a -74
+V oa -74
+V ~a -74
+V : -37
+V , -103
+V e -80
+V 'e -80
+V ^e -80
+V :e -80
+V `e -80
 V - -10
 V hy -10
-V e -80
-V , -103
-V : -37
-V a -74
-V A -88
-W y 12
-W u -11
-W ; -38
-W r -15
-W . -105
-W o -78
-W i 15
+V i 15
+V 'i 15
+V ^i 15
+V :i 15
+V `i 15
+V o -79
+V 'o -79
+V ^o -79
+V :o -79
+V `o -79
+V /o -79
+V ~o -79
+V . -105
+V r -15
+V ; -38
+V u -11
+V 'u -11
+V ^u -11
+V :u -11
+V `u -11
+V y 12
+V 'y 12
+V :y 12
+W A -60
+W 'A -60
+W ^A -60
+W :A -60
+W `A -60
+W oA -60
+W ~A -60
+W a -73
+W 'a -73
+W ^a -73
+W :a -73
+W `a -73
+W oa -73
+W ~a -73
+W : -37
+W , -103
+W e -79
+W 'e -79
+W ^e -79
+W :e -79
+W `e -79
 W - -10
 W hy -10
-W e -79
-W , -103
-W : -37
-W a -73
-W A -60
-Y v 24
-Y u -13
-Y ; -34
-Y q -66
-Y . -105
-Y p -23
-Y o -66
-Y i 2
+W i 15
+W 'i 15
+W ^i 15
+W :i 15
+W `i 15
+W o -78
+W 'o -78
+W ^o -78
+W :o -78
+W `o -78
+W /o -78
+W ~o -78
+W . -105
+W r -15
+W ; -38
+W u -11
+W 'u -11
+W ^u -11
+W :u -11
+W `u -11
+W y 12
+W 'y 12
+W :y 12
+Y A -56
+Y 'A -56
+Y ^A -56
+Y :A -56
+Y `A -56
+Y oA -56
+Y ~A -56
+Y a -60
+Y 'a -60
+Y ^a -60
+Y :a -60
+Y `a -60
+Y oa -60
+Y ~a -60
+Y : -32
+Y , -103
+Y e -67
+Y 'e -67
+Y ^e -67
+Y :e -67
+Y `e -67
 Y - -10
 Y hy -10
-Y e -67
-Y , -103
-Y : -32
-Y a -60
-Y A -56
+Y i 2
+Y 'i 2
+Y ^i 12
+Y :i 12
+Y `i 12
+Y o -66
+Y 'o -66
+Y ^o -66
+Y :o -66
+Y `o -66
+Y /o -66
+Y ~o -66
+Y p -23
+Y . -105
+Y q -66
+Y ; -34
+Y u -13
+Y 'u -13
+Y ^u -13
+Y :u -13
+Y `u -13
+Y v 24
+'Y A -56
+'Y 'A -56
+'Y ^A -56
+'Y :A -56
+'Y `A -56
+'Y oA -56
+'Y ~A -56
+'Y a -60
+'Y 'a -60
+'Y ^a -60
+'Y :a -60
+'Y `a -60
+'Y oa -60
+'Y ~a -60
+'Y : -32
+'Y , -103
+'Y e -67
+'Y 'e -67
+'Y ^e -67
+'Y :e -67
+'Y `e -67
+'Y - -10
+'Y hy -10
+'Y i 2
+'Y 'i 2
+'Y ^i 12
+'Y :i 12
+'Y `i 12
+'Y o -66
+'Y 'o -66
+'Y ^o -66
+'Y :o -66
+'Y `o -66
+'Y /o -66
+'Y ~o -66
+'Y p -23
+'Y . -105
+'Y q -66
+'Y ; -34
+'Y u -13
+'Y 'u -13
+'Y ^u -13
+'Y :u -13
+'Y `u -13
+'Y v 24
+:Y A -56
+:Y 'A -56
+:Y ^A -56
+:Y :A -56
+:Y `A -56
+:Y oA -56
+:Y ~A -56
+:Y a -60
+:Y 'a -60
+:Y ^a -60
+:Y :a -60
+:Y `a -60
+:Y oa -60
+:Y ~a -60
+:Y : -32
+:Y , -103
+:Y e -67
+:Y 'e -67
+:Y ^e -67
+:Y :e -67
+:Y `e -67
+:Y - -10
+:Y hy -10
+:Y i 2
+:Y 'i 2
+:Y ^i 12
+:Y :i 12
+:Y `i 12
+:Y o -66
+:Y 'o -66
+:Y ^o -66
+:Y :o -66
+:Y `o -66
+:Y /o -66
+:Y ~o -66
+:Y p -23
+:Y . -105
+:Y q -66
+:Y ; -34
+:Y u -13
+:Y 'u -13
+:Y ^u -13
+:Y :u -13
+:Y `u -13
+:Y v 24
 f f 21
-r q -9
-r . -102
-r o -9
-r n 20
-r m 20
+r c -9
+r ,c -9
+r , -101
+r d -10
+r e -10
+r 'e -10
+r ^e -10
+r :e -10
+r `e -10
+r f 20
+r g -9
+r h -23
 r - -10
 r hy -10
-r h -23
-r g -9
-r f 20
-r e -10
-r d -10
-r , -101
-r c -9
+r m 20
+r n 20
+r ~n 20
+r o -9
+r 'o -9
+r ^o -9
+r :o -9
+r `o -9
+r /o -9
+r ~o -9
+r . -102
+r q -9
 
 charset
 ha	600,681	2	0	asciicircum
@@ -125,6 +448,7 @@
 :Y	700,877,0,18,20	2	6	Ydieresis
 tm	980,681,0,2	2	7	trademark
 aq	240,698	2	8	quotesingle
+Eu	660,698,17	2	9	Euro
 space	340	0	32	space
 !	360,698,8	2	33	exclam
 "	420,698	2	34	quotedbl
@@ -137,9 +461,9 @@
 &	800,698,17	2	38	ampersand
 '	320,698	2	39	quoteright
 cq	"
-(	320,749,150	2	40	parenleft
-)	320,749,150	2	41	parenright
-*	460,697	2	42	asterisk
+(	320,750,150	2	40	parenleft
+)	320,750,151	2	41	parenright
+*	460,698	2	42	asterisk
 +	600,514	0	43	plus
 ,	340,162,124	0	44	comma
 -	360,318	0	45	hyphen
@@ -197,8 +521,8 @@
 rs	"
 ]	300,725,138	2	93	bracketright
 rB	"
-a^	500,731	2	94	circumflex
-^	"
+^	500,731	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	320,698	2	96	quoteleft
 oq	"
@@ -228,14 +552,14 @@
 x	600,502	0	120	x
 y	620,502,221	1	121	y
 z	560,502	0	122	z
-lC	320,726,139	2	123	braceleft
-{	"
-ba	600,750,250	3	124	bar
-|	"
-rC	320,725,140	2	125	braceright
-}	"
-a~	480,691	2	126	tilde
-~	"
+{	320,726,139	2	123	braceleft
+lC	"
+|	600,750,250	3	124	bar
+ba	"
+}	320,725,140	2	125	braceright
+rC	"
+~	480,691	2	126	tilde
+a~	"
 bq	320,144,114	0	128	quotesinglbase
 Fo	400,457	0	129	guillemotleft
 Fc	400,457	0	130	guillemotright
@@ -252,11 +576,11 @@
 .i	360,502	0	144	dotlessi
 ga	400,730	2	146	grave
 a"	440,741	2	147	hungarumlaut
-a.	320,730	2	148	dotaccent
+a.	320,729	2	148	dotaccent
 ab	500,722	2	149	breve
 ah	500,717	2	150	caron
 ao	340,755	2	151	ring
-ho	320,0,163	0	152	ogonek
+ho	320,0,199	0	152	ogonek
 lq	540,698	2	153	quotedblleft
 rq	540,698	2	154	quotedblright
 oe	940,515,8	0	155	oe
@@ -271,7 +595,7 @@
 Ye	660,681,0,36,28	2	165	yen
 bb	600,675,175	2	166	brokenbar
 sc	600,698,153	2	167	section
-ad	500,698	2	168	dieresis
+ad	500,673	2	168	dieresis
 co	740,698,17	2	169	copyright
 Of	400,698	2	170	ordfeminine
 fo	220,457	0	171	guilsinglleft
@@ -284,7 +608,8 @@
 S2	396,698	2	178	twosuperior
 S3	396,698	2	179	threesuperior
 aa	400,731	2	180	acute
-mc	660,502,221	1	181	mu
+*m	679,502,205,3	0	181	mu
+mc	"
 ps	800,681	2	182	paragraph
 pc	340,355	0	183	periodcentered
 ac	360,0,213	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/BMBI groff-1.21/font/devps/BMBI
--- groff-1.20.1/font/devps/BMBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/BMBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Demi Italic
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:12:43 1992
-#   Comment UniqueID 37832
-#   Comment VMusage 32139 39031
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:35:00 1999
+#   Comment UniqueID 44722
+#   Comment VMusage 35568 42504
 
 name BMBI
 internalname Bookman-DemiItalic
@@ -20,103 +20,424 @@
 ligatures fi fl 0
 
 kernpairs
-A y 20
-A w 20
-A v 20
-A Y -25
-A W -35
-A V -40
 A T -17
-F . -105
-F , -98
+A V -40
+A W -35
+A Y -25
+A 'Y -25
+A :Y -25
+A v 20
+A w 20
+A y 20
+A 'y 20
+A :y 20
+'A T -17
+'A V -40
+'A W -35
+'A Y -25
+'A 'Y -25
+'A :Y -25
+'A v 20
+'A w 20
+'A y 20
+'A 'y 20
+'A :y 20
+^A T -17
+^A V -40
+^A W -35
+^A Y -25
+^A 'Y -25
+^A :Y -25
+^A v 20
+^A w 20
+^A y 20
+^A 'y 20
+^A :y 20
+:A T -17
+:A V -40
+:A W -35
+:A Y -25
+:A 'Y -25
+:A :Y -25
+:A v 20
+:A w 20
+:A y 20
+:A 'y 20
+:A :y 20
+`A T -17
+`A V -40
+`A W -35
+`A Y -25
+`A 'Y -25
+`A :Y -25
+`A v 20
+`A w 20
+`A y 20
+`A 'y 20
+`A :y 20
+oA T -17
+oA V -40
+oA W -35
+oA Y -25
+oA 'Y -25
+oA :Y -25
+oA v 20
+oA w 20
+oA y 20
+oA 'y 20
+oA :y 20
+~A T -17
+~A V -40
+~A W -35
+~A Y -25
+~A 'Y -25
+~A :Y -25
+~A v 20
+~A w 20
+~A y 20
+~A 'y 20
+~A :y 20
 F A -35
-L y 62
-L Y -5
-L W -15
-L V -19
+F 'A -35
+F ^A -35
+F :A -35
+F `A -35
+F oA -35
+F ~A -35
+F , -98
+F . -105
 L T -26
-P . -105
-P , -98
+L V -19
+L W -15
+L Y -5
+L 'Y -5
+L :Y -5
+L y 62
+L 'y 62
+L :y 62
+/L T -26
+/L V -19
+/L W -15
+/L Y -5
+/L 'Y -5
+/L :Y -5
+/L y 62
+/L 'y 62
+/L :y 62
 P A -31
-R y 27
-R Y 4
-R W -4
-R V -8
+P 'A -31
+P ^A -31
+P :A -31
+P `A -31
+P oA -31
+P ~A -31
+P , -98
+P . -105
 R T -3
-T y 56
-T w 69
-T u 42
-T ; 31
-T s -1
-T r 41
-T . -107
-T o -5
-T i 42
+R V -8
+R W -4
+R Y 4
+R 'Y 4
+R :Y 4
+R y 27
+R 'y 27
+R :y 27
+T A -42
+T 'A -42
+T ^A -42
+T :A -42
+T `A -42
+T oA -42
+T ~A -42
+T a -8
+T 'a -8
+T ^a -8
+T :a -8
+T `a -8
+T oa -8
+T ~a -8
+T c -8
+T ,c -8
+T : 26
+T , -100
+T e -10
+T 'e -10
+T ^e -10
+T :e -10
+T `e -10
 T - -20
 T hy -20
-T e -10
-T , -100
-T : 26
-T c -8
-T a -8
-T A -42
-V y 17
-V u -1
-V ; -22
-V r 2
-V . -115
-V o -50
-V i 32
+T i 42
+T 'i 42
+T ^i 42
+T :i 42
+T `i 42
+T o -5
+T 'o -5
+T ^o -5
+T :o -5
+T `o -5
+T /o -5
+T ~o -5
+T . -107
+T r 41
+T s -1
+T vs -1
+T ; 31
+T u 42
+T 'u 42
+T ^u 42
+T :u 42
+T `u 42
+T w 69
+T y 56
+T 'y 56
+T :y 56
+V A -50
+V 'A -50
+V ^A -50
+V :A -50
+V `A -50
+V oA -50
+V ~A -50
+V a -50
+V 'a -50
+V ^a -50
+V :a -50
+V `a -50
+V oa -50
+V ~a -50
+V : -28
+V , -137
+V e -50
+V 'e -50
+V ^e -50
+V `e -50
 V - -20
 V hy -20
-V e -50
-V , -137
-V : -28
-V a -50
-V A -50
-W y -51
-W u -69
-W ; -81
-W r -66
-W . -183
-W o -100
-W i -36
+V i 32
+V 'i 32
+V ^i 48
+V :i 48
+V `i 32
+V o -50
+V 'o -50
+V ^o -50
+V :o -50
+V `o -50
+V /o -50
+V ~o -20
+V . -115
+V r 2
+V ; -22
+V u -1
+V 'u -1
+V ^u -1
+V :u -1
+V `u -1
+V y 17
+V 'y 17
+V :y 17
+W A -77
+W 'A -77
+W ^A -77
+W :A -77
+W `A -77
+W oA -77
+W ~A -77
+W a -100
+W 'a -100
+W ^a -100
+W :a -100
+W `a -100
+W oa -100
+W ~a -100
+W : -86
+W , -201
+W e -100
+W 'e -100
+W ^e -100
+W :e -100
+W `e -100
 W - -22
 W hy -22
-W e -100
-W , -201
-W : -86
-W a -100
-W A -77
-Y v 26
-Y u -1
-Y ; -4
-Y q -43
-Y . -113
-Y o -41
-Y i 20
+W i -36
+W 'i -36
+W `i -36
+W o -100
+W 'o -100
+W ^o -100
+W :o -100
+W `o -100
+W /o -100
+W ~o -100
+W . -183
+W r -66
+W ; -81
+W u -69
+W 'u -69
+W ^u -69
+W :u -69
+W `u -69
+W y -51
+W 'y -51
+W :y -51
+Y A -30
+Y 'A -30
+Y ^A -30
+Y :A -30
+Y `A -30
+Y oA -30
+Y ~A -30
+Y a -45
+Y 'a -45
+Y ^a -45
+Y :a -45
+Y `a -45
+Y oa -45
+Y ~a -45
+Y : -9
+Y , -106
+Y e -46
+Y 'e -46
+Y ^e -46
+Y `e -46
 Y - -20
 Y hy -20
-Y e -46
-Y , -106
-Y : -9
-Y a -45
-Y A -30
+Y i 20
+Y 'i 20
+Y ^i 40
+Y :i 40
+Y `i 40
+Y o -41
+Y 'o -41
+Y ^o -41
+Y :o -21
+Y `o -41
+Y /o -41
+Y ~o -41
+Y . -113
+Y q -43
+Y ; -4
+Y u -1
+Y 'u -1
+Y ^u -1
+Y :u -1
+Y `u -1
+Y v 26
+'Y A -30
+'Y 'A -30
+'Y ^A -30
+'Y :A -30
+'Y `A -30
+'Y oA -30
+'Y ~A -30
+'Y a -45
+'Y 'a -45
+'Y ^a -45
+'Y :a -45
+'Y `a -45
+'Y oa -45
+'Y ~a -45
+'Y : -9
+'Y , -106
+'Y e -46
+'Y 'e -46
+'Y ^e -46
+'Y `e -46
+'Y - -20
+'Y hy -20
+'Y i 20
+'Y 'i 20
+'Y ^i 40
+'Y :i 40
+'Y `i 40
+'Y o -41
+'Y 'o -41
+'Y ^o -41
+'Y :o -21
+'Y `o -41
+'Y /o -41
+'Y ~o -41
+'Y . -113
+'Y q -43
+'Y ; -4
+'Y u -1
+'Y 'u -1
+'Y ^u -1
+'Y :u -1
+'Y `u -1
+'Y v 26
+:Y A -30
+:Y 'A -30
+:Y ^A -30
+:Y :A -30
+:Y `A -30
+:Y oA -30
+:Y ~A -30
+:Y a -45
+:Y 'a -45
+:Y ^a -45
+:Y :a -45
+:Y `a -45
+:Y oa -45
+:Y ~a -45
+:Y : -9
+:Y , -106
+:Y e -46
+:Y 'e -46
+:Y ^e -46
+:Y `e -46
+:Y - -20
+:Y hy -20
+:Y i 20
+:Y 'i 20
+:Y ^i 40
+:Y :i 40
+:Y `i 40
+:Y o -41
+:Y 'o -41
+:Y ^o -41
+:Y :o -21
+:Y `o -41
+:Y /o -41
+:Y ~o -41
+:Y . -113
+:Y q -43
+:Y ; -4
+:Y u -1
+:Y 'u -1
+:Y ^u -1
+:Y :u -1
+:Y `u -1
+:Y v 26
 f f 10
-r q -3
-r . -120
-r o -1
-r n 39
-r m 39
+r c -5
+r ,c -5
+r , -113
+r d -3
+r e -6
+r 'e -6
+r ^e -6
+r :e -6
+r `e -6
+r f 42
+r g -23
+r h -35
 r - -20
 r hy -20
-r h -35
-r g -23
-r f 42
-r e -6
-r d -3
-r , -113
-r c -5
+r m 39
+r n 39
+r ~n 39
+r o -1
+r 'o -1
+r ^o -1
+r :o -1
+r `o -1
+r /o -1
+r ~o -1
+r . -120
+r q -3
 
 charset
 ha	620,681,0,24,-42,24	2	0	asciicircum
@@ -128,6 +449,7 @@
 :Y	660,900,0,207,-22,73	2	6	Ydieresis
 tm	940,681,0,92,8,73	2	7	trademark
 aq	180,696,0,165,-76,73	2	8	quotesingle
+Eu	680,698,17,105,-28,73	2	9	Euro
 space	340	0	32	space
 !	320,698,8,96,-36,73	2	33	exclam
 "	380,697,0,177,-90,73	2	34	quotedbl
@@ -140,8 +462,8 @@
 &	980,698,17,86,2,73	2	38	ampersand
 '	320,698,0,79,-121,73	2	39	quoteright
 cq	"
-(	260,741,134,178,19,73	2	40	parenleft
-)	260,741,134,112,85,73	2	41	parenright
+(	260,741,135,178,19,73	2	40	parenleft
+)	260,742,134,112,85,73	2	41	parenright
 *	460,698,0,98,-76,73	2	42	asterisk
 +	600,514,0,45,-41,45	0	43	plus
 ,	340,185,124,8,-50,8	0	44	comma
@@ -200,8 +522,8 @@
 rs	"
 ]	260,741,118,137,68,73	2	93	bracketright
 rB	"
-a^	480,749,0,93,-133,73	2	94	circumflex
-^	"
+^	480,749,0,93,-133,73	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	320,698,0,63,-105,63	2	96	quoteleft
 oq	"
@@ -231,14 +553,14 @@
 x	620,515,8,84,40,73	0	120	x
 y	600,507,213,92,25,73	1	121	y
 z	560,515,8,76,14,73	0	122	z
-lC	300,742,123,163,1,73	2	123	braceleft
-{	"
-ba	620,750,250,0,-253	3	124	bar
-|	"
-rC	300,751,114,106,58,73	2	125	braceright
-}	"
-a~	480,709,0,103,-128,73	2	126	tilde
-~	"
+{	300,742,123,163,1,73	2	123	braceleft
+lC	"
+|	620,750,250,0,-253	3	124	bar
+ba	"
+}	300,751,114,106,58,73	2	125	braceright
+rC	"
+~	480,709,0,103,-128,73	2	126	tilde
+a~	"
 bq	300,166,112,34,-56,34	0	128	quotesinglbase
 Fo	380,503,0,76,-12,73	0	129	guillemotleft
 Fc	380,503,0,76,-12,73	0	130	guillemotright
@@ -255,15 +577,15 @@
 .i	380,507,8,90,-33,73	0	144	dotlessi
 ga	380,771,0,94,-143,73	2	146	grave
 a"	560,775,0,106,-131,73	2	147	hungarumlaut
-a.	380,734,0,15,-130,15	2	148	dotaccent
+a.	380,755,0,35,-117,35	2	148	dotaccent
 ab	460,707,0,106,-127,73	2	149	breve
 ah	480,749,0,93,-133,73	2	150	caron
 ao	360,775,0,96,-135,73	2	151	ring
-ho	320,0,182,0,-18	0	152	ogonek
+ho	320,0,199,23,-8,23	0	152	ogonek
 lq	520,698,0,75,-106,73	2	153	quotedblleft
 rq	520,698,0,90,-121,73	2	154	quotedblright
 oe	920,515,8,91,2,73	0	155	oe
-/l	380,732,8,82,-13,73	2	156	lslash
+/l	380,732,8,94,-25,73	2	156	lslash
 Bq	520,166,112,25,-56,25	0	157	quotedblbase
 OE	1180,698,17,115,-44,73	2	158	OE
 /L	640,681,0,134,36,73	2	159	Lslash
@@ -274,7 +596,7 @@
 Ye	680,681,0,152,-42,73	2	165	yen
 bb	620,675,175,0,-253	2	166	brokenbar
 sc	620,698,137,68,4,68	2	167	section
-ad	520,734,0,99,-130,73	2	168	dieresis
+ad	520,727,0,99,-130,73	2	168	dieresis
 co	780,698,17,53,-33,53	2	169	copyright
 Of	440,685,0,105,-68,73	2	170	ordfeminine
 fo	220,503,0,79,-12,73	0	171	guilsinglleft
@@ -287,7 +609,8 @@
 S2	408,698,0,127,-41,73	2	178	twosuperior
 S3	408,698,0,125,-36,73	2	179	threesuperior
 aa	340,771,0,117,-126,73	2	180	acute
-mc	680,507,213,90,-4,73	1	181	mu
+*m	679,507,205,98,-44,73	0	181	mu
+mc	"
 ps	680,681,0,85,-87,73	2	182	paragraph
 pc	340,358,0,26,-76,26	0	183	periodcentered
 ac	360,0,220,0,-18	1	184	cedilla
@@ -311,7 +634,7 @@
 ^E	720,915,0,107,36,73	2	202	Ecircumflex
 :E	720,900,0,107,36,73	2	203	Edieresis
 `I	380,937,0,155,36,73	2	204	Igrave
-'I	380,937,0,155,36,73	2	205	Iacute
+'I	380,937,0,157,36,73	2	205	Iacute
 ^I	380,915,0,163,36,73	2	206	Icircumflex
 :I	380,900,0,169,36,73	2	207	Idieresis
 -D	760,681,0,95,36,73	2	208	Eth
@@ -342,7 +665,7 @@
 'e	560,771,8,86,-9,73	2	233	eacute
 ^e	560,749,8,86,-9,73	2	234	ecircumflex
 :e	560,734,8,86,-9,73	2	235	edieresis
-`i	380,771,8,94,-33,73	2	236	igrave
+`i	380,771,8,90,-33,73	2	236	igrave
 'i	380,771,8,90,-33,73	2	237	iacute
 ^i	380,749,8,103,-33,73	2	238	icircumflex
 :i	380,734,8,149,-33,73	2	239	idieresis
diff -ruN groff-1.20.1/font/devps/BMI groff-1.21/font/devps/BMI
--- groff-1.20.1/font/devps/BMI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/BMI	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Light Italic
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:12:06 1992
-#   Comment UniqueID 37830
-#   Comment VMusage 33139 40031
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:30:03 1999
+#   Comment UniqueID 44720
+#   Comment VMusage 36234 43170
 
 name BMI
 internalname Bookman-LightItalic
@@ -20,110 +20,390 @@
 ligatures fi fl 0
 
 kernpairs
-A Y -62
-A W -73
-A V -78
 A T -5
-F . -97
-F , -98
+A V -78
+A W -73
+A Y -62
+A 'Y -62
+A :Y -62
+'A T -5
+'A V -78
+'A W -73
+'A Y -62
+'A 'Y -62
+'A :Y -62
+^A T -5
+^A V -78
+^A W -73
+^A Y -62
+^A 'Y -62
+^A :Y -62
+:A T -5
+:A V -78
+:A W -73
+:A Y -62
+:A 'Y -62
+:A :Y -62
+`A T -5
+`A V -78
+`A W -73
+`A Y -62
+`A 'Y -62
+`A :Y -62
+oA T -5
+oA V -78
+oA W -73
+oA Y -62
+oA 'Y -62
+oA :Y -62
+~A T -5
+~A V -78
+~A W -73
+~A Y -62
+~A 'Y -62
+~A :Y -62
 F A -16
-L y 20
-L Y 7
-L W 9
+F 'A -16
+F ^A -16
+F :A -16
+F `A -16
+F oA -16
+F ~A -16
+F , -98
+F . -97
 L V 4
-P . -105
-P , -106
+L W 9
+L Y 7
+L 'Y 7
+L :Y 7
+L y 20
+L 'y 20
+L :y 20
+/L V 4
+/L W 9
+/L Y 7
+/L 'Y 7
+/L :Y 7
+/L y 20
+/L 'y 20
+/L :y 20
 P A -30
-R Y 11
-R W 2
-R V 2
+P 'A -30
+P ^A -30
+P :A -30
+P `A -30
+P oA -30
+P ~A -30
+P , -106
+P . -105
 R T 65
-T ; 48
-T s -7
-T r 67
-T . -78
-T o 14
-T i 71
+R V 2
+R W 2
+R Y 11
+R 'Y 11
+R :Y 11
+T A -14
+T 'A -14
+T ^A -14
+T :A -14
+T `A -14
+T oA -14
+T ~A -14
+T a 9
+T 'a 9
+T ^a 9
+T :a 9
+T `a 9
+T oa 9
+T ~a 9
+T c 16
+T ,c 16
+T : 48
+T , -79
+T e 10
+T 'e 10
+T ^e 10
+T :e 10
+T `e 10
 T - 20
 T hy 20
-T e 10
-T , -79
-T : 48
-T c 16
-T a 9
-T A -14
-V y -14
-V u -10
-V ; -44
-V r -20
-V . -100
-V o -70
-V i 3
+T i 71
+T 'i 71
+T ^i 71
+T :i 71
+T `i 71
+T o 14
+T 'o 14
+T ^o 14
+T :o 14
+T `o 14
+T /o 14
+T ~o 14
+T . -78
+T r 67
+T s -7
+T vs -7
+T ; 48
+V A -70
+V 'A -70
+V ^A -70
+V :A -70
+V `A -70
+V oA -70
+V ~A -70
+V a -70
+V 'a -70
+V ^a -70
+V :a -70
+V `a -70
+V oa -70
+V ~a -70
+V : -35
+V , -109
+V e -70
+V 'e -70
+V ^e -70
+V :e -70
+V `e -70
 V - 20
 V hy 20
-V e -70
-V , -109
-V : -35
-V a -70
-V A -70
-W y -14
-W u -20
-W ; -42
-W r -30
-W . -100
-W o -60
-W i 3
+V i 3
+V 'i 3
+V ^i 3
+V :i 13
+V `i 13
+V o -70
+V 'o -70
+V ^o -70
+V :o -70
+V `o -70
+V /o -70
+V ~o -70
+V . -100
+V r -20
+V ; -44
+V u -10
+V 'u -10
+V ^u -10
+V :u -10
+V `u -10
+V y -14
+V 'y -14
+V :y -14
+W A -60
+W 'A -60
+W ^A -60
+W :A -60
+W `A -60
+W oA -60
+W ~A -60
+W a -60
+W 'a -60
+W ^a -60
+W :a -60
+W `a -60
+W oa -60
+W ~a -60
+W : -35
+W , -109
+W e -60
+W 'e -60
+W ^e -60
+W :e -60
+W `e -60
 W - 20
 W hy 20
-W e -60
-W , -109
-W : -35
-W a -60
-W A -60
-Y v -19
-Y u -31
-Y ; -40
-Y q -72
-Y . -100
-Y p -37
-Y o -75
-Y i -11
+W i 3
+W 'i 3
+W ^i 13
+W :i 13
+W `i 13
+W o -60
+W 'o -60
+W ^o -60
+W :o -60
+W `o -60
+W /o -60
+W ~o -60
+W . -100
+W r -30
+W ; -42
+W u -20
+W 'u -20
+W ^u -20
+W :u -20
+W `u -20
+W y -14
+W 'y -14
+W :y -14
+Y A -82
+Y 'A -82
+Y ^A -82
+Y :A -82
+Y `A -82
+Y oA -82
+Y ~A -82
+Y a -79
+Y 'a -79
+Y ^a -79
+Y :a -79
+Y `a -79
+Y oa -79
+Y ~a -79
+Y : -35
+Y , -109
+Y e -78
+Y 'e -78
+Y ^e -78
+Y :e -78
+Y `e -78
 Y - 20
 Y hy 20
-Y e -78
-Y , -109
-Y : -35
-Y a -79
-Y A -82
+Y i -11
+Y 'i -11
+Y o -75
+Y 'o -75
+Y ^o -75
+Y :o -75
+Y `o -75
+Y /o -75
+Y ~o -75
+Y p -37
+Y . -100
+Y q -72
+Y ; -40
+Y u -31
+Y 'u -31
+Y ^u -31
+Y :u -31
+Y `u -31
+Y v -19
+'Y A -82
+'Y 'A -82
+'Y ^A -82
+'Y :A -82
+'Y `A -82
+'Y oA -82
+'Y ~A -82
+'Y a -79
+'Y 'a -79
+'Y ^a -79
+'Y :a -79
+'Y `a -79
+'Y oa -79
+'Y ~a -79
+'Y : -35
+'Y , -109
+'Y e -78
+'Y 'e -78
+'Y ^e -78
+'Y :e -78
+'Y `e -78
+'Y - 20
+'Y hy 20
+'Y i -11
+'Y 'i -11
+'Y o -75
+'Y 'o -75
+'Y ^o -75
+'Y :o -75
+'Y `o -75
+'Y /o -75
+'Y ~o -75
+'Y p -37
+'Y . -100
+'Y q -72
+'Y ; -40
+'Y u -31
+'Y 'u -31
+'Y ^u -31
+'Y :u -31
+'Y `u -31
+'Y v -19
+:Y A -82
+:Y 'A -82
+:Y ^A -82
+:Y :A -82
+:Y `A -82
+:Y oA -82
+:Y ~A -82
+:Y a -79
+:Y 'a -79
+:Y ^a -79
+:Y :a -79
+:Y `a -79
+:Y oa -79
+:Y ~a -79
+:Y : -35
+:Y , -109
+:Y e -78
+:Y 'e -78
+:Y ^e -78
+:Y :e -78
+:Y `e -78
+:Y - 20
+:Y hy 20
+:Y i -11
+:Y 'i -11
+:Y o -75
+:Y 'o -75
+:Y ^o -75
+:Y :o -75
+:Y `o -75
+:Y /o -75
+:Y ~o -75
+:Y p -37
+:Y . -100
+:Y q -72
+:Y ; -40
+:Y u -31
+:Y 'u -31
+:Y ^u -31
+:Y :u -31
+:Y `u -31
+:Y v -19
 f f -19
-r q -14
-r . -134
-r o -10
-r n 38
-r m 37
+r c -8
+r ,c -8
+r , -143
+r d -9
+r e -15
+r 'e -15
+r ^e -15
+r :e -15
+r `e -15
+r f -9
+r g -3
+r h -20
 r - 20
 r hy 20
-r h -20
-r g -3
-r f -9
-r e -15
-r d -9
-r , -143
-r c -8
+r m 37
+r n 38
+r ~n 38
+r o -10
+r 'o -10
+r ^o -10
+r :o -10
+r `o -10
+r /o -10
+r ~o -10
+r . -134
+r q -14
 
 charset
 ha	600,681,0,49,-47,49	2	0	asciicircum
 ti	600,386,0,45,-41,45	0	1	asciitilde
 vS	640,861,17,78,-11,70	2	2	Scaron
 vZ	580,861,0,165,42,70	2	3	Zcaron
-vs	540,684,8,57,-15,57	2	4	scaron
+vs	540,684,8,61,-15,61	2	4	scaron
 vz	520,684,8,91,12,70	2	5	zcaron
 :Y	660,865,0,199,-37,70	2	6	Ydieresis
 tm	980,681,0,35,-19,35	2	7	trademark
 aq	200,698,0,97,-49,70	2	8	quotesingle
+Eu	620,698,17,125,8,70	2	9	Euro
 space	300	0	32	space
 !	320,698,8,72,-53,70	2	33	exclam
-"	360,698,0,92,-57,70	2	34	quotedbl
+"	360,699,0,92,-57,70	2	34	quotedbl
 dq	"
 #	620,681,0,28,-57,28	2	35	numbersign
 sh	"
@@ -193,8 +473,8 @@
 rs	"
 ]	260,717,136,99,35,70	2	93	bracketright
 rB	"
-a^	440,685,0,89,-126,70	2	94	circumflex
-^	"
+^	440,685,0,89,-126,70	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	280,698,0,100,-141,70	2	96	quoteleft
 oq	"
@@ -224,14 +504,14 @@
 x	540,494,8,136,41,70	0	120	x
 y	600,484,221,59,-10,59	1	121	y
 z	520,494,8,91,12,70	0	122	z
-lC	360,717,191,132,-72,70	2	123	braceleft
-{	"
-ba	600,750,250,0,-244	3	124	bar
-|	"
-rC	380,717,191,3,37,3	2	125	braceright
-}	"
-a~	440,671,0,98,-130,70	2	126	tilde
-~	"
+{	360,717,191,132,-72,70	2	123	braceleft
+lC	"
+|	600,750,250,0,-244	3	124	bar
+ba	"
+}	380,717,191,3,37,3	2	125	braceright
+rC	"
+~	440,671,0,98,-130,70	2	126	tilde
+a~	"
 bq	320,113,114,0,-37	0	128	quotesinglbase
 Fo	300,434,0,63,-20,63	0	129	guillemotleft
 Fc	300,434,0,53,-10,53	0	130	guillemotright
@@ -247,16 +527,16 @@
 fl	660,725,218,103,209,70	3	141	fl
 .i	280,484,8,121,-38,70	0	144	dotlessi
 ga	340,706,0,87,-132,70	2	146	grave
-a"	340,738,0,112,-117,70	2	147	hungarumlaut
-a.	260,664,0,80,-119,70	2	148	dotaccent
+a"	340,694,0,230,-138,70	2	147	hungarumlaut
+a.	260,693,0,100,-139,70	2	148	dotaccent
 ab	440,680,0,110,-141,70	2	149	breve
-ah	440,684,0,91,-128,70	2	150	caron
+ah	440,684,0,131,-168,70	2	150	caron
 ao	300,706,0,84,-128,70	2	151	ring
-ho	260,0,173,0,-1	0	152	ogonek
+ho	260,0,153,72,-21,70	0	152	ogonek
 lq	440,698,0,103,-141,70	2	153	quotedblleft
 rq	440,698,0,61,-98,61	2	154	quotedblright
 oe	900,494,8,98,-15,70	0	155	oe
-/l	340,717,8,108,0,70	2	156	lslash
+/l	340,717,8,83,17,70	2	156	lslash
 Bq	480,113,114,0,-37	0	157	quotedblbase
 OE	1180,698,17,107,-38,70	2	158	OE
 /L	580,681,0,126,29,70	2	159	Lslash
@@ -267,7 +547,7 @@
 Ye	620,681,0,165,-21,70	2	165	yen
 bb	600,675,175,0,-244	2	166	brokenbar
 sc	620,698,178,68,12,68	2	167	section
-ad	420,688,0,97,-135,70	2	168	dieresis
+ad	420,661,0,97,-135,70	0	168	dieresis
 co	740,698,17,94,-34,70	2	169	copyright
 Of	440,698,0,123,-80,70	2	170	ordfeminine
 fo	180,434,0,78,-25,70	0	171	guilsinglleft
@@ -279,8 +559,9 @@
 t+-	600,548,0,45,-41,45	0	177	plusminus
 S2	372,698,0,117,-18,70	2	178	twosuperior
 S3	372,698,0,117,-20,70	2	179	threesuperior
-aa	320,706,0,103,-128,70	2	180	acute
-mc	620,484,221,116,-3,70	1	181	mu
+aa	320,706,0,133,-158,70	2	180	acute
+*m	640,484,205,79,-48,70	0	181	mu
+mc	"
 ps	620,681,0,148,-62,70	2	182	paragraph
 pc	300,364,0,22,-87,22	0	183	periodcentered
 ac	320,0,178,0,5	0	184	cedilla
@@ -304,7 +585,7 @@
 ^E	680,862,0,106,29,70	2	202	Ecircumflex
 :E	680,865,0,106,29,70	2	203	Edieresis
 `I	320,883,0,142,29,70	2	204	Igrave
-'I	320,883,0,142,29,70	2	205	Iacute
+'I	320,883,0,163,29,70	2	205	Iacute
 ^I	320,862,0,179,29,70	2	206	Icircumflex
 :I	320,865,0,177,29,70	2	207	Idieresis
 -D	740,681,0,92,29,70	2	208	Eth
@@ -336,7 +617,7 @@
 ^e	540,685,8,85,-15,70	2	234	ecircumflex
 :e	540,688,8,85,-15,70	2	235	edieresis
 `i	280,706,8,121,-38,70	2	236	igrave
-'i	280,706,8,121,-38,70	2	237	iacute
+'i	280,706,8,133,-38,70	2	237	iacute
 ^i	280,685,8,149,-26,70	2	238	icircumflex
 :i	280,688,8,147,-38,70	2	239	idieresis
 Sd	540,725,8,152,-15,70	2	240	eth
diff -ruN groff-1.20.1/font/devps/BMR groff-1.21/font/devps/BMR
--- groff-1.20.1/font/devps/BMR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/BMR	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Bookman Light
-#   Version 001.004
+#   Version 003.001
 #   FamilyName ITC Bookman
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1992 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Tue Jan 21 16:15:53 1992
-#   Comment UniqueID 37833
-#   Comment VMusage 32321 39213
+#   Notice Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Bookman is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1992, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:27:36 1999
+#   Comment UniqueID 44719
+#   Comment VMusage 35588 42524
 
 name BMR
 internalname Bookman-Light
@@ -19,93 +19,398 @@
 ligatures fi fl 0
 
 kernpairs
-A y 32
-A w 4
-A v 7
-A Y -35
-A W -40
-A V -56
 A T 1
-F . -46
-F , -41
+A V -56
+A W -40
+A Y -35
+A 'Y -35
+A :Y -35
+A v 7
+A w 4
+A y 32
+A 'y 32
+A :y 32
+'A T 1
+'A V -56
+'A W -40
+'A Y -35
+'A 'Y -35
+'A :Y -35
+'A v 7
+'A w 4
+'A y 32
+'A 'y 32
+'A :y 32
+^A T 1
+^A V -56
+^A W -40
+^A Y -35
+^A 'Y -35
+^A :Y -35
+^A v 7
+^A w 4
+^A y 32
+^A 'y 32
+^A :y 32
+:A T 1
+:A V -56
+:A W -40
+:A Y -35
+:A 'Y -35
+:A :Y -35
+:A v 7
+:A w 4
+:A y 32
+:A 'y 32
+:A :y 32
+`A T 1
+`A V -56
+`A W -40
+`A Y -35
+`A 'Y -35
+`A :Y -35
+`A v 7
+`A w 4
+`A y 32
+`A 'y 32
+`A :y 32
+oA T 1
+oA V -56
+oA W -40
+oA Y -35
+oA 'Y -35
+oA :Y -35
+oA v 7
+oA w 4
+oA y 32
+oA 'y 32
+oA :y 32
+~A T 1
+~A V -56
+~A W -40
+~A Y -35
+~A 'Y -35
+~A :Y -35
+~A v 7
+~A w 4
+~A y 32
+~A 'y 32
+~A :y 32
 F A -21
-L y 79
-L Y 13
-L W 1
-L V -4
+F 'A -21
+F ^A -21
+F :A -21
+F `A -21
+F oA -21
+F ~A -21
+F , -41
+F . -46
 L T 28
-P . -60
-P , -55
+L V -4
+L W 1
+L Y 13
+L 'Y 13
+L :Y 13
+L y 79
+L 'y 79
+L :y 79
+/L T 28
+/L V -4
+/L W 1
+/L Y 13
+/L 'Y 13
+/L :Y 13
+/L y 79
+/L 'y 79
+/L :y 79
 P A -8
-R y 59
-R Y 26
-R W 13
-R V 8
+P 'A -8
+P ^A -8
+P :A -8
+P `A -8
+P oA -8
+P ~A -8
+P , -55
+P . -60
 R T 71
-T s 16
-T r 38
-T . -33
-T o 15
-T i 42
+R V 8
+R W 13
+R Y 26
+R 'Y 26
+R :Y 26
+R y 59
+R 'y 59
+R :y 59
+T A 1
+T 'A 1
+T ^A 1
+T :A 1
+T `A 1
+T oA 1
+T ~A 1
+T a 17
+T 'a 17
+T ^a 17
+T :a 17
+T `a 17
+T oa 17
+T ~a 17
+T c 14
+T ,c 14
+T , -28
+T e 13
+T 'e 13
+T ^e 13
+T :e 13
+T `e 13
 T - 90
 T hy 90
-T e 13
-T , -28
-T c 14
-T a 17
-T A 1
-V y 15
-V u -38
-V r -41
-V . -40
-V o -71
-V i -20
+T i 42
+T 'i 42
+T ^i 42
+T :i 42
+T `i 42
+T o 15
+T 'o 15
+T ^o 15
+T :o 15
+T `o 15
+T /o 15
+T ~o 15
+T . -33
+T r 38
+T s 16
+T vs 16
+V A -66
+V 'A -66
+V ^A -66
+V :A -66
+V `A -66
+V oA -66
+V ~A -66
+V a -69
+V 'a -69
+V ^a -69
+V :a -69
+V `a -69
+V oa -69
+V ~a -69
+V , -34
+V e -72
+V 'e -72
+V ^e -72
+V :e -72
+V `e -72
 V - 11
 V hy 11
-V e -72
-V , -34
-V a -69
-V A -66
-W y 15
-W u -38
-W r -41
-W . -40
-W o -68
-W i -20
+V i -20
+V 'i -20
+V o -71
+V 'o -71
+V ^o -71
+V :o -71
+V `o -71
+V /o -71
+V ~o -71
+V . -40
+V r -41
+V u -38
+V 'u -38
+V ^u -38
+V :u -38
+V `u -38
+V y 15
+V 'y 15
+V :y 15
+W A -64
+W 'A -64
+W ^A -64
+W :A -64
+W `A -64
+W oA -64
+W ~A -64
+W a -66
+W 'a -66
+W ^a -66
+W :a -66
+W `a -66
+W oa -66
+W ~a -66
+W , -34
+W e -69
+W 'e -69
+W ^e -69
+W :e -69
+W `e -69
 W - 11
 W hy 11
-W e -69
-W , -34
-W a -66
-W A -64
-Y v 15
-Y u -38
-Y q -55
-Y . -40
-Y p -31
-Y o -57
-Y i -37
+W i -20
+W 'i -20
+W o -68
+W 'o -68
+W ^o -68
+W :o -68
+W `o -68
+W /o -68
+W ~o -68
+W . -40
+W r -41
+W u -38
+W 'u -38
+W ^u -38
+W :u -38
+W `u -38
+W y 15
+W 'y 15
+W :y 15
+Y A -53
+Y 'A -53
+Y ^A -53
+Y :A -53
+Y `A -53
+Y oA -53
+Y ~A -53
+Y a -54
+Y 'a -54
+Y ^a -54
+Y :a -54
+Y `a -54
+Y oa -54
+Y ~a -54
+Y , -34
+Y e -58
+Y 'e -58
+Y ^e -58
+Y :e -58
+Y `e -58
 Y - 11
 Y hy 11
-Y e -58
-Y , -34
-Y a -54
-Y A -53
+Y i -37
+Y 'i -37
+Y ^i -37
+Y o -57
+Y 'o -57
+Y ^o -57
+Y :o -57
+Y `o -57
+Y /o -57
+Y ~o -57
+Y p -31
+Y . -40
+Y q -55
+Y u -38
+Y 'u -38
+Y ^u -38
+Y :u -38
+Y `u -38
+Y v 15
+'Y A -53
+'Y 'A -53
+'Y ^A -53
+'Y :A -53
+'Y `A -53
+'Y oA -53
+'Y ~A -53
+'Y a -54
+'Y 'a -54
+'Y ^a -54
+'Y :a -54
+'Y `a -54
+'Y oa -54
+'Y ~a -54
+'Y , -34
+'Y e -58
+'Y 'e -58
+'Y ^e -58
+'Y :e -58
+'Y `e -58
+'Y - 11
+'Y hy 11
+'Y i -37
+'Y 'i -37
+'Y o -57
+'Y 'o -57
+'Y ^o -57
+'Y :o -57
+'Y `o -57
+'Y /o -57
+'Y ~o -57
+'Y p -31
+'Y . -40
+'Y q -55
+'Y u -38
+'Y 'u -38
+'Y ^u -38
+'Y :u -38
+'Y `u -38
+'Y v 15
+:Y A -53
+:Y 'A -53
+:Y ^A -53
+:Y :A -53
+:Y `A -53
+:Y oA -53
+:Y ~A -53
+:Y a -54
+:Y 'a -54
+:Y ^a -54
+:Y :a -54
+:Y `a -54
+:Y oa -54
+:Y ~a -54
+:Y , -34
+:Y e -58
+:Y 'e -58
+:Y ^e -58
+:Y :e -58
+:Y `e -58
+:Y - 11
+:Y hy 11
+:Y i -37
+:Y 'i -37
+:Y o -57
+:Y 'o -57
+:Y ^o -57
+:Y :o -57
+:Y `o -57
+:Y /o -57
+:Y ~o -57
+:Y p -31
+:Y . -40
+:Y q -55
+:Y u -38
+:Y 'u -38
+:Y ^u -38
+:Y :u -38
+:Y `u -38
+:Y v 15
 f f 29
-r q 9
-r . -64
-r o 8
-r n 31
-r m 31
+r c 7
+r ,c 7
+r , -58
+r d 7
+r e 7
+r 'e 7
+r ^e 7
+r :e 7
+r `e 7
+r f 33
+r g -4
+r h -21
 r - 70
 r hy 70
-r h -21
-r g -4
-r f 33
-r e 7
-r d 7
-r , -58
-r c 7
+r m 31
+r n 31
+r ~n 31
+r o 8
+r 'o 8
+r ^o 8
+r :o 8
+r `o 8
+r /o 8
+r ~o 8
+r . -64
+r q 9
 
 charset
 ha	600,681	2	0	asciicircum
@@ -117,6 +422,7 @@
 :Y	640,851,0,26,30	2	6	Ydieresis
 tm	980,681	2	7	trademark
 aq	220,698	2	8	quotesingle
+Eu	620,698,17	2	9	Euro
 space	320	0	32	space
 !	300,698,8	2	33	exclam
 "	380,698	2	34	quotedbl
@@ -189,8 +495,8 @@
 rs	"
 ]	300,717,136	2	93	bracketright
 rB	"
-a^	420,685	2	94	circumflex
-^	"
+^	420,685	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	220,698	2	96	quoteleft
 oq	"
@@ -220,14 +526,14 @@
 x	560,484,0,16,16	0	120	x
 y	540,484,236,9,23	1	121	y
 z	480,484	0	122	z
-lC	280,717,136	2	123	braceleft
-{	"
-ba	600,750,250	3	124	bar
-|	"
-rC	280,717,136	2	125	braceright
-}	"
-a~	440,661	0	126	tilde
-~	"
+{	280,717,136	2	123	braceleft
+lC	"
+|	600,750,250	3	124	bar
+ba	"
+}	280,717,136	2	125	braceright
+rC	"
+~	440,661	0	126	tilde
+a~	"
 bq	220,110,108	0	128	quotesinglbase
 Fo	360,437	0	129	guillemotleft
 Fc	360,437	0	130	guillemotright
@@ -244,11 +550,11 @@
 .i	300,484	0	144	dotlessi
 ga	340,689	2	146	grave
 a"	380,698	2	147	hungarumlaut
-a.	260,672	2	148	dotaccent
+a.	260,684	2	148	dotaccent
 ab	460,687	2	149	breve
 ah	420,672	2	150	caron
 ao	320,731	2	151	ring
-ho	320,0,145	0	152	ogonek
+ho	320,0,153	0	152	ogonek
 lq	400,698	2	153	quotedblleft
 rq	400,698	2	154	quotedblright
 oe	900,494,8	0	155	oe
@@ -263,7 +569,7 @@
 Ye	620,681,0,27,22	2	165	yen
 bb	600,675,175	2	166	brokenbar
 sc	520,698,178	2	167	section
-ad	420,674	2	168	dieresis
+ad	420,655	0	168	dieresis
 co	740,698,17	2	169	copyright
 Of	420,698	2	170	ordfeminine
 fo	240,437	0	171	guilsinglleft
@@ -276,7 +582,8 @@
 S2	372,698	2	178	twosuperior
 S3	372,698	2	179	threesuperior
 aa	340,689	2	180	acute
-mc	680,484,251	1	181	mu
+*m	627,484,205	0	181	mu
+mc	"
 ps	600,681	2	182	paragraph
 pc	320,327	0	183	periodcentered
 ac	320,0,200	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/CB groff-1.21/font/devps/CB
--- groff-1.20.1/font/devps/CB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/CB	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Courier Bold
 #   Version 004.000
@@ -100,8 +100,8 @@
 rs	"
 ]	600,643,86	2	93	bracketright
 rB	"
-a^	600,679	2	94	circumflex
-^	"
+^	600,679	2	94	circumflex
+a^	"
 _	600,0,249	1	95	underscore
 `	600,572	2	96	quoteleft
 oq	"
@@ -131,14 +131,14 @@
 x	600,434	0	120	x
 y	600,434,183	1	121	y
 z	600,434	0	122	z
-lC	600,764,228	3	123	braceleft
-{	"
-ba	600,750,249	3	124	bar
-|	"
-rC	600,764,228	3	125	braceright
-}	"
-a~	600,644	2	126	tilde
-~	"
+{	600,764,228	3	123	braceleft
+lC	"
+|	600,750,249	3	124	bar
+ba	"
+}	600,764,228	3	125	braceright
+rC	"
+~	600,644	2	126	tilde
+a~	"
 bq	600,163,100	0	128	quotesinglbase
 Fo	600,423	0	129	guillemotleft
 Fc	600,423	0	130	guillemotright
@@ -187,7 +187,8 @@
 S2	600,607	2	178	twosuperior
 S3	600,607	2	179	threesuperior
 aa	600,678	2	180	acute
-mc	600,434,167	0	181	mu
+*m	600,434,167	0	181	mu
+mc	"
 ps	600,745,154	2	182	paragraph
 pc	600,386	0	183	periodcentered
 ac	600,0,207	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/CBI groff-1.21/font/devps/CBI
--- groff-1.20.1/font/devps/CBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/CBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Courier Bold Oblique
 #   Version 004.000
@@ -101,8 +101,8 @@
 rs	"
 ]	600,643,86,0,-34	2	93	bracketright
 rB	"
-a^	600,679,0,60,-153,60	2	94	circumflex
-^	"
+^	600,679,0,60,-153,60	2	94	circumflex
+a^	"
 _	600,0,249,12,99,12	1	95	underscore
 `	600,572,0,0,-271	2	96	quoteleft
 oq	"
@@ -132,14 +132,14 @@
 x	600,434,0,91,32,67	0	120	x
 y	600,434,183,124,39,67	1	121	y
 z	600,434,0,41,-42,41	0	122	z
-lC	600,764,228,78,-113,67	3	123	braceleft
-{	"
-ba	600,750,249,0,-176	3	124	bar
-|	"
-rC	600,764,228,0,-26	3	125	braceright
-}	"
-a~	600,644,0,98,-150,67	2	126	tilde
-~	"
+{	600,764,228,78,-113,67	3	123	braceleft
+lC	"
+|	600,750,249,0,-176	3	124	bar
+ba	"
+}	600,764,228,0,-26	3	125	braceright
+rC	"
+~	600,644,0,98,-150,67	2	126	tilde
+a~	"
 bq	600,163,100,0,-83	0	128	quotesinglbase
 Fo	600,423,0,80,-34,67	0	129	guillemotleft
 Fc	600,423,0,53,-7,53	0	130	guillemotright
@@ -188,7 +188,8 @@
 S2	600,607,0,0,-141	2	178	twosuperior
 S3	600,607,0,0,-140	2	179	threesuperior
 aa	600,678,0,64,-233,64	2	180	acute
-mc	600,434,167,46,-18,46	0	181	mu
+*m	600,434,167,46,-18,46	0	181	mu
+mc	"
 ps	600,745,154,105,-143,67	2	182	paragraph
 pc	600,386,0,0,-213	0	183	periodcentered
 ac	600,0,207,0,-154	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/CI groff-1.21/font/devps/CI
--- groff-1.20.1/font/devps/CI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/CI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Courier Oblique
 #   Version 004.000
@@ -101,8 +101,8 @@
 rs	"
 ]	600,648,97,0,-43	2	93	bracketright
 rB	"
-a^	600,667,0,40,-162,40	2	94	circumflex
-^	"
+^	600,667,0,40,-162,40	2	94	circumflex
+a^	"
 _	600,0,249,12,99,12	1	95	underscore
 `	600,572,0,0,-285	2	96	quoteleft
 oq	"
@@ -132,14 +132,14 @@
 x	600,434,0,90,28,67	0	120	x
 y	600,434,194,125,22,67	1	121	y
 z	600,434,0,41,-53,41	0	122	z
-lC	600,764,230,19,-176,19	3	123	braceleft
-{	"
-ba	600,750,249,0,-176	3	124	bar
-|	"
-rC	600,764,230,0,-85	3	125	braceright
-}	"
-a~	600,639,0,71,-155,67	2	126	tilde
-~	"
+{	600,764,230,19,-176,19	3	123	braceleft
+lC	"
+|	600,750,249,0,-176	3	124	bar
+ba	"
+}	600,764,230,0,-85	3	125	braceright
+rC	"
+~	600,639,0,71,-155,67	2	126	tilde
+a~	"
 bq	600,127,123,0,-111	0	128	quotesinglbase
 Fo	600,414,0,38,-78,38	0	129	guillemotleft
 Fc	600,414,0,9,-49,9	0	130	guillemotright
@@ -188,7 +188,8 @@
 S2	600,579,0,0,-181	2	178	twosuperior
 S3	600,579,0,0,-186	2	179	threesuperior
 aa	600,666,0,32,-219,32	2	180	acute
-mc	600,434,167,34,-27,34	0	181	mu
+*m	600,434,167,34,-27,34	0	181	mu
+mc	"
 ps	600,745,154,105,-143,67	2	182	paragraph
 pc	600,338,0,0,-239	0	183	periodcentered
 ac	600,0,182,0,-161	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/CR groff-1.21/font/devps/CR
--- groff-1.20.1/font/devps/CR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/CR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Courier
 #   Version 004.000
@@ -100,8 +100,8 @@
 rs	"
 ]	600,648,97	2	93	bracketright
 rB	"
-a^	600,667	2	94	circumflex
-^	"
+^	600,667	2	94	circumflex
+a^	"
 _	600,0,249	1	95	underscore
 `	600,572	2	96	quoteleft
 oq	"
@@ -131,14 +131,14 @@
 x	600,434	0	120	x
 y	600,434,194	1	121	y
 z	600,434	0	122	z
-lC	600,764,230	3	123	braceleft
-{	"
-ba	600,750,249	3	124	bar
-|	"
-rC	600,764,230	3	125	braceright
-}	"
-a~	600,639	2	126	tilde
-~	"
+{	600,764,230	3	123	braceleft
+lC	"
+|	600,750,249	3	124	bar
+ba	"
+}	600,764,230	3	125	braceright
+rC	"
+~	600,639	2	126	tilde
+a~	"
 bq	600,127,123	0	128	quotesinglbase
 Fo	600,414	0	129	guillemotleft
 Fc	600,414	0	130	guillemotright
@@ -187,7 +187,8 @@
 S2	600,579	2	178	twosuperior
 S3	600,579	2	179	threesuperior
 aa	600,666	2	180	acute
-mc	600,434,167	0	181	mu
+*m	600,434,167	0	181	mu
+mc	"
 ps	600,745,154	2	182	paragraph
 pc	600,338	0	183	periodcentered
 ac	600,0,182	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/EURO groff-1.21/font/devps/EURO
--- groff-1.20.1/font/devps/EURO	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/EURO	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName FreeEuro
 #   Version 001.001
diff -ruN groff-1.20.1/font/devps/generate/symbolchars groff-1.21/font/devps/generate/symbolchars
--- groff-1.20.1/font/devps/generate/symbolchars	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/generate/symbolchars	2010-12-31 08:33:09.000000000 +0100
@@ -1,65 +1,13 @@
 #
 # Additional predefined groff symbols for special fonts.
 #
-plus pl
-minus mi
-plusminus +-
-equal eq
+arrowdown arrowvertbt
+arrowup arrowverttp
 divide di
-multiply mu
+equal eq
 logicalnot no
-arrowup arrowverttp
-arrowdown arrowvertbt
-Alpha *A
-Beta *B
-Chi *X
-Delta *D
-Epsilon *E
-Eta *Y
-Gamma *G
-Iota *I
-Kappa *K
-Lambda *L
-Mu *M
-Nu *N
-Omega *W
-Omicron *O
-Phi *F
-Pi *P
-Psi *Q
-Rho *R
-Sigma *S
-Tau *T
-Theta *H
+minus mi
+multiply mu
+plusminus +-
+plus pl
 Upsilon1 *U
-Xi *C
-Zeta *Z
-alpha *a
-beta *b
-chi *x
-delta *d
-epsilon *e
-uni03F5 +e
-eta *y
-gamma *g
-iota *i
-kappa *k
-lambda *l
-mu *m
-nu *n
-omega *w
-omega1 +p
-omicron *o
-phi *f
-phi1 +f
-pi *p
-psi *q
-rho *r
-sigma *s
-sigma1 ts
-tau *t
-theta *h
-theta1 +h
-upsilon *u
-xi *c
-zeta *z
diff -ruN groff-1.20.1/font/devps/generate/textmap groff-1.21/font/devps/generate/textmap
--- groff-1.20.1/font/devps/generate/textmap	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/generate/textmap	2010-12-31 08:33:09.000000000 +0100
@@ -1,112 +1,31 @@
 #
 # Predefined groff symbols for textual fonts.
 #
+a14 rh
 a a
-b b
-c c
-d d
-e e
-f f
-g g
-h h
-i i
-j j
-k k
-l l
-m m
-n n
-o o
-p p
-q q
-r r
-s s
-t t
-u u
-v v
-w w
-x x
-y y
-z z
 A A
-B B
-C C
-D D
-E E
-F F
-G G
-H H
-I I
-J J
-K K
-L L
-M M
-N N
-O O
-P P
-Q Q
-R R
-S S
-T T
-U U
-V V
-W W
-X X
-Y Y
-Z Z
-AE AE
-Aacute 'A
-Acircumflex ^A
-Adieresis :A
-Agrave `A
-Aring oA
-Atilde ~A
-Cacute 'C
-Ccedilla ,C
-Eacute 'E
-Ecircumflex ^E
-Edieresis :E
-Egrave `E
-Eth -D
-Euro Eu
-IJ IJ
-Iacute 'I
-Icircumflex ^I
-Idieresis :I
-Ifraktur Im
-Igrave `I
-Lslash /L
-Ntilde ~N
-OE OE
-Oacute 'O
-Ocircumflex ^O
-Odieresis :O
-Ograve `O
-Oslash /O
-Otilde ~O
-Rfraktur Re
-Scaron vS
-Thorn TP
-Uacute 'U
-Ucircumflex ^U
-Udieresis :U
-Ugrave `U
-Yacute 'Y
-Ydieresis :Y
-Zcaron vZ
-a14 rh
 aacute 'a
+Aacute 'A
 acircumflex ^a
+Acircumflex ^A
 acute aa
 adieresis :a
+Adieresis :A
 ae ae
+AE AE
 agrave `a
+Agrave `A
+aleph Ah
+alpha *a
+Alpha *A
+ampersand &
 angle /_
 angleleft la
 angleright ra
-aleph Ah
-ampersand &
 approxequal ~~
+approxequal ~=
 aring oa
+Aring oA
 arrowboth <>
 arrowdblboth hA
 arrowdbldown dA
@@ -114,10 +33,12 @@
 arrowdblright rA
 arrowdblup uA
 arrowdown da
+arrowhorizex an
 arrowleft <-
 arrowright ->
-arrowup ua
 arrowupdn va
+arrowup ua
+arrowvertex arrowvertex
 asciicircum ha
 asciitilde ti
 asterisk *
@@ -125,41 +46,87 @@
 at @
 at at
 atilde ~a
+Atilde ~A
 backslash \
 backslash rs
-bar ba
 bar |
-braceleft lC
+bar ba
+b b
+B B
+beta *b
+Beta *B
+braceex barex
+braceex braceex
+braceex braceleftex
+braceex bracerightex
+braceex bv
 braceleft {
-braceright rC
+braceleftbt braceleftbt
+braceleftbt lb
+braceleft lC
+braceleftmid braceleftmid
+braceleftmid lk
+bracelefttp bracelefttp
+bracelefttp lt
 braceright }
+bracerightbt bracerightbt
+bracerightbt rb
+bracerightmid bracerightmid
+bracerightmid rk
+braceright rC
+bracerighttp bracerighttp
+bracerighttp rt
 bracketleft [
+bracketleftbt bracketleftbt
+bracketleftbt lf
+bracketleftex bracketleftex
 bracketleft lB
+bracketlefttp bracketlefttp
+bracketlefttp lc
 bracketright ]
+bracketrightbt bracketrightbt
+bracketrightbt rf
+bracketrightex bracketrightex
 bracketright rB
+bracketrighttp bracketrighttp
+bracketrighttp rc
 breve ab
 brokenbar bb
 bullet bu
 cacute 'c
+Cacute 'C
 caron ah
+carriagereturn CR
+c c
+C C
 ccedilla ,c
+Ccedilla ,C
 cedilla ac
 cent ct
 checkmark OK
+chi *x
+Chi *X
 circle ci
 circlemultiply c*
 circleplus c+
-circumflex a^
 circumflex ^
+circumflex a^
+club CL
 colon :
 comma ,
 congruent =~
 copyright co
 currency Cs
-dagger dg
 daggerdbl dd
+dagger dg
+d d
+D D
 degree de
+delta *d
+Delta *D
+diamond DI
 dieresis ad
+divide tdi
 dollar $
 dollar Do
 dotaccent a.
@@ -167,20 +134,34 @@
 dotlessj .j
 dotmath md
 eacute 'e
+Eacute 'E
 ecircumflex ^e
+Ecircumflex ^E
 edieresis :e
+Edieresis :E
+e e
+E E
 egrave `e
+Egrave `E
 eight 8
 element mo
 emdash em
 emptyset es
 endash en
+epsilon *e
+Epsilon *E
 equal =
 equivalence ==
+eta *y
+Eta *Y
+Eth -D
 eth Sd
+Euro Eu
 exclam !
 exclamdown r!
 existential te
+f f
+F F
 ff ff
 ffi Fi
 ffl Fl
@@ -190,7 +171,12 @@
 fl fl
 florin Fn
 four 4
+fraction f/
+gamma *g
+Gamma *G
 germandbls ss
+g g
+G G
 gradient gr
 grave ga
 greater >
@@ -199,236 +185,250 @@
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
+heart HE
+h h
+H H
 hungarumlaut a"
 hyphen -
 hyphen hy
 iacute 'i
+Iacute 'I
 icircumflex ^i
+Icircumflex ^I
 idieresis :i
+Idieresis :I
+Ifraktur Im
 igrave `i
+Igrave `I
+i i
+I I
 ij ij
+IJ IJ
 infinity if
-integral is
-integral integral
 # the next line overrides the (old) PUA value of the AGL
 integralex u23AE
+integral integral
+integral is
 intersection ca
+iota *i
+Iota *I
+j j
+J J
+kappa *k
+Kappa *K
+k k
+K K
+lambda *l
+Lambda *L
 less <
 lessequal <=
+l l
+L L
 logicaland AN
 logicalnot tno
 logicalor OR
 lozenge lz
 lslash /l
+Lslash /L
 macron a-
 minus \-
 minute fm
+m m
+M M
+mu1 mc
+multiply tmu
+mu *m
+Mu *M
+# if there is "mu1" glyph in the font - comment out the following line
+mu mc
 nine 9
+n n
+N N
 notelement nm
 notequal !=
 notsubset nb
 ntilde ~n
+Ntilde ~N
 numbersign #
 numbersign sh
+nu *n
+Nu *N
 oacute 'o
+Oacute 'O
 ocircumflex ^o
+Ocircumflex ^O
 odieresis :o
+Odieresis :O
 oe oe
+OE OE
 ogonek ho
 ograve `o
+Ograve `O
+omega1 +p
+omega *w
+Omega *W
+omicron *o
+Omicron *O
 one 1
 oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
+o o
+O O
 ordfeminine Of
 ordmasculine Om
 oslash /o
+Oslash /O
 otilde ~o
+Otilde ~O
+overline rn
 paragraph ps
 parenleft (
+parenleftbt parenleftbt
+parenleftex parenleftex
+parenlefttp parenlefttp
 parenright )
+parenrightbt parenrightbt
+parenrightex parenrightex
+parenrighttp parenrighttp
 partialdiff pd
 percent %
 period .
 periodcentered pc
-perthousand %0
 perpendicular pp
+perthousand %0
+phi1 +f
+phi *f
+Phi *F
+pi *p
+Pi *P
 plus +
+plusminus t+-
+p p
+P P
+product product
 propersubset sb
 propersuperset sp
 proportional pt
+psi *q
+Psi *Q
+q q
+Q Q
 question ?
 questiondown r?
 quotedbl "
-quotedbl dq
 quotedblbase Bq
+quotedbl dq
 quotedblleft lq
 quotedblright rq
 quoteleft `
 quoteleft oq
 quoteright '
 quoteright cq
-quotesingle aq
 quotesinglbase bq
+quotesingle aq
+radicalex radicalex
+radical sqrt
+radical sr
 reflexsubset ib
 reflexsuperset ip
 registered rg
+Rfraktur Re
+rho *r
+Rho *R
 ring ao
+r r
+R R
 scaron vs
+Scaron vS
 second sd
 section sc
 semicolon ;
 seven 7
 seveneighths 78
+SF110000 br
+sigma1 ts
+sigma *s
+Sigma *S
 similar ap
 six 6
 slash /
 slash sl
+spade SP
+s s
+S S
 sterling Po
+suchthat st
+summation sum
+tau *t
+Tau *T
 therefore 3d
 therefore tf
+theta1 +h
+theta *h
+Theta *H
 thorn Tp
+Thorn TP
 three 3
 threeeighths 38
 threequarters 34
 threesuperior S3
-tilde a~
 tilde ~
+tilde a~
 trademark tm
+t t
+T T
 two 2
 twosuperior S2
 uacute 'u
+Uacute 'U
 ucircumflex ^u
+Ucircumflex ^U
 udieresis :u
+Udieresis :U
 ugrave `u
+Ugrave `U
 underscore _
+uni03F5 +e
 uni210F -h
 uni210F hbar
+uni21D5 vA
 uni2210 coproduct
 uni2213 -+
 uni2243 |=
 uni2262 ne
+uni226A >>
+uni226B <<
 uni2285 nc
 uni25A1 sq
 uni261C lh
 union cu
 universal fa
+upsilon *u
+Upsilon *U
+u u
+U U
+v v
+V V
 weierstrass wp
+w w
+W W
+xi *c
+Xi *C
+x x
+X X
 yacute 'y
+Yacute 'Y
 ydieresis :y
+Ydieresis :Y
 yen Ye
+y y
+Y Y
 zcaron vz
+Zcaron vZ
 zero 0
-fraction f/
-club CL
-diamond DI
-heart HE
-spade SP
-carriagereturn CR
-suchthat st
-bracelefttp bracelefttp
-braceleftmid braceleftmid
-braceleftbt braceleftbt
-braceex braceex
-braceex bracerightex
-braceex braceleftex
-braceex barex
-bracerighttp bracerighttp
-bracerightmid bracerightmid
-bracerightbt bracerightbt
-parenlefttp parenlefttp
-parenleftbt parenleftbt
-parenleftex parenleftex
-parenrighttp parenrighttp
-parenrightbt parenrightbt
-parenrightex parenrightex
-bracketlefttp bracketlefttp
-bracketleftbt bracketleftbt
-bracketleftex bracketleftex
-bracketrighttp bracketrighttp
-bracketrightbt bracketrightbt
-bracketrightex bracketrightex
-radical sr
-radical sqrt
-radicalex radicalex
-approxequal ~=
-bracketlefttp lc
-bracketleftbt lf
-bracketrighttp rc
-bracketrightbt rf
-bracelefttp lt
-braceleftmid lk
-braceleftbt lb
-braceex bv
-bracerighttp rt
-bracerightmid rk
-bracerightbt rb
-summation sum
-product product
-arrowvertex arrowvertex
-arrowhorizex an
-multiply tmu
-divide tdi
-plusminus t+-
-Alpha	*A
-Beta	*B
-Chi	*X
-Delta	*D
-Epsilon	*E
-Eta	*Y
-Gamma	*G
-Iota	*I
-Kappa	*K
-Lambda	*L
-Mu	*M
-Nu	*N
-Omega	*W
-Omicron	*O
-Phi	*F
-Pi	*P
-Psi	*Q
-Rho	*R
-Sigma	*S
-Tau	*T
-Theta	*H
-Upsilon	*U
-Xi	*C
-Zeta	*Z
-alpha	*a
-beta	*b
-chi	*x
-delta	*d
-epsilon	*e
-uni03F5	+e
-eta	*y
-gamma	*g
-iota	*i
-kappa	*k
-lambda	*l
-mu	*m
-nu	*n
-omega	*w
-omega1	+p
-omicron	*o
-phi	*f
-phi1	+f
-pi	*p
-psi	*q
-rho	*r
-sigma	*s
-sigma1	ts
-tau	*t
-theta	*h
-theta1	+h
-upsilon	*u
-xi	*c
-zeta	*z
-overline	rn
-uni21D5	vA
-uni226A	>>
-uni226B	<<
-SF110000	br
-mu1	mc
-# if there is "mu1" glyph in the font - comment out the following line
-mu	mc
+zeta *z
+Zeta *Z
+z z
+Z Z
diff -ruN groff-1.20.1/font/devps/HB groff-1.21/font/devps/HB
--- groff-1.20.1/font/devps/HB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HB	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Bold
 #   Version 003.001
@@ -1308,8 +1308,8 @@
 rs	"
 ]	333,722,196	2	93	bracketright
 rB	"
-a^	333,750,0,10,10	2	94	circumflex
-^	"
+^	333,750,0,10,10	2	94	circumflex
+a^	"
 _	556,0,125	0	95	underscore
 `	278,727	2	96	quoteleft
 oq	"
@@ -1339,14 +1339,14 @@
 x	556,532	0	120	x
 y	556,532,214	1	121	y
 z	500,532	0	122	z
-lC	389,722,196	2	123	braceleft
-{	"
-ba	280,775,225	3	124	bar
-|	"
-rC	389,722,196	2	125	braceright
-}	"
-a~	333,737,0,17,17	2	126	tilde
-~	"
+{	389,722,196	2	123	braceleft
+lC	"
+|	280,775,225	3	124	bar
+ba	"
+}	389,722,196	2	125	braceright
+rC	"
+~	333,737,0,17,17	2	126	tilde
+a~	"
 bq	278,127,146	0	128	quotesinglbase
 Fo	556,484	0	129	guillemotleft
 Fc	556,484	0	130	guillemotright
@@ -1395,7 +1395,8 @@
 S2	333,710	2	178	twosuperior
 S3	333,710	2	179	threesuperior
 aa	333,750,0,23	2	180	acute
-mc	611,532,207	1	181	mu
+*m	611,532,207	1	181	mu
+mc	"
 ps	556,700,191,0,8	2	182	paragraph
 pc	278,334	0	183	periodcentered
 ac	333,0,228	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HBI groff-1.21/font/devps/HBI
--- groff-1.20.1/font/devps/HBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Bold Oblique
 #   Version 003.001
@@ -1309,8 +1309,8 @@
 rs	"
 ]	333,722,196,141,68,90	2	93	bracketright
 rB	"
-a^	333,750,0,189,-68,90	2	94	circumflex
-^	"
+^	333,750,0,189,-68,90	2	94	circumflex
+a^	"
 _	556,0,125,35,77,35	0	95	underscore
 `	278,727,0,133,-115,90	2	96	quoteleft
 oq	"
@@ -1340,14 +1340,14 @@
 x	556,532,0,143,35,90	0	120	x
 y	556,532,214,147,9,90	1	121	y
 z	500,532,0,134,30,90	0	122	z
-lC	389,722,196,180,-44,90	2	123	braceleft
-{	"
-ba	280,775,225,131,14,90	3	124	bar
-|	"
-rC	389,722,196,68,68,68	2	125	braceright
-}	"
-a~	333,737,0,224,-62,90	2	126	tilde
-~	"
+{	389,722,196,180,-44,90	2	123	braceleft
+lC	"
+|	280,775,225,131,14,90	3	124	bar
+ba	"
+}	389,722,196,68,68,68	2	125	braceright
+rC	"
+~	333,737,0,224,-62,90	2	126	tilde
+a~	"
 bq	278,127,146,8,10,8	0	128	quotesinglbase
 Fo	556,484,0,65,-84,65	0	129	guillemotleft
 Fc	556,484,0,35,-54,35	0	130	guillemotright
@@ -1396,7 +1396,8 @@
 S2	333,710,0,166,-19,90	2	178	twosuperior
 S3	333,710,0,158,-41,90	2	179	threesuperior
 aa	333,750,0,233,-186,90	2	180	acute
-mc	611,532,207,99,29,90	1	181	mu
+*m	611,532,207,99,29,90	1	181	mu
+mc	"
 ps	556,700,191,182,-48,90	2	182	paragraph
 pc	278,334,0,48,-59,48	0	183	periodcentered
 ac	333,0,228,0,88	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HI groff-1.21/font/devps/HI
--- groff-1.20.1/font/devps/HI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Oblique
 #   Version 003.001
@@ -1425,8 +1425,8 @@
 rs	"
 ]	278,722,196,141,64,89	2	93	bracketright
 rB	"
-a^	333,734,0,156,-97,89	2	94	circumflex
-^	"
+^	333,734,0,156,-97,89	2	94	circumflex
+a^	"
 _	556,0,125,35,77,35	0	95	underscore
 `	222,725,0,152,-114,89	2	96	quoteleft
 oq	"
@@ -1456,14 +1456,14 @@
 x	500,523,0,145,39,89	0	120	x
 y	500,523,214,151,35,89	1	121	y
 z	500,523,0,122,19,89	0	122	z
-lC	334,722,196,162,-41,89	2	123	braceleft
-{	"
-ba	260,775,225,122,4,89	3	124	bar
-|	"
-rC	334,722,196,71,50,71	2	125	braceright
-}	"
-a~	333,722,0,208,-74,89	2	126	tilde
-~	"
+{	334,722,196,162,-41,89	2	123	braceleft
+lC	"
+|	260,775,225,122,4,89	3	124	bar
+ba	"
+}	334,722,196,71,50,71	2	125	braceright
+rC	"
+~	333,722,0,208,-74,89	2	126	tilde
+a~	"
 bq	222,106,149,8,29,8	0	128	quotesinglbase
 Fo	556,446,0,48,-96,48	0	129	guillemotleft
 Fc	556,446,0,22,-69,22	0	130	guillemotright
@@ -1512,7 +1512,8 @@
 S2	333,703,0,166,-13,89	2	178	twosuperior
 S3	333,703,0,154,-39,89	2	179	threesuperior
 aa	333,734,0,193,-198,89	2	180	acute
-mc	578,523,207,74,26,74	1	181	mu
+*m	578,523,207,74,26,74	1	181	mu
+mc	"
 ps	537,718,173,163,-76,89	2	182	paragraph
 pc	278,315,0,29,-79,29	0	183	periodcentered
 ac	333,0,225,0,49	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HNB groff-1.21/font/devps/HNB
--- groff-1.20.1/font/devps/HNB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HNB	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Narrow Bold
 #   Version 003.001
@@ -1308,8 +1308,8 @@
 rs	"
 ]	273,722,196	2	93	bracketright
 rB	"
-a^	273,750,0,9,9	2	94	circumflex
-^	"
+^	273,750,0,9,9	2	94	circumflex
+a^	"
 _	456,0,125	0	95	underscore
 `	228,727	2	96	quoteleft
 oq	"
@@ -1339,14 +1339,14 @@
 x	456,532	0	120	x
 y	456,532,214	1	121	y
 z	410,532	0	122	z
-lC	319,722,196	2	123	braceleft
-{	"
-ba	230,775,225	3	124	bar
-|	"
-rC	319,722,196	2	125	braceright
-}	"
-a~	273,737,0,15,14	2	126	tilde
-~	"
+{	319,722,196	2	123	braceleft
+lC	"
+|	230,775,225	3	124	bar
+ba	"
+}	319,722,196	2	125	braceright
+rC	"
+~	273,737,0,15,14	2	126	tilde
+a~	"
 bq	228,127,146	0	128	quotesinglbase
 Fo	456,484	0	129	guillemotleft
 Fc	456,484	0	130	guillemotright
@@ -1395,7 +1395,8 @@
 S2	273,710	2	178	twosuperior
 S3	273,710	2	179	threesuperior
 aa	273,750,0,19	2	180	acute
-mc	501,532,207	1	181	mu
+*m	501,532,207	1	181	mu
+mc	"
 ps	456,700,191,0,7	2	182	paragraph
 pc	228,334	0	183	periodcentered
 ac	273,0,228	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HNBI groff-1.21/font/devps/HNBI
--- groff-1.20.1/font/devps/HNBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HNBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Narrow Bold Oblique
 #   Version 003.001
@@ -1309,8 +1309,8 @@
 rs	"
 ]	273,722,196,125,65,90	2	93	bracketright
 rB	"
-a^	273,750,0,164,-47,90	2	94	circumflex
-^	"
+^	273,750,0,164,-47,90	2	94	circumflex
+a^	"
 _	456,0,125,37,72,37	0	95	underscore
 `	228,727,0,118,-85,90	2	96	quoteleft
 oq	"
@@ -1340,14 +1340,14 @@
 x	456,532,0,126,38,90	0	120	x
 y	456,532,214,129,16,90	1	121	y
 z	410,532,0,119,34,90	0	122	z
-lC	319,722,196,157,-27,90	2	123	braceleft
-{	"
-ba	230,775,225,116,21,90	3	124	bar
-|	"
-rC	319,722,196,65,65,65	2	125	braceright
-}	"
-a~	273,737,0,193,-42,90	2	126	tilde
-~	"
+{	319,722,196,157,-27,90	2	123	braceleft
+lC	"
+|	230,775,225,116,21,90	3	124	bar
+ba	"
+}	319,722,196,65,65,65	2	125	braceright
+rC	"
+~	273,737,0,193,-42,90	2	126	tilde
+a~	"
 bq	228,127,146,16,17,16	0	128	quotesinglbase
 Fo	456,484,0,63,-60,63	0	129	guillemotleft
 Fc	456,484,0,38,-35,38	0	130	guillemotright
@@ -1396,7 +1396,8 @@
 S2	273,710,0,145,-6,90	2	178	twosuperior
 S3	273,710,0,139,-25,90	2	179	threesuperior
 aa	273,750,0,200,-143,90	2	180	acute
-mc	501,532,207,90,33,90	1	181	mu
+*m	501,532,207,90,33,90	1	181	mu
+mc	"
 ps	456,700,191,158,-30,90	2	182	paragraph
 pc	228,334,0,49,-40,49	0	183	periodcentered
 ac	273,0,228,0,81	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HNI groff-1.21/font/devps/HNI
--- groff-1.20.1/font/devps/HNI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HNI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Narrow Oblique
 #   Version 003.001
@@ -1425,8 +1425,8 @@
 rs	"
 ]	228,722,196,125,62,89	2	93	bracketright
 rB	"
-a^	273,734,0,137,-70,89	2	94	circumflex
-^	"
+^	273,734,0,137,-70,89	2	94	circumflex
+a^	"
 _	456,0,125,37,72,37	0	95	underscore
 `	182,725,0,133,-85,89	2	96	quoteleft
 oq	"
@@ -1456,14 +1456,14 @@
 x	410,523,0,128,41,89	0	120	x
 y	410,523,214,133,38,89	1	121	y
 z	410,523,0,109,25,89	0	122	z
-lC	274,722,196,142,-25,89	2	123	braceleft
-{	"
-ba	213,775,225,110,13,89	3	124	bar
-|	"
-rC	274,722,196,67,50,67	2	125	braceright
-}	"
-a~	273,722,0,180,-52,89	2	126	tilde
-~	"
+{	274,722,196,142,-25,89	2	123	braceleft
+lC	"
+|	213,775,225,110,13,89	3	124	bar
+ba	"
+}	274,722,196,67,50,67	2	125	braceright
+rC	"
+~	273,722,0,180,-52,89	2	126	tilde
+a~	"
 bq	182,106,149,16,33,16	0	128	quotesinglbase
 Fo	456,446,0,49,-69,49	0	129	guillemotleft
 Fc	456,446,0,27,-48,27	0	130	guillemotright
@@ -1512,7 +1512,8 @@
 S2	273,703,0,145,-2,89	2	178	twosuperior
 S3	273,703,0,135,-23,89	2	179	threesuperior
 aa	273,734,0,167,-153,89	2	180	acute
-mc	474,523,207,69,31,69	1	181	mu
+*m	474,523,207,69,31,69	1	181	mu
+mc	"
 ps	440,718,173,143,-53,89	2	182	paragraph
 pc	228,315,0,33,-55,33	0	183	periodcentered
 ac	273,0,225,0,49	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HNR groff-1.21/font/devps/HNR
--- groff-1.20.1/font/devps/HNR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HNR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica Narrow
 #   Version 003.001
@@ -1424,8 +1424,8 @@
 rs	"
 ]	228,722,196	2	93	bracketright
 rB	"
-a^	273,734	2	94	circumflex
-^	"
+^	273,734	2	94	circumflex
+a^	"
 _	456,0,125	0	95	underscore
 `	182,725	2	96	quoteleft
 oq	"
@@ -1455,14 +1455,14 @@
 x	410,523	0	120	x
 y	410,523,214	1	121	y
 z	410,523	0	122	z
-lC	274,722,196	2	123	braceleft
-{	"
-ba	213,775,225	3	124	bar
-|	"
-rC	274,722,196	2	125	braceright
-}	"
-a~	273,722,0,4,4	2	126	tilde
-~	"
+{	274,722,196	2	123	braceleft
+lC	"
+|	213,775,225	3	124	bar
+ba	"
+}	274,722,196	2	125	braceright
+rC	"
+~	273,722,0,4,4	2	126	tilde
+a~	"
 bq	182,106,149	0	128	quotesinglbase
 Fo	456,446	0	129	guillemotleft
 Fc	456,446	0	130	guillemotright
@@ -1511,7 +1511,8 @@
 S2	273,703	2	178	twosuperior
 S3	273,703	2	179	threesuperior
 aa	273,734	2	180	acute
-mc	474,523,207	1	181	mu
+*m	474,523,207	1	181	mu
+mc	"
 ps	440,718,173	2	182	paragraph
 pc	228,315	0	183	periodcentered
 ac	273,0,225	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/HR groff-1.21/font/devps/HR
--- groff-1.20.1/font/devps/HR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/HR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Helvetica
 #   Version 003.001
@@ -1424,8 +1424,8 @@
 rs	"
 ]	278,722,196	2	93	bracketright
 rB	"
-a^	333,734	2	94	circumflex
-^	"
+^	333,734	2	94	circumflex
+a^	"
 _	556,0,125	0	95	underscore
 `	222,725	2	96	quoteleft
 oq	"
@@ -1455,14 +1455,14 @@
 x	500,523	0	120	x
 y	500,523,214	1	121	y
 z	500,523	0	122	z
-lC	334,722,196	2	123	braceleft
-{	"
-ba	260,775,225	3	124	bar
-|	"
-rC	334,722,196	2	125	braceright
-}	"
-a~	333,722,0,4,4	2	126	tilde
-~	"
+{	334,722,196	2	123	braceleft
+lC	"
+|	260,775,225	3	124	bar
+ba	"
+}	334,722,196	2	125	braceright
+rC	"
+~	333,722,0,4,4	2	126	tilde
+a~	"
 bq	222,106,149	0	128	quotesinglbase
 Fo	556,446	0	129	guillemotleft
 Fc	556,446	0	130	guillemotright
@@ -1511,7 +1511,8 @@
 S2	333,703	2	178	twosuperior
 S3	333,703	2	179	threesuperior
 aa	333,734	2	180	acute
-mc	578,523,207	1	181	mu
+*m	578,523,207	1	181	mu
+mc	"
 ps	537,718,173	2	182	paragraph
 pc	278,315	0	183	periodcentered
 ac	333,0,225	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/NB groff-1.21/font/devps/NB
--- groff-1.20.1/font/devps/NB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/NB	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName New Century Schoolbook Bold
 #   Version 003.001
@@ -760,8 +760,8 @@
 rs	"
 ]	389,737,109	2	93	bracketright
 rB	"
-a^	333,725,0,11,10	2	94	circumflex
-^	"
+^	333,725,0,11,10	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	241,737	2	96	quoteleft
 oq	"
@@ -791,14 +791,14 @@
 x	611,475	0	120	x
 y	611,475,205	1	121	y
 z	537,475	0	122	z
-lC	389,737,109	2	123	braceleft
-{	"
-ba	606,750,250	3	124	bar
-|	"
-rC	389,737,109	2	125	braceright
-}	"
-a~	333,705,0,24,24	2	126	tilde
-~	"
+{	389,737,109	2	123	braceleft
+lC	"
+|	606,750,250	3	124	bar
+ba	"
+}	389,737,109	2	125	braceright
+rC	"
+~	333,705,0,24,24	2	126	tilde
+a~	"
 bq	241,175,184	0	128	quotesinglbase
 Fo	500,397	0	129	guillemotleft
 Fc	500,397	0	130	guillemotright
@@ -847,7 +847,8 @@
 S2	344,705,0,6,3	2	178	twosuperior
 S3	344,705,0,11,3	2	179	threesuperior
 aa	333,737	2	180	acute
-mc	685,475,205	1	181	mu
+*m	685,475,205	1	181	mu
+mc	"
 ps	747,722,71	2	182	paragraph
 pc	278,372	0	183	periodcentered
 ac	333,2,224	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/NBI groff-1.21/font/devps/NBI
--- groff-1.20.1/font/devps/NBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/NBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName New Century Schoolbook Bold Italic
 #   Version 003.001
@@ -1403,8 +1403,8 @@
 rs	"
 ]	407,737,109,5,151,5	2	93	bracketright
 rB	"
-a^	333,705,0,82,27,82	2	94	circumflex
-^	"
+^	333,705,0,82,27,82	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	259,737,0,65,3,65	2	96	quoteleft
 oq	"
@@ -1434,14 +1434,14 @@
 x	574,477,15,50,96,50	0	120	x
 y	519,477,205,24,116,24	1	121	y
 z	519,477,15,4,69,4	0	122	z
-lC	407,737,109,51,-2,51	2	123	braceleft
-{	"
-ba	606,750,250,0,-199	3	124	bar
-|	"
-rC	407,737,109,0,75	2	125	braceright
-}	"
-a~	333,690,0,115,22,109	2	126	tilde
-~	"
+{	407,737,109,51,-2,51	2	123	braceleft
+lC	"
+|	606,750,250,0,-199	3	124	bar
+ba	"
+}	407,737,109,0,75	2	125	braceright
+rC	"
+~	333,690,0,115,22,109	2	126	tilde
+a~	"
 bq	259,157,192,0,107	0	128	quotesinglbase
 Fo	481,407,0,18,85,18	0	129	guillemotleft
 Fc	481,407,0,22,81,22	0	130	guillemotright
@@ -1490,7 +1490,8 @@
 S2	344,705,0,68,67,68	2	178	twosuperior
 S3	344,705,0,67,47,67	2	179	threesuperior
 aa	333,722,0,89,-73,89	2	180	acute
-mc	685,477,205,0,178	1	181	mu
+*m	685,477,205,0,178	1	181	mu
+mc	"
 ps	650,722,131,81,25,81	2	182	paragraph
 pc	287,372,0,0,-7	0	183	periodcentered
 ac	333,3,220,0,71	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/NI groff-1.21/font/devps/NI
--- groff-1.20.1/font/devps/NI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/NI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName New Century Schoolbook Italic
 #   Version 003.001
@@ -995,8 +995,8 @@
 rs	"
 ]	333,737,109,83,127,83	2	93	bracketright
 rB	"
-a^	333,690,0,48,13,48	2	94	circumflex
-^	"
+^	333,690,0,48,13,48	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	204,737,0,75,11,75	2	96	quoteleft
 oq	"
@@ -1026,14 +1026,14 @@
 x	500,466,15,21,83,21	0	120	x
 y	500,466,205,0,133	1	121	y
 z	463,466,15,3,83,3	0	122	z
-lC	333,737,109,111,12,107	2	123	braceleft
-{	"
-ba	606,750,250,0,-217	3	124	bar
-|	"
-rC	333,737,109,0,137	2	125	braceright
-}	"
-a~	333,649,0,100,-2,100	2	126	tilde
-~	"
+{	333,737,109,111,12,107	2	123	braceleft
+lC	"
+|	606,750,250,0,-217	3	124	bar
+ba	"
+}	333,737,109,0,137	2	125	braceright
+rC	"
+~	333,649,0,100,-2,100	2	126	tilde
+a~	"
 bq	204,109,165,0,128	0	128	quotesinglbase
 Fo	426,402,0,26,65,26	0	129	guillemotleft
 Fc	426,402,0,26,65,26	0	130	guillemotright
@@ -1082,7 +1082,8 @@
 S2	333,705,0,76,50,76	2	178	twosuperior
 S3	333,705,0,76,28,76	2	179	threesuperior
 aa	333,690,0,72,-82,72	2	180	acute
-mc	611,466,205,0,150	1	181	mu
+*m	611,466,205,0,150	1	181	mu
+mc	"
 ps	650,722,132,65,2,65	2	182	paragraph
 pc	278,374,0,0,-21	0	183	periodcentered
 ac	333,0,215,0,47	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/NR groff-1.21/font/devps/NR
--- groff-1.20.1/font/devps/NR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/NR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName New Century Schoolbook Roman
 #   Version 003.001
@@ -948,8 +948,8 @@
 rs	"
 ]	333,737,109	2	93	bracketright
 rB	"
-a^	333,695	2	94	circumflex
-^	"
+^	333,695	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	204,737	2	96	quoteleft
 oq	"
@@ -979,14 +979,14 @@
 x	537,464	0	120	x
 y	537,464,205	1	121	y
 z	481,464	0	122	z
-lC	333,737,109	2	123	braceleft
-{	"
-ba	606,750,250	3	124	bar
-|	"
-rC	333,737,109	2	125	braceright
-}	"
-a~	333,655	0	126	tilde
-~	"
+{	333,737,109	2	123	braceleft
+lC	"
+|	606,750,250	3	124	bar
+ba	"
+}	333,737,109	2	125	braceright
+rC	"
+~	333,655	0	126	tilde
+a~	"
 bq	204,109,185	0	128	quotesinglbase
 Fo	426,398	0	129	guillemotleft
 Fc	426,398	0	130	guillemotright
@@ -1035,7 +1035,8 @@
 S2	333,705	2	178	twosuperior
 S3	333,705	2	179	threesuperior
 aa	333,699	2	180	acute
-mc	611,464,205	1	181	mu
+*m	611,464,205	1	181	mu
+mc	"
 ps	606,722,132	2	182	paragraph
 pc	278,374	0	183	periodcentered
 ac	333,0,215	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/PB groff-1.21/font/devps/PB
--- groff-1.20.1/font/devps/PB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/PB	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Palatino Bold
 #   Version 003.001
@@ -548,8 +548,8 @@
 rs	"
 ]	333,720,104	2	93	bracketright
 rB	"
-a^	333,681,0,2,2	2	94	circumflex
-^	"
+^	333,681,0,2,2	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	278,695	2	96	quoteleft
 oq	"
@@ -579,14 +579,14 @@
 x	500,471,3	0	120	x
 y	556,459,266	1	121	y
 z	500,459,3	0	122	z
-lC	310,725,117	2	123	braceleft
-{	"
-ba	606,750,250	2	124	bar
-|	"
-rC	310,725,117	2	125	braceright
-}	"
-a~	333,661,0,16,16	2	126	tilde
-~	"
+{	310,725,117	2	123	braceleft
+lC	"
+|	606,750,250	2	124	bar
+ba	"
+}	310,725,117	2	125	braceright
+rC	"
+~	333,661,0,16,16	2	126	tilde
+a~	"
 bq	333,130,160	0	128	quotesinglbase
 Fo	500,438	0	129	guillemotleft
 Fc	500,438	0	130	guillemotright
@@ -635,7 +635,8 @@
 S2	300,660	2	178	twosuperior
 S3	300,667	2	179	threesuperior
 aa	333,691	2	180	acute
-mc	611,471,211	0	181	mu
+*m	611,471,211	0	181	mu
+mc	"
 ps	641,683,161	2	182	paragraph
 pc	250,335	0	183	periodcentered
 ac	333,0,225	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/PBI groff-1.21/font/devps/PBI
--- groff-1.20.1/font/devps/PBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/PBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Palatino Bold Italic
 #   Version 003.001
@@ -574,8 +574,8 @@
 rs	"
 ]	333,723,102,32,71,32	2	93	bracketright
 rB	"
-a^	333,692,0,132,-38,66	2	94	circumflex
-^	"
+^	333,692,0,132,-38,66	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	278,720,0,63,-15,63	2	96	quoteleft
 oq	"
@@ -605,14 +605,14 @@
 x	500,469,17,50,58,50	0	120	x
 y	556,469,271,35,37,35	1	121	y
 z	500,469,17,20,19,20	0	122	z
-lC	333,720,105,51,32,51	2	123	braceleft
-{	"
-ba	606,750,250,0,-209	2	124	bar
-|	"
-rC	333,720,105,32,51,32	2	125	braceright
-}	"
-a~	333,656,0,158,-32,66	2	126	tilde
-~	"
+{	333,720,105,51,32,51	2	123	braceleft
+lC	"
+|	606,750,250,0,-209	2	124	bar
+ba	"
+}	333,720,105,32,51,32	2	125	braceright
+rC	"
+~	333,656,0,158,-32,66	2	126	tilde
+a~	"
 bq	250,145,144,20,53,20	0	128	quotesinglbase
 Fo	500,446,0,8,15,8	0	129	guillemotleft
 Fc	500,443,0,8,15,8	0	130	guillemotright
@@ -661,7 +661,8 @@
 S2	300,683,0,71,24,66	2	178	twosuperior
 S3	300,683,0,60,27,60	2	179	threesuperior
 aa	333,699,0,109,-103,66	2	180	acute
-mc	541,465,212,15,97,15	0	181	mu
+*m	541,465,212,15,97,15	0	181	mu
+mc	"
 ps	556,681,204,123,36,66	2	182	paragraph
 pc	250,324,0,6,-17,6	0	183	periodcentered
 ac	333,5,218,0,38	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/PI groff-1.21/font/devps/PI
--- groff-1.20.1/font/devps/PI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/PI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Palatino Italic
 #   Version 003.001
@@ -573,8 +573,8 @@
 rs	"
 ]	333,733,100,32,43,32	2	93	bracketright
 rB	"
-a^	333,679,0,67,-6,67	2	94	circumflex
-^	"
+^	333,679,0,67,-6,67	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	278,733,0,30,-28,30	2	96	quoteleft
 oq	"
@@ -604,14 +604,14 @@
 x	500,482,11,34,41,34	0	120	x
 y	500,482,276,40,58,40	1	121	y
 z	444,482,11,22,51,22	0	122	z
-lC	333,733,100,36,35,36	2	123	braceleft
-{	"
-ba	606,750,250,0,-225	2	124	bar
-|	"
-rC	333,733,100,35,36,35	2	125	braceright
-}	"
-a~	333,638,0,107,-13,68	0	126	tilde
-~	"
+{	333,733,100,36,35,36	2	123	braceleft
+lC	"
+|	606,750,250,0,-225	2	124	bar
+ba	"
+}	333,733,100,35,36,35	2	125	braceright
+rC	"
+~	333,638,0,107,-13,68	0	126	tilde
+a~	"
 bq	278,120,122,0,23	0	128	quotesinglbase
 Fo	500,440,0,0,-7	0	129	guillemotleft
 Fc	500,440,0,0,-13	0	130	guillemotright
@@ -660,7 +660,8 @@
 S2	300,699,0,40,37,40	2	178	twosuperior
 S3	300,699,0,54,22,54	2	179	threesuperior
 aa	333,687,0,63,-72,63	2	180	acute
-mc	504,482,211,21,110,21	0	181	mu
+*m	504,482,211,21,110,21	0	181	mu
+mc	"
 ps	500,692,224,161,17,68	2	182	paragraph
 pc	250,312,0,0,-3	0	183	periodcentered
 ac	333,0,216,0,59	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/PR groff-1.21/font/devps/PR
--- groff-1.20.1/font/devps/PR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/PR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Palatino Roman
 #   Version 003.001
@@ -587,8 +587,8 @@
 rs	"
 ]	333,726,184	2	93	bracketright
 rB	"
-a^	333,677	2	94	circumflex
-^	"
+^	333,677	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	278,709	2	96	quoteleft
 oq	"
@@ -618,14 +618,14 @@
 x	516,469,3	0	120	x
 y	556,459,283	1	121	y
 z	500,462,3	0	122	z
-lC	333,726,175	2	123	braceleft
-{	"
-ba	606,750,250	2	124	bar
-|	"
-rC	333,726,175	2	125	braceright
-}	"
-a~	333,640	2	126	tilde
-~	"
+{	333,726,175	2	123	braceleft
+lC	"
+|	606,750,250	2	124	bar
+ba	"
+}	333,726,175	2	125	braceright
+rC	"
+~	333,640	2	126	tilde
+a~	"
 bq	278,110,153	0	128	quotesinglbase
 Fo	500,428	0	129	guillemotleft
 Fc	500,428	0	130	guillemotright
@@ -674,7 +674,8 @@
 S2	300,689,0,1	2	178	twosuperior
 S3	300,689	2	179	threesuperior
 aa	333,677	2	180	acute
-mc	574,470,216	0	181	mu
+*m	574,470,216	0	181	mu
+mc	"
 ps	628,694,150	2	182	paragraph
 pc	250,319	0	183	periodcentered
 ac	333,0,225	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/S groff-1.21/font/devps/S
--- groff-1.20.1/font/devps/S	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/S	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Symbol
 #   Version 001.008
@@ -76,7 +76,7 @@
 *R	556,673,0,7	3	82	Rho
 *S	592,673	3	83	Sigma
 *T	611,673	3	84	Tau
-u03A5	690,673,0,4,8	3	85	Upsilon
+*U	690,673,0,4,8	3	85	Upsilon
 ts	439,500,233	3	86	sigma1
 *W	768,688	3	87	Omega
 *C	645,673	3	88	Xi
@@ -103,8 +103,8 @@
 +f	603,499,224	3	106	phi1
 *k	549,501,0,9	3	107	kappa
 *l	549,739,17	3	108	lambda
-mc	576,500,223	3	109	mu
-*m	"
+*m	576,500,223	3	109	mu
+mc	"
 *n	521,507,16,0,9	3	110	nu
 *o	549,499,19	3	111	omicron
 *p	549,487,19	3	112	pi
@@ -118,12 +118,12 @@
 *c	493,766,224	3	120	xi
 *q	686,500,228,15	3	121	psi
 *z	494,756,225	3	122	zeta
-lC	480,673,183	3	123	braceleft
-{	"
-ba	200,707,293	3	124	bar
-|	"
-rC	480,673,183	3	125	braceright
-}	"
+{	480,673,183	3	123	braceleft
+lC	"
+|	200,707,293	3	124	bar
+ba	"
+}	480,673,183	3	125	braceright
+rC	"
 ap	549,307	3	126	similar
 Eu	750,685,12	3	160	Euro
 *U	620,685,0,0,2	3	161	Upsilon1
@@ -185,8 +185,8 @@
 ---	790,675,15	3	211	copyrightserif
 ---	890,673	3	212	trademarkserif
 product	823,751,101	3	213	product
-sr	549,917,38	3	214	radical
-sqrt	"
+sqrt	549,917,38	3	214	radical
+sr	"
 md	250,310	3	215	dotmath
 tno	713,288	3	216	logicalnot
 no	"
@@ -217,14 +217,14 @@
 lk	"
 braceleftbt	494,925,75	3	238	braceleftbt
 lb	"
-braceex	494,925,75	3	239	braceex
-bracerightex	"
+barex	494,925,75	3	239	braceex
+braceex	"
 braceleftex	"
-barex	"
+bracerightex	"
 bv	"
 ra	329,746,198	3	241	angleright
-is	274,916,107,67,52,-10	3	242	integral
-integral	"
+integral	274,916,107,67,52,-10	3	242	integral
+is	"
 u2320	686,920,88	3	243	integraltp
 u23AE	686,975,88	3	244	integralex
 u2321	686,921,87	3	245	integralbt
diff -ruN groff-1.20.1/font/devps/SS groff-1.21/font/devps/SS
--- groff-1.20.1/font/devps/SS	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/SS	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Symbol Slanted
 #   Version 001.008
@@ -122,7 +122,7 @@
 ---	635,360,0,107,-41,99	3	165	infinity
 ---	445,611,172,219,86,99	3	166	florin
 ---	670,474,23,25,-69,25	3	167	club
----	670,490,32,0,-148	3	168	diamond
+---	670,489,32,0,-148	3	168	diamond
 ---	670,473,29,59,-155,59	3	169	heart
 ---	670,488,32,0,-82	3	170	spade
 ---	927,455,13,103,-40,99	3	171	arrowboth
diff -ruN groff-1.20.1/font/devps/symbolmap groff-1.21/font/devps/symbolmap
--- groff-1.20.1/font/devps/symbolmap	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/symbolmap	2010-12-31 08:33:08.000000000 +0100
@@ -4,112 +4,31 @@
 #
 # Predefined groff symbols for textual fonts.
 #
+a14 rh
 a a
-b b
-c c
-d d
-e e
-f f
-g g
-h h
-i i
-j j
-k k
-l l
-m m
-n n
-o o
-p p
-q q
-r r
-s s
-t t
-u u
-v v
-w w
-x x
-y y
-z z
 A A
-B B
-C C
-D D
-E E
-F F
-G G
-H H
-I I
-J J
-K K
-L L
-M M
-N N
-O O
-P P
-Q Q
-R R
-S S
-T T
-U U
-V V
-W W
-X X
-Y Y
-Z Z
-AE AE
-Aacute 'A
-Acircumflex ^A
-Adieresis :A
-Agrave `A
-Aring oA
-Atilde ~A
-Cacute 'C
-Ccedilla ,C
-Eacute 'E
-Ecircumflex ^E
-Edieresis :E
-Egrave `E
-Eth -D
-Euro Eu
-IJ IJ
-Iacute 'I
-Icircumflex ^I
-Idieresis :I
-Ifraktur Im
-Igrave `I
-Lslash /L
-Ntilde ~N
-OE OE
-Oacute 'O
-Ocircumflex ^O
-Odieresis :O
-Ograve `O
-Oslash /O
-Otilde ~O
-Rfraktur Re
-Scaron vS
-Thorn TP
-Uacute 'U
-Ucircumflex ^U
-Udieresis :U
-Ugrave `U
-Yacute 'Y
-Ydieresis :Y
-Zcaron vZ
-a14 rh
 aacute 'a
+Aacute 'A
 acircumflex ^a
+Acircumflex ^A
 acute aa
 adieresis :a
+Adieresis :A
 ae ae
+AE AE
 agrave `a
+Agrave `A
+aleph Ah
+alpha *a
+Alpha *A
+ampersand &
 angle /_
 angleleft la
 angleright ra
-aleph Ah
-ampersand &
 approxequal ~~
+approxequal ~=
 aring oa
+Aring oA
 arrowboth <>
 arrowdblboth hA
 arrowdbldown dA
@@ -117,10 +36,12 @@
 arrowdblright rA
 arrowdblup uA
 arrowdown da
+arrowhorizex an
 arrowleft <-
 arrowright ->
-arrowup ua
 arrowupdn va
+arrowup ua
+arrowvertex arrowvertex
 asciicircum ha
 asciitilde ti
 asterisk *
@@ -128,41 +49,87 @@
 at @
 at at
 atilde ~a
+Atilde ~A
 backslash \
 backslash rs
-bar ba
 bar |
-braceleft lC
+bar ba
+b b
+B B
+beta *b
+Beta *B
+braceex barex
+braceex braceex
+braceex braceleftex
+braceex bracerightex
+braceex bv
 braceleft {
-braceright rC
+braceleftbt braceleftbt
+braceleftbt lb
+braceleft lC
+braceleftmid braceleftmid
+braceleftmid lk
+bracelefttp bracelefttp
+bracelefttp lt
 braceright }
+bracerightbt bracerightbt
+bracerightbt rb
+bracerightmid bracerightmid
+bracerightmid rk
+braceright rC
+bracerighttp bracerighttp
+bracerighttp rt
 bracketleft [
+bracketleftbt bracketleftbt
+bracketleftbt lf
+bracketleftex bracketleftex
 bracketleft lB
+bracketlefttp bracketlefttp
+bracketlefttp lc
 bracketright ]
+bracketrightbt bracketrightbt
+bracketrightbt rf
+bracketrightex bracketrightex
 bracketright rB
+bracketrighttp bracketrighttp
+bracketrighttp rc
 breve ab
 brokenbar bb
 bullet bu
 cacute 'c
+Cacute 'C
 caron ah
+carriagereturn CR
+c c
+C C
 ccedilla ,c
+Ccedilla ,C
 cedilla ac
 cent ct
 checkmark OK
+chi *x
+Chi *X
 circle ci
 circlemultiply c*
 circleplus c+
-circumflex a^
 circumflex ^
+circumflex a^
+club CL
 colon :
 comma ,
 congruent =~
 copyright co
 currency Cs
-dagger dg
 daggerdbl dd
+dagger dg
+d d
+D D
 degree de
+delta *d
+Delta *D
+diamond DI
 dieresis ad
+divide tdi
 dollar $
 dollar Do
 dotaccent a.
@@ -170,20 +137,34 @@
 dotlessj .j
 dotmath md
 eacute 'e
+Eacute 'E
 ecircumflex ^e
+Ecircumflex ^E
 edieresis :e
+Edieresis :E
+e e
+E E
 egrave `e
+Egrave `E
 eight 8
 element mo
 emdash em
 emptyset es
 endash en
+epsilon *e
+Epsilon *E
 equal =
 equivalence ==
+eta *y
+Eta *Y
+Eth -D
 eth Sd
+Euro Eu
 exclam !
 exclamdown r!
 existential te
+f f
+F F
 ff ff
 ffi Fi
 ffl Fl
@@ -193,7 +174,12 @@
 fl fl
 florin Fn
 four 4
+fraction f/
+gamma *g
+Gamma *G
 germandbls ss
+g g
+G G
 gradient gr
 grave ga
 greater >
@@ -202,241 +188,263 @@
 guillemotright Fc
 guilsinglleft fo
 guilsinglright fc
+heart HE
+h h
+H H
 hungarumlaut a"
 hyphen -
 hyphen hy
 iacute 'i
+Iacute 'I
 icircumflex ^i
+Icircumflex ^I
 idieresis :i
+Idieresis :I
+Ifraktur Im
 igrave `i
+Igrave `I
+i i
+I I
 ij ij
+IJ IJ
 infinity if
-integral is
-integral integral
 # the next line overrides the (old) PUA value of the AGL
 integralex u23AE
+integral integral
+integral is
 intersection ca
+iota *i
+Iota *I
+j j
+J J
+kappa *k
+Kappa *K
+k k
+K K
+lambda *l
+Lambda *L
 less <
 lessequal <=
+l l
+L L
 logicaland AN
 logicalnot tno
 logicalor OR
 lozenge lz
 lslash /l
+Lslash /L
 macron a-
 minus \-
 minute fm
+m m
+M M
+mu1 mc
+multiply tmu
+mu *m
+Mu *M
+# if there is "mu1" glyph in the font - comment out the following line
 mu mc
 nine 9
+n n
+N N
 notelement nm
 notequal !=
 notsubset nb
 ntilde ~n
+Ntilde ~N
 numbersign #
 numbersign sh
+nu *n
+Nu *N
 oacute 'o
+Oacute 'O
 ocircumflex ^o
+Ocircumflex ^O
 odieresis :o
+Odieresis :O
 oe oe
+OE OE
 ogonek ho
 ograve `o
+Ograve `O
+omega1 +p
+omega *w
+Omega *W
+omicron *o
+Omicron *O
 one 1
 oneeighth 18
 onehalf 12
 onequarter 14
 onesuperior S1
+o o
+O O
 ordfeminine Of
 ordmasculine Om
 oslash /o
+Oslash /O
 otilde ~o
+Otilde ~O
+overline rn
 paragraph ps
 parenleft (
+parenleftbt parenleftbt
+parenleftex parenleftex
+parenlefttp parenlefttp
 parenright )
+parenrightbt parenrightbt
+parenrightex parenrightex
+parenrighttp parenrighttp
 partialdiff pd
 percent %
 period .
 periodcentered pc
-perthousand %0
 perpendicular pp
+perthousand %0
+phi1 +f
+phi *f
+Phi *F
+pi *p
+Pi *P
 plus +
+plusminus t+-
+p p
+P P
+product product
 propersubset sb
 propersuperset sp
 proportional pt
+psi *q
+Psi *Q
+q q
+Q Q
 question ?
 questiondown r?
 quotedbl "
-quotedbl dq
 quotedblbase Bq
+quotedbl dq
 quotedblleft lq
 quotedblright rq
 quoteleft `
 quoteleft oq
 quoteright '
 quoteright cq
-quotesingle aq
 quotesinglbase bq
+quotesingle aq
+radicalex radicalex
+radical sqrt
+radical sr
 reflexsubset ib
 reflexsuperset ip
 registered rg
+Rfraktur Re
+rho *r
+Rho *R
 ring ao
+r r
+R R
 scaron vs
+Scaron vS
 second sd
 section sc
 semicolon ;
 seven 7
 seveneighths 78
+SF110000 br
+sigma1 ts
+sigma *s
+Sigma *S
 similar ap
 six 6
 slash /
 slash sl
+spade SP
+s s
+S S
 sterling Po
+suchthat st
+summation sum
+tau *t
+Tau *T
 therefore 3d
 therefore tf
+theta1 +h
+theta *h
+Theta *H
 thorn Tp
+Thorn TP
 three 3
 threeeighths 38
 threequarters 34
 threesuperior S3
-tilde a~
 tilde ~
+tilde a~
 trademark tm
+t t
+T T
 two 2
 twosuperior S2
 uacute 'u
+Uacute 'U
 ucircumflex ^u
+Ucircumflex ^U
 udieresis :u
+Udieresis :U
 ugrave `u
+Ugrave `U
 underscore _
+uni03F5 +e
 uni210F -h
 uni210F hbar
+uni21D5 vA
 uni2210 coproduct
 uni2213 -+
 uni2243 |=
 uni2262 ne
+uni226A >>
+uni226B <<
 uni2285 nc
 uni25A1 sq
 uni261C lh
 union cu
 universal fa
+upsilon *u
+Upsilon *U
+u u
+U U
+v v
+V V
 weierstrass wp
+w w
+W W
+xi *c
+Xi *C
+x x
+X X
 yacute 'y
+Yacute 'Y
 ydieresis :y
+Ydieresis :Y
 yen Ye
+y y
+Y Y
 zcaron vz
+Zcaron vZ
 zero 0
-fraction f/
-club CL
-diamond DI
-heart HE
-spade SP
-carriagereturn CR
-suchthat st
-bracelefttp bracelefttp
-braceleftmid braceleftmid
-braceleftbt braceleftbt
-braceex braceex
-braceex bracerightex
-braceex braceleftex
-braceex barex
-bracerighttp bracerighttp
-bracerightmid bracerightmid
-bracerightbt bracerightbt
-parenlefttp parenlefttp
-parenleftbt parenleftbt
-parenleftex parenleftex
-parenrighttp parenrighttp
-parenrightbt parenrightbt
-parenrightex parenrightex
-bracketlefttp bracketlefttp
-bracketleftbt bracketleftbt
-bracketleftex bracketleftex
-bracketrighttp bracketrighttp
-bracketrightbt bracketrightbt
-bracketrightex bracketrightex
-radical sr
-radical sqrt
-radicalex radicalex
-approxequal ~=
-bracketlefttp lc
-bracketleftbt lf
-bracketrighttp rc
-bracketrightbt rf
-bracelefttp lt
-braceleftmid lk
-braceleftbt lb
-braceex bv
-bracerighttp rt
-bracerightmid rk
-bracerightbt rb
-summation sum
-product product
-arrowvertex arrowvertex
-arrowhorizex an
-multiply tmu
-divide tdi
-plusminus t+-
+zeta *z
+Zeta *Z
+z z
+Z Z
 #
 # Additional predefined groff symbols for special fonts.
 #
-plus pl
-minus mi
-plusminus +-
-equal eq
+arrowdown arrowvertbt
+arrowup arrowverttp
 divide di
-multiply mu
+equal eq
 logicalnot no
-arrowup arrowverttp
-arrowdown arrowvertbt
-Alpha *A
-Beta *B
-Chi *X
-Delta *D
-Epsilon *E
-Eta *Y
-Gamma *G
-Iota *I
-Kappa *K
-Lambda *L
-Mu *M
-Nu *N
-Omega *W
-Omicron *O
-Phi *F
-Pi *P
-Psi *Q
-Rho *R
-Sigma *S
-Tau *T
-Theta *H
+minus mi
+multiply mu
+plusminus +-
+plus pl
 Upsilon1 *U
-Xi *C
-Zeta *Z
-alpha *a
-beta *b
-chi *x
-delta *d
-epsilon *e
-uni03F5 +e
-eta *y
-gamma *g
-iota *i
-kappa *k
-lambda *l
-mu *m
-nu *n
-omega *w
-omega1 +p
-omicron *o
-phi *f
-phi1 +f
-pi *p
-psi *q
-rho *r
-sigma *s
-sigma1 ts
-tau *t
-theta *h
-theta1 +h
-upsilon *u
-xi *c
-zeta *z
diff -ruN groff-1.20.1/font/devps/TB groff-1.21/font/devps/TB
--- groff-1.20.1/font/devps/TB	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/TB	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Times Bold
 #   Version 003.001
@@ -387,8 +387,8 @@
 rs	"
 ]	333,678,149	2	93	bracketright
 rB	"
-a^	333,704,0,2,2	2	94	circumflex
-^	"
+^	333,704,0,2,2	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	333,691	2	96	quoteleft
 oq	"
@@ -418,14 +418,14 @@
 x	500,461	0	120	x
 y	500,461,205	1	121	y
 z	444,461	0	122	z
-lC	394,698,175	2	123	braceleft
-{	"
-ba	220,782,218	3	124	bar
-|	"
-rC	394,698,175	2	125	braceright
-}	"
-a~	333,674,0,16,16	2	126	tilde
-~	"
+{	394,698,175	2	123	braceleft
+lC	"
+|	220,782,218	3	124	bar
+ba	"
+}	394,698,175	2	125	braceright
+rC	"
+~	333,674,0,16,16	2	126	tilde
+a~	"
 bq	333,155,180	0	128	quotesinglbase
 Fo	500,415	0	129	guillemotleft
 Fc	500,415	0	130	guillemotright
@@ -474,7 +474,8 @@
 S2	300,688	2	178	twosuperior
 S3	300,688	2	179	threesuperior
 aa	333,713	2	180	acute
-mc	601,461,212	1	181	mu
+*m	601,461,212	1	181	mu
+mc	"
 ps	540,676,186	2	182	paragraph
 pc	250,417	0	183	periodcentered
 ac	333,0,218	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/TBI groff-1.21/font/devps/TBI
--- groff-1.20.1/font/devps/TBI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/TBI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Times Bold Italic
 #   Version 003.001
@@ -366,8 +366,8 @@
 rs	"
 ]	333,674,157,60,106,60	2	93	bracketright
 rB	"
-a^	333,690,0,84,10,84	2	94	circumflex
-^	"
+^	333,690,0,84,10,84	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	333,685,0,49,-78,49	2	96	quoteleft
 oq	"
@@ -397,14 +397,14 @@
 x	500,462,13,19,96,19	0	120	x
 y	444,462,205,0,144	1	121	y
 z	389,449,78,29,93,29	0	122	z
-lC	348,686,187,138,45,99	2	123	braceleft
-{	"
-ba	220,782,218,0,-16	3	124	bar
-|	"
-rC	348,686,187,4,179,4	2	125	braceright
-}	"
-a~	333,655,0,124,2,99	2	126	tilde
-~	"
+{	348,686,187,138,45,99	2	123	braceleft
+lC	"
+|	220,782,218,0,-16	3	124	bar
+ba	"
+}	348,686,187,4,179,4	2	125	braceright
+rC	"
+~	333,655,0,124,2,99	2	126	tilde
+a~	"
 bq	333,134,182,0,55	0	128	quotesinglbase
 Fo	500,415,0,18,38,18	0	129	guillemotleft
 Fc	500,415,0,18,38,18	0	130	guillemotright
@@ -453,7 +453,8 @@
 S2	300,683,0,63,48,63	2	178	twosuperior
 S3	300,683,0,71,33,71	2	179	threesuperior
 aa	333,697,0,96,-89,96	2	180	acute
-mc	532,449,206,0,155	1	181	mu
+*m	532,449,206,0,155	1	181	mu
+mc	"
 ps	500,669,193,112,107,99	2	182	paragraph
 pc	250,405,0,0,-1	0	183	periodcentered
 ac	333,5,218,0,130	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/TI groff-1.21/font/devps/TI
--- groff-1.20.1/font/devps/TI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/TI	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Times Italic
 #   Version 003.001
@@ -376,8 +376,8 @@
 rs	"
 ]	389,663,153,43,38,43	2	93	bracketright
 rB	"
-a^	333,661,0,102,-41,43	2	94	circumflex
-^	"
+^	333,661,0,102,-41,43	2	94	circumflex
+a^	"
 _	500,0,125,50,50,43	0	95	underscore
 `	333,666,0,27,-121,27	2	96	quoteleft
 oq	"
@@ -407,14 +407,14 @@
 x	444,441,11,53,77,43	0	120	x
 y	444,441,206,32,74,32	1	121	y
 z	389,428,81,41,52,41	0	122	z
-lC	400,687,177,57,-1,43	2	123	braceleft
-{	"
-ba	275,783,217,0,-55	3	124	bar
-|	"
-rC	400,687,177,0,57	2	125	braceright
-}	"
-a~	333,624,0,144,-50,43	2	126	tilde
-~	"
+{	400,687,177,57,-1,43	2	123	braceleft
+lC	"
+|	275,783,217,0,-55	3	124	bar
+ba	"
+}	400,687,177,0,57	2	125	braceright
+rC	"
+~	333,624,0,144,-50,43	2	126	tilde
+a~	"
 bq	333,101,129,0,6	0	128	quotesinglbase
 Fo	500,403,0,0,-3	0	129	guillemotleft
 Fc	500,403,0,0,-5	0	130	guillemotright
@@ -463,7 +463,8 @@
 S2	300,676,0,74,17,43	2	178	twosuperior
 S3	300,676,0,89,7,43	2	179	threesuperior
 aa	333,664,0,120,-130,43	2	180	acute
-mc	514,428,208,15,93,15	1	181	mu
+*m	514,428,208,15,93,15	1	181	mu
+mc	"
 ps	523,653,123,143,-5,43	2	182	paragraph
 pc	250,310,0,0,-20	0	183	periodcentered
 ac	333,0,217,0,80	1	184	cedilla
diff -ruN groff-1.20.1/font/devps/TR groff-1.21/font/devps/TR
--- groff-1.20.1/font/devps/TR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/TR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName Times Roman
 #   Version 003.001
@@ -374,8 +374,8 @@
 rs	"
 ]	333,662,156	2	93	bracketright
 rB	"
-a^	333,674	2	94	circumflex
-^	"
+^	333,674	2	94	circumflex
+a^	"
 _	500,0,125	0	95	underscore
 `	333,676	2	96	quoteleft
 oq	"
@@ -405,14 +405,14 @@
 x	500,450	0	120	x
 y	500,450,218	1	121	y
 z	444,450	0	122	z
-lC	480,680,181	2	123	braceleft
-{	"
-ba	200,782,218	3	124	bar
-|	"
-rC	480,680,181	2	125	braceright
-}	"
-a~	333,638	2	126	tilde
-~	"
+{	480,680,181	2	123	braceleft
+lC	"
+|	200,782,218	3	124	bar
+ba	"
+}	480,680,181	2	125	braceright
+rC	"
+~	333,638	2	126	tilde
+a~	"
 bq	333,102,141	0	128	quotesinglbase
 Fo	500,416	0	129	guillemotleft
 Fc	500,416	0	130	guillemotright
@@ -461,7 +461,8 @@
 S2	300,676	2	178	twosuperior
 S3	300,676	2	179	threesuperior
 aa	333,678	2	180	acute
-mc	510,450,210	0	181	mu
+*m	510,450,210	0	181	mu
+mc	"
 ps	453,662,154,0,22	2	182	paragraph
 pc	250,310	0	183	periodcentered
 ac	333,0,215	0	184	cedilla
diff -ruN groff-1.20.1/font/devps/ZCMI groff-1.21/font/devps/ZCMI
--- groff-1.20.1/font/devps/ZCMI	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/ZCMI	2010-12-31 08:33:08.000000000 +0100
@@ -1,16 +1,16 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Zapf Chancery Medium Italic
-#   Version 001.007
+#   Version 003.001
 #   FamilyName ITC Zapf Chancery
 #
 # The original AFM file contains the following comments:
 #
-#   Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All Rights Reserved.ITC Zapf Chancery is a registered trademark of International Typeface Corporation.
-#   Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All Rights Reserved.
-#   Comment Creation Date: Fri Dec 28 16:35:46 1990
-#   Comment UniqueID 33936
-#   Comment VMusage 34559 41451
+#   Notice Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.ITC Zapf Chancery is a registered trademark of International Typeface Corporation.
+#   Comment Copyright (c) 1985, 1987, 1989, 1990, 1997, 1998, 1999 Adobe Systems Incorporated.  All Rights Reserved.
+#   Comment Creation Date: Mon Aug 23 13:37:27 1999
+#   Comment UniqueID 44723
+#   Comment VMusage 36306 43242
 
 name ZCMI
 internalname ZapfChancery-MediumItalic
@@ -20,168 +20,623 @@
 ligatures fi fl 0
 
 kernpairs
+A C 20
+A ,C 20
+A G -30
+A O 10
+A 'O 10
+A ^O 10
+A :O 10
+A `O 10
+A /O 10
+A ~O 10
+A Q 10
+A T 10
+A U -10
+A 'U -10
+A ^U -10
+A :U -10
+A `U -10
+A rq -40
 A ' -40
 A cq -40
-A rq -40
-A U -10
-A T 10
-A Q 10
-A O 10
-A G -30
-A C 20
-D . -30
-D , -20
-D Y 10
+'A C 20
+'A ,C 20
+'A G -30
+'A O 10
+'A 'O 10
+'A ^O 10
+'A :O 10
+'A `O 10
+'A /O 10
+'A ~O 10
+'A Q 10
+'A T 10
+'A U -10
+'A 'U -10
+'A ^U -10
+'A :U -10
+'A `U -10
+^A C 20
+^A ,C 20
+^A G -30
+^A O 10
+^A 'O 10
+^A ^O 10
+^A :O 10
+^A `O 10
+^A /O 10
+^A ~O 10
+^A Q 10
+^A T 10
+^A U -10
+^A 'U -10
+^A ^U -10
+^A :U -10
+^A `U -10
+:A C 20
+:A ,C 20
+:A G -30
+:A O 10
+:A 'O 10
+:A ^O 10
+:A :O 10
+:A `O 10
+:A /O 10
+:A ~O 10
+:A Q 10
+:A T 10
+:A U -10
+:A 'U -10
+:A ^U -10
+:A :U -10
+:A `U -10
+`A C 20
+`A ,C 20
+`A G -30
+`A O 10
+`A 'O 10
+`A ^O 10
+`A :O 10
+`A `O 10
+`A /O 10
+`A ~O 10
+`A Q 10
+`A T 10
+`A U -10
+`A 'U -10
+`A ^U -10
+`A :U -10
+`A `U -10
+oA C 20
+oA ,C 20
+oA G -30
+oA O 10
+oA 'O 10
+oA ^O 10
+oA :O 10
+oA `O 10
+oA /O 10
+oA ~O 10
+oA Q 10
+oA T 10
+oA U -10
+oA 'U -10
+oA ^U -10
+oA :U -10
+oA `U -10
+~A C 20
+~A ,C 20
+~A G -30
+~A O 10
+~A 'O 10
+~A ^O 10
+~A :O 10
+~A `O 10
+~A /O 10
+~A ~O 10
+~A Q 10
+~A T 10
+~A U -10
+~A 'U -10
+~A ^U -10
+~A :U -10
+~A `U -10
 D A -10
-F . -40
-F i 10
+D 'A -10
+D ^A -10
+D :A -10
+D `A -10
+D oA -10
+D ~A -10
+D Y 10
+D 'Y 10
+D :Y 10
+D , -20
+D . -30
 F , -30
-G . -20
+F i 10
+F . -40
 G , -10
-J . -20
+G . -20
 J , -10
-K u -20
-K o -20
+J . -20
 K e -20
-L y -10
+K 'e -20
+K ^e -20
+K :e -20
+K `e -20
+K o -20
+K 'o -20
+K ^o -20
+K :o -20
+K `o -20
+K ~o -20
+K u -20
+K 'u -20
+K ^u -20
+K :u -20
+K `u -20
+L V -20
+L W -10
+L rq -25
 L ' -25
 L cq -25
-L rq -25
-L W -10
-L V -20
-O . -20
-O , -10
-O Y 10
-O T 20
+L y -10
+L 'y -10
+L :y -10
 O A -20
-P . -50
-P o -10
-P e -10
-P , -40
-P a -20
+O 'A -20
+O ^A -20
+O :A -20
+O `A -20
+O oA -20
+O ~A -20
+O T 20
+O Y 10
+O 'Y 10
+O :Y 10
+O , -10
+O . -20
+'O A -20
+'O 'A -20
+'O ^A -20
+'O :A -20
+'O `A -20
+'O oA -20
+'O ~A -20
+'O T 20
+'O Y 10
+'O 'Y 10
+'O :Y 10
+'O , -10
+'O . -20
+^O A -20
+^O 'A -20
+^O ^A -20
+^O :A -20
+^O `A -20
+^O oA -20
+^O ~A -20
+^O T 20
+^O Y 10
+^O 'Y 10
+^O :Y 10
+^O , -10
+^O . -20
+:O A -20
+:O 'A -20
+:O ^A -20
+:O :A -20
+:O `A -20
+:O oA -20
+:O ~A -20
+:O T 20
+:O Y 10
+:O 'Y 10
+:O :Y 10
+:O , -10
+:O . -20
+`O A -20
+`O 'A -20
+`O ^A -20
+`O :A -20
+`O `A -20
+`O oA -20
+`O ~A -20
+`O T 20
+`O Y 10
+`O 'Y 10
+`O :Y 10
+`O , -10
+`O . -20
+/O A -20
+/O 'A -20
+/O ^A -20
+/O :A -20
+/O `A -20
+/O oA -20
+/O ~A -20
+/O T 20
+/O Y 10
+/O 'Y 10
+/O :Y 10
+/O , -10
+/O . -20
+~O A -20
+~O 'A -20
+~O ^A -20
+~O :A -20
+~O `A -20
+~O oA -20
+~O ~A -20
+~O T 20
+~O Y 10
+~O 'Y 10
+~O :Y 10
+~O , -10
+~O . -20
 P A -10
+P 'A -10
+P ^A -10
+P :A -10
+P `A -10
+P oA -10
+P ~A -10
+P a -20
+P 'a -20
+P ^a -20
+P :a -20
+P `a -20
+P oa -20
+P ~a -20
+P , -40
+P e -10
+P 'e -10
+P ^e -10
+P :e -10
+P `e -10
+P o -10
+P 'o -10
+P ^o -10
+P :o -10
+P `o -10
+P ~o -10
+P . -50
 Q U -10
-R Y 10
-R W 10
+Q 'U -10
+Q ^U -10
+Q :U -10
+Q `U -10
 R T 20
-T o -20
-T i 20
+R W 10
+R Y 10
+R 'Y 10
+R :Y 10
+T A 10
+T 'A 10
+T ^A 10
+T :A 10
+T `A 10
+T oA 10
+T ~A 10
+T O 30
+T 'O 30
+T ^O 30
+T :O 30
+T `O 30
+T /O 30
+T ~O 30
+T a -20
+T 'a -20
+T ^a -20
+T `a -20
+T oa -20
+T e -20
+T 'e -20
+T h 20
 T - -20
 T hy -20
-T h 20
-T e -20
-T a -20
-T O 30
-T A 10
-V . -100
-V o -20
-V e -20
-V , -90
-V a -20
-V O 10
+T i 20
+T o -20
+T 'o -20
+T ^o -20
 V G -20
-W . -50
-W o -20
-W i 10
-W h 10
-W e -20
-W , -40
-W a -20
+V O 10
+V 'O 10
+V ^O 10
+V :O 10
+V `O 10
+V /O 10
+V ~O 10
+V a -20
+V 'a -20
+V ^a -20
+V :a -20
+V `a -20
+V oa -20
+V ~a -20
+V , -90
+V e -20
+V 'e -20
+V ^e -20
+V :e -20
+V `e -20
+V o -20
+V 'o -20
+V ^o -20
+V :o -20
+V `o -20
+V ~o -20
+V . -100
 W O 10
-Y u -20
-Y . -50
-Y o -50
-Y i 10
-Y e -40
-Y , -40
+W 'O 10
+W ^O 10
+W :O 10
+W `O 10
+W /O 10
+W ~O 10
+W a -20
+W 'a -20
+W ^a -20
+W :a -20
+W `a -20
+W oa -20
+W ~a -20
+W , -40
+W e -20
+W 'e -20
+W ^e -20
+W :e -20
+W `e -20
+W h 10
+W i 10
+W o -20
+W 'o -20
+W ^o -20
+W :o -20
+W `o -20
+W ~o -20
+W . -50
 Y a -60
-b . -30
-b l -20
-b , -20
+Y 'a -60
+Y ^a -20
+Y :a -20
+Y `a -20
+Y oa -60
+Y ~a -20
+Y , -40
+Y e -40
+Y 'e -40
+Y i 10
+Y 'i 10
+Y ^i 30
+Y :i 30
+Y `i 30
+Y o -50
+Y 'o -20
+Y ^o -20
+Y :o -20
+Y `o -20
+Y ~o -20
+Y . -50
+Y u -20
+Y 'u -20
+Y ^u -20
+Y :u -20
+Y `u -20
+'Y a -60
+'Y 'a -60
+'Y ^a -60
+'Y :a -20
+'Y `a -20
+'Y oa -60
+'Y ~a -20
+'Y , -40
+'Y e -40
+'Y 'e -40
+'Y ^e -40
+'Y i 10
+'Y 'i 10
+'Y ^i 10
+'Y :i 30
+'Y `i 30
+'Y o -50
+'Y 'o -50
+'Y ^o -20
+'Y :o -20
+'Y `o -20
+'Y ~o -20
+'Y . -50
+'Y u -20
+'Y 'u -20
+'Y ^u -20
+'Y :u -20
+'Y `u -20
+:Y a -60
+:Y 'a -60
+:Y ^a -20
+:Y :a -20
+:Y `a -20
+:Y oa -60
+:Y ~a -20
+:Y , -40
+:Y e -40
+:Y 'e -40
+:Y ^e -40
+:Y i 10
+:Y 'i 10
+:Y ^i 30
+:Y :i 30
+:Y `i 30
+:Y o -50
+:Y 'o -50
+:Y ^o -50
+:Y :o -20
+:Y `o -20
+:Y ~o -20
+:Y . -50
+:Y u -20
+:Y 'u -20
+:Y ^u -20
+:Y :u -20
+:Y `u -20
 b b -20
+b , -20
+b l -20
+b . -30
 c k -10
+,c k -10
+, rq -70
 , ' -70
 , cq -70
-, rq -70
-d w -20
-d v -10
 d d -40
+d v -10
+d w -20
 e y 10
+e 'y 10
+e :y 10
+'e y 10
+'e 'y 10
+'e :y 10
+^e y 10
+^e 'y 10
+^e :y 10
+:e y 10
+:e 'y 10
+:e :y 10
+`e y 10
+`e 'y 10
+`e :y 10
+f a -20
+f 'a -20
+f ^a -20
+f :a -20
+f `a -20
+f oa -20
+f ~a -20
+f , -40
+f e -10
+f 'e -10
+f ^e -10
+f :e -10
+f `e -10
+f f -50
+f . -50
+f rq 30
 f ' 30
 f cq 30
-f rq 30
-f . -50
-f f -50
-f e -10
-f , -40
-f a -20
-g y 10
-g . -30
-g i 10
-g e 10
-g , -20
 g a 10
-k y 10
-k o -10
+g , -20
+g e 10
+g i 10
+g . -30
+g y 10
 k e -20
-m y 10
+k 'e -20
+k ^e -20
+k :e -20
+k `e -20
+k o -10
+k 'o -10
+k ^o -10
+k :o -10
+k `o -10
+k ~o -10
+k y 10
 m u 10
+m 'u 10
+m ^u 10
+m :u 10
+m `u 10
+m y 10
+m 'y 10
+m :y 10
 n y 20
-o . -30
+n 'y 20
+n :y 20
+~n y 20
+~n 'y 20
+~n :y 20
 o , -20
-p . -30
-p p -10
+o . -30
+'o , -20
+'o . -30
+^o , -20
+^o . -30
+:o , -20
+:o . -30
+`o , -20
+`o . -30
+~o , -20
+~o . -30
 p , -20
+p p -10
+p . -30
+. rq -80
 . ' -80
 . cq -80
-. rq -80
+lq A 10
 lq ` 20
 lq oq 20
-lq A 10
+` A 10
+oq A 10
 ` ` -115
 ` oq -115
 oq ` -115
 oq oq -115
-` A 10
-oq A 10
-' v 30
-cq v 30
-' t 20
-cq t 20
-' s -25
-cq s -25
-' r 30
-cq r 30
+' l 20
+cq l 20
+' rq 20
+cq rq 20
 ' ' -115
 ' cq -115
 cq ' -115
 cq cq -115
-' rq 20
-cq rq 20
-' l 20
-cq l 20
-r . -50
-r i 10
+' r 30
+cq r 30
+' s -25
+cq s -25
+' vs -25
+cq vs -25
+' t 20
+cq t 20
+' v 30
+cq v 30
 r , -40
-s . -20
+r i 10
+r 'i 10
+r ^i 10
+r :i 10
+r `i 10
+r . -50
 s , -10
-v . -30
+s . -20
+vs , -10
+vs . -20
 v , -20
-w . -30
-w o 10
-w h 20
+v . -30
 w , -20
+w h 20
+w o 10
+w 'o 10
+w ^o 10
+w :o 10
+w `o 10
+w ~o 10
+w . -30
 
 charset
 ha	520,594,0,62,-82,62	2	0	asciicircum
 ti	520,320,0,69,-73,69	0	1	asciitilde
-vS	460,831,81,184,5,87	2	2	Scaron
-vZ	620,831,19,99,8,87	2	3	Zcaron
+vS	460,821,81,184,5,87	2	2	Scaron
+vZ	620,821,19,99,8,87	2	3	Zcaron
 vs	320,659,14,194,4,87	2	4	scaron
 vz	440,659,14,124,24,87	2	5	zcaron
 :Y	560,762,168,264,9,87	2	6	Ydieresis
 tm	1000,594,0,96,-77,87	2	7	trademark
 aq	160,610,0,105,-95,87	2	8	quotesingle
+Eu	440,610,16,221,-21,87	2	9	Euro
 space	220	0	32	space
 !	280,610,14,123,-69,87	2	33	exclam
 "	220,610,0,163,-70,87	2	34	quotedbl
@@ -254,8 +709,8 @@
 rs	"
 ]	320,655,207,121,77,87	2	93	bracketright
 rB	"
-a^	340,649,0,153,-173,87	2	94	circumflex
-^	"
+^	340,649,0,153,-173,87	2	94	circumflex
+a^	"
 _	500,0,125,50,50,50	0	95	underscore
 `	240,610,0,149,-119,87	2	96	quoteleft
 oq	"
@@ -285,14 +740,14 @@
 x	420,438,195,219,-20,87	0	120	x
 y	400,438,314,133,74,87	1	121	y
 z	440,445,14,118,24,87	0	122	z
-lC	240,655,207,193,-5,87	2	123	braceleft
-{	"
-ba	520,714,16,0,-270	2	124	bar
-|	"
-rC	240,655,207,128,60,87	2	125	braceright
-}	"
-a~	440,619,0,132,-193,87	2	126	tilde
-~	"
+{	240,655,207,193,-5,87	2	123	braceleft
+lC	"
+|	520,750,250,0,-270	2	124	bar
+ba	"
+}	240,655,207,128,60,87	2	125	braceright
+rC	"
+~	440,619,0,132,-193,87	2	126	tilde
+a~	"
 bq	180,146,121,61,29,61	0	128	quotesinglbase
 Fo	340,414,0,66,-48,66	0	129	guillemotleft
 Fc	380,414,0,45,-67,45	0	130	guillemotright
@@ -309,15 +764,15 @@
 .i	240,438,14,116,-50,87	0	144	dotlessi
 ga	220,659,0,169,-143,87	2	146	grave
 a"	400,659,0,145,-158,87	2	147	hungarumlaut
-a.	220,610,0,158,-186,87	2	148	dotaccent
+a.	220,635,0,172,-186,87	2	148	dotaccent
 ab	440,631,0,111,-203,87	2	149	breve
 ah	340,659,0,184,-204,87	2	150	caron
 ao	300,659,0,166,-190,87	2	151	ring
-ho	280,6,191,3,12,3	0	152	ogonek
+ho	280,40,191,90,-64,87	0	152	ogonek
 lq	340,610,0,174,-119,87	2	153	quotedblleft
 rq	360,610,0,143,-108,87	2	154	quotedblright
 oe	560,438,14,118,-28,87	0	155	oe
-/l	300,714,14,265,-71,87	2	156	lslash
+/l	300,714,14,230,-24,87	2	156	lslash
 Bq	280,146,121,51,64,51	0	157	quotedblbase
 OE	820,610,16,139,-13,87	2	158	OE
 /L	580,610,16,127,1,87	2	159	Lslash
@@ -326,22 +781,23 @@
 Po	440,610,52,116,66,87	2	163	sterling
 Cs	440,509,0,84,0,84	0	164	currency
 Ye	440,647,168,223,51,87	2	165	yen
-bb	520,714,16,0,-270	2	166	brokenbar
+bb	520,675,175,0,-270	2	166	brokenbar
 sc	420,610,215,144,-3,87	2	167	section
-ad	360,610,0,159,-193,87	2	168	dieresis
+ad	360,635,0,193,-183,87	2	168	dieresis
 co	740,610,16,73,-87,73	2	169	copyright
 Of	260,610,0,176,-61,87	2	170	ordfeminine
 fo	240,414,0,68,-48,68	0	171	guilsinglleft
 tno	520,340,0,73,-67,73	0	172	logicalnot
 \-	520,242,0,73,-67,73	0	173	minus
 rg	740,610,16,73,-87,73	2	174	registered
-a-	440,578,0,75,-172,75	2	175	macron
+a-	440,584,0,147,-242,87	2	175	macron
 de	400,610,0,107,-121,87	2	176	degree
 t+-	520,436,0,73,-67,73	0	177	plusminus
 S2	264,610,0,140,-22,87	2	178	twosuperior
 S3	264,610,0,134,-9,87	2	179	threesuperior
 aa	300,659,0,172,-215,87	2	180	acute
-mc	460,438,314,113,43,87	1	181	mu
+*m	458,438,314,113,8,87	1	181	mu
+mc	"
 ps	500,594,199,188,-55,87	2	182	paragraph
 pc	220,310,0,71,-89,71	0	183	periodcentered
 ac	300,6,191,0,38	0	184	cedilla
@@ -355,8 +811,8 @@
 `A	620,821,16,127,37,87	2	192	Agrave
 'A	620,821,16,132,37,87	2	193	Aacute
 ^A	620,821,16,127,37,87	2	194	Acircumflex
-~A	620,771,16,132,37,87	2	195	Atilde
-:A	620,762,16,139,37,87	2	196	Adieresis
+~A	620,781,16,132,37,87	2	195	Atilde
+:A	620,762,16,173,37,87	2	196	Adieresis
 oA	620,831,16,127,37,87	2	197	Aring
 AE	740,594,16,109,71,87	2	198	AE
 ,C	520,610,191,161,-43,87	2	199	Ccedilla
@@ -367,13 +823,13 @@
 `I	380,821,0,174,-49,87	2	204	Igrave
 'I	380,821,0,202,-49,87	2	205	Iacute
 ^I	380,821,0,174,-49,87	2	206	Icircumflex
-:I	380,762,0,189,-49,87	2	207	Idieresis
+:I	380,762,0,223,-49,87	2	207	Idieresis
 -D	700,640,6,118,-36,87	2	208	Eth
-~N	700,761,168,265,-35,87	2	209	Ntilde
+~N	700,781,168,265,-35,87	2	209	Ntilde
 `O	600,821,16,110,-44,87	2	210	Ograve
 'O	600,821,16,110,-44,87	2	211	Oacute
 ^O	600,821,16,110,-44,87	2	212	Ocircumflex
-~O	600,761,16,110,-44,87	2	213	Otilde
+~O	600,781,16,110,-44,87	2	213	Otilde
 :O	600,762,16,110,-44,87	2	214	Odieresis
 tmu	520,410,0,57,-83,57	0	215	multiply
 /O	660,672,78,141,-33,87	2	216	Oslash
@@ -388,25 +844,25 @@
 'a	420,659,15,122,-42,87	2	225	aacute
 ^a	420,649,15,115,-42,87	2	226	acircumflex
 ~a	420,619,15,152,-42,87	2	227	atilde
-:a	420,610,15,115,-42,87	2	228	adieresis
+:a	420,610,15,143,-42,87	2	228	adieresis
 oa	420,659,15,115,-42,87	2	229	aring
 ae	540,468,14,134,-17,87	0	230	ae
 ,c	340,438,191,116,-12,87	0	231	ccedilla
 `e	340,659,14,113,-37,87	2	232	egrave
 'e	340,659,14,172,-37,87	2	233	eacute
 ^e	340,649,14,143,-37,87	2	234	ecircumflex
-:e	340,610,14,159,-37,87	2	235	edieresis
+:e	340,610,14,193,-37,87	2	235	edieresis
 `i	240,659,14,116,-50,87	2	236	igrave
 'i	240,659,14,202,-50,87	2	237	iacute
 ^i	240,649,14,173,-50,87	2	238	icircumflex
-:i	240,610,14,179,-50,87	2	239	idieresis
+:i	240,610,14,213,-50,87	2	239	idieresis
 Sd	400,714,14,172,-37,87	2	240	eth
 ~n	460,619,14,134,-51,87	2	241	ntilde
 `o	400,659,14,99,-37,87	2	242	ograve
 'o	400,659,14,132,-37,87	2	243	oacute
 ^o	400,649,14,103,-37,87	2	244	ocircumflex
 ~o	400,619,14,152,-37,87	2	245	otilde
-:o	400,610,14,129,-37,87	2	246	odieresis
+:o	400,610,14,163,-37,87	2	246	odieresis
 tdi	520,440,14,73,-67,73	0	247	divide
 /o	440,488,64,150,4,87	0	248	oslash
 `u	460,659,14,118,-52,87	2	249	ugrave
@@ -415,5 +871,5 @@
 :u	460,610,14,118,-52,87	2	252	udieresis
 'y	400,659,314,133,74,87	3	253	yacute
 Tp	440,714,314,115,88,87	3	254	thorn
-:y	400,610,314,133,74,87	3	255	ydieresis
+:y	400,610,314,153,74,87	3	255	ydieresis
 u2026	1000,128,14,0,-74	0	256	ellipsis
diff -ruN groff-1.20.1/font/devps/ZD groff-1.21/font/devps/ZD
--- groff-1.20.1/font/devps/ZD	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/ZD	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Zapf Dingbats
 #   Version 002.000
diff -ruN groff-1.20.1/font/devps/ZDR groff-1.21/font/devps/ZDR
--- groff-1.20.1/font/devps/ZDR	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/font/devps/ZDR	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# This file has been generated with GNU afmtodit (groff) version 1.20
+# This file has been generated with GNU afmtodit (groff) version 1.20.1
 #
 #   FullName ITC Zapf Dingbats Reverse
 #   Version 002.000
diff -ruN groff-1.20.1/install-sh groff-1.21/install-sh
--- groff-1.20.1/install-sh	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/install-sh	2010-12-31 08:33:08.000000000 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -ruN groff-1.20.1/Makefile.comm groff-1.21/Makefile.comm
--- groff-1.20.1/Makefile.comm	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/Makefile.comm	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2002, 2003, 2004, 2006, 2007, 2009
+# Copyright (C) 1989-2000, 2002, 2003, 2004, 2006, 2007, 2009, 2010
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
@@ -20,7 +20,8 @@
 # Makefile.comm
 #
 INCLUDES=-I. -I$(srcdir) \
-  -I$(top_builddir)/src/include -I$(top_srcdir)/src/include
+  -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \
+  -I$(tob_builddir)/src/libs/gnulib/lib
 ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
 COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
 ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
@@ -31,6 +32,7 @@
 LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT)
 LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT)
 LIBXUTIL=$(top_builddir)/src/libs/libxutil/libxutil.$(LIBEXT)
+LIBGNU=$(top_builddir)/src/libs/gnulib/lib/libgnu.$(LIBEXT)
 MLIB=
 XLIBS=
 YTABH=
diff -ruN groff-1.20.1/Makefile.in groff-1.21/Makefile.in
--- groff-1.20.1/Makefile.in	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/Makefile.in	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
@@ -21,6 +21,8 @@
 #
 SHELL=@SHELL@
 
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
+
 srcdir=@srcdir@
 top_srcdir=@abs_top_srcdir@
 VPATH=@srcdir@
@@ -139,6 +141,7 @@
 
 # `datasubdir' says where to install platform-independent data files.
 datadir=@datadir@
+datarootdir=@datarootdir@
 dataprogramdir=$(datadir)/groff
 datasubdir=$(dataprogramdir)/$(version)$(revision)
 
@@ -146,7 +149,7 @@
 infodir=@infodir@
 
 # `docdir' says where to install documentation files.
-docdir=$(datadir)/doc/groff/$(version)$(revision)
+docdir=@docdir@
 
 # `exampledir' says where to install example files.
 exampledir=$(docdir)/examples
@@ -542,7 +545,8 @@
 
 MAKE_K_FLAG=`case "$(MAKEFLAGS)" in *k*) echo ' -k ';; esac`
 
-INCDIRS=src/include
+INCDIRS=\
+  src/include
 LIBDIRS=\
   src/libs/libgroff \
   src/libs/libdriver \
@@ -573,8 +577,13 @@
   src/utils/addftinfo
 CPROGDIRS=\
   src/utils/pfbtops
-PROGDEPDIRS=arch/misc
-PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(XPROGDIRS)
+PROGDEPDIRS=\
+  arch/misc
+PROGDIRS=\
+  $(PROGDEPDIRS) \
+  $(CCPROGDIRS) \
+  $(CPROGDIRS) \
+  $(XPROGDIRS)
 DEVDIRS=\
   font/devps \
   font/devdvi \
@@ -602,8 +611,15 @@
   contrib/hdtbl \
   contrib/pdfmark \
   contrib/gdiffmk
-ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
-  $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+ALLDIRS=\
+  $(INCDIRS) \
+  $(LIBDIRS) \
+  $(PROGDIRS) \
+  $(DEVDIRS) \
+  $(XDEVDIRS) \
+  $(OTHERDEVDIRS) \
+  $(TTYDEVDIRS) \
+  $(OTHERDIRS)
 EXTRADIRS=\
   font/devps/generate \
   font/devdvi/generate \
@@ -623,13 +639,36 @@
   contrib/mom/momdoc \
   contrib/gdiffmk/tests \
   src/libs/snprintf \
+  src/libs/gnulib/lib \
+  src/libs/gnulib/lib/uniwidth \
+  src/libs/gnulib/m4 \
+  src/libs/gnulib/build-aux \
+  src/libs/gnulib \
   font/devps/old \
   font/util
+GNULIBDIRS=\
+  src/libs/gnulib
 DISTDIRS=\
-  $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) \
-  $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
-TARGETS=all install_bin install_data clean distclean mostlyclean \
-  realclean extraclean distfiles TAGS depend uninstall_sub fonts
+  $(INCDIRS) \
+  $(LIBDIRS) \
+  $(PROGDIRS) \
+  $(DEVDIRS) \
+  $(XDEVDIRS) \
+  $(OTHERDEVDIRS) \
+  $(ALLTTYDEVDIRS) \
+  $(OTHERDIRS) \
+  $(EXTRADIRS) \
+  $(NOMAKEDIRS) \
+  $(GNULIBDIRS)
+TARGETS=\
+  all \
+  install_bin install_data \
+  clean distclean mostlyclean realclean extraclean \
+  distfiles \
+  TAGS \
+  depend \
+  uninstall_sub \
+  fonts
 
 # This ENVSETUP gork is required by the DJGPP build on Windows 9X,
 # where Make needs to be case-sensitive to find files like BI and VERSION.
@@ -655,7 +694,7 @@
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $(top_srcdir)/Makefile.sub $(do)
 
-$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS)
+$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) $(GNULIBDIRS)
 	@$(ENVSETUP); \
 	if test $(srcdir) = .; then \
 	  srcdir=.; \
@@ -717,6 +756,21 @@
 	  -f $$srcdir/Makefile.sub \
 	  -f $(top_srcdir)/Makefile.dev $(do)
 
+$(GNULIBDIRS): FORCE
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; then \
+	  srcdir=.; \
+	else \
+	  srcdir=`cd $(srcdir); pwd`/$@; \
+	fi; \
+	test -d $@ || $(mkinstalldirs) $@; \
+	case $(do) in \
+	all) \
+	cd $@; \
+	test -f Makefile || $(SHELL) $$srcdir/configure ; \
+	$(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
+	esac
+
 $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
 
 $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
diff -ruN groff-1.20.1/man/groff_char.man groff-1.21/man/groff_char.man
--- groff-1.20.1/man/groff_char.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/man/groff_char.man	2010-12-31 08:33:09.000000000 +0100
@@ -1346,9 +1346,9 @@
 .2s CL club u2663 "black club suit"
 .C2 SP spade u2660 "black spade suit"
 .C2 HE heart u2665 "black heart suit"
-.C2 u2662 uni2662 u2662 "white heart suit"
+.C2 u2661 uni2661 u2661 "white heart suit"
 .C2 DI diamond u2666 "black diamond suit"
-.2e u2661 uni2661 u2661 "white diamond suit"
+.2e u2662 uni2662 u2662 "white diamond suit"
 .
 .
 .\" --------------------------------------------------------------------
diff -ruN groff-1.20.1/man/groff_diff.man groff-1.21/man/groff_diff.man
--- groff-1.20.1/man/groff_diff.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/man/groff_diff.man	2010-12-31 08:33:09.000000000 +0100
@@ -6,7 +6,8 @@
 This file is part of groff, the GNU roff type-setting system.
 It is the source of the man-page groff_diff(7).
 
-Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009
+Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009,
+              2010
   Free Software Foundation, Inc.
 written by James Clark
 
@@ -137,7 +138,7 @@
 taking
 .IR arg1 ,
 .IR arg2 ,
-.I .\|.\|.\&
+.IR .\|.\|. ,
 as arguments.
 .
 .TP
@@ -964,10 +965,11 @@
 .BR \[rs]p .
 .
 .TP
-.BI .cflags\  n\ c1\ c2\|.\|.\|.\&
+.BI .cflags\  "n c1 c2 .\|.\|."
 Characters
 .IR c1 ,
-.IR c2 ,\|.\|.\|.\&
+.IR c2 ,
+.IR .\|.\|. ,
 have properties determined by
 .IR n ,
 which is ORed from the following:
@@ -991,7 +993,6 @@
 have this property); a line is not broken at a character with this
 property unless the characters on each side both have non-zero
 hyphenation codes.
-
 This can be overridden with value 64.
 .
 .IP 8
@@ -1019,8 +1020,33 @@
 Ignore hyphenation code values of the surrounding characters.
 Use this in combination with values 2 and\~4 (initially no characters
 have this property).
+.
+.IP 128
+Prohibit a line break before the character, but allow a line break after the
+character.
+This works only in combination with flags 256 and 512 and has no effect
+otherwise.
+.
+.IP 256
+Prohibit a line break after the character, but allow a line break before
+the character.
+This works only in combination with flags 128 and 512 and has no effect
+otherwise.
+.
+.IP 512
+Allow line break before or after the character.
+This works only in combination with flags 128 and 256 and has no effect
+otherwise.
 .RE
 .
+.IP
+Contrary to flag values 2 and\~4, the flags 128, 256, and 512 work pairwise.
+If, for example, the left character has value 512, and the right character
+128, no line break gets inserted.
+If we use value\~6 instead for the left character, a line break after the
+character can't be suppressed since the right neighbour character doesn't
+get examined.
+.
 .TP
 .BI .char\  c\ string
 [This request can both define characters and glyphs.]
@@ -1092,6 +1118,21 @@
 that are to be interpolated as strings.
 .
 .TP
+.BI .class\  "name c1 c2 .\|.\|."
+Assign
+.I name
+to a set of characters
+.IR c1 ,
+.IR c2 ,
+.IR .\|.\|. ,
+so that they can be referred to from other requests easily (currently
+.B .cflags
+only).
+Character ranges (indicated by an intermediate `-') and nested classes
+are possible also.
+This is useful to assign properties to a large set of characters.
+.
+.TP
 .BI .close\  stream
 Close the stream named
 .IR stream ;
@@ -1393,12 +1434,13 @@
 .BR .special .
 .
 .TP
-.BI .fspecial\  f\ s1\ s2\|.\|.\|.\&
+.BI .fspecial\  "f s1 s2 .\|.\|."
 When the current font is\~\c
 .IR f ,
 fonts
 .IR s1 ,
-.IR s2 ,\|.\|.\|.\&
+.IR s2 ,
+.IR .\|.\|. ,
 are special, that is, they are searched for glyphs not in
 the current font.
 .
@@ -1469,7 +1511,7 @@
 switch to the previous glyph color.
 .
 .TP
-.BI .hcode \ c1\ code1\ c2\ code2\|.\|.\|.\&
+.BI .hcode\  "c1 code1 c2 code2 .\|.\|."
 Set the hyphenation code of character
 .I c1
 to
@@ -1477,7 +1519,8 @@
 and that of
 .I c2
 to
-.IR code2 .
+.IR code2 ,
+and so on.
 A hyphenation code must be a single input character (not a special
 character) other than a digit or a space.
 .
@@ -1599,6 +1642,10 @@
 request to map the encoding used in hyphenation patterns files to
 .BR groff 's
 input encoding.
+.
+By default, everything maps to itself except letters `A' to `Z' which
+map to `a' to `z'.
+.
 .IP
 The set of hyphenation patterns is associated with the current language
 set by the
@@ -1620,7 +1667,7 @@
 are appended to the patterns already loaded in the current language.
 .
 .TP
-.BI .hpfcode\  a\ b\ c\ d\ .\|.\|.
+.BI .hpfcode\  "a b c d .\|.\|."
 After reading a hyphenation patterns file with the
 .B hpf
 or
@@ -1767,6 +1814,19 @@
 is set to\~1 if in line-tabs mode, and 0 otherwise.
 .
 .TP
+.BI .lsm\  xx
+Set the leading spaces macro to
+.IR xx .
+If there are leading spaces in an input line, it is invoked instead of
+the usual troff behaviour; the leading spaces are removed.
+Registers
+.B \[rs]n[lsn]
+and
+.B \[rs]n[lss]
+hold the number of removed leading spaces and the corresponding
+horizontal space, respectively.
+.
+.TP
 .BI .mso\  file
 The same as the
 .B so
@@ -1784,6 +1844,12 @@
 .BI tmac. name
 instead and vice versa.
 .
+A warning of type
+.B file
+is generated if
+.I file
+can't be loaded, and the request is ignored.
+.
 .TP
 .BI .nop \ anything
 Execute
@@ -1906,10 +1972,11 @@
 with a positive value which are applied after the line is output.
 .
 .TP
-.BI .rchar\  c1\ c2\|.\|.\|.\&
+.BI .rchar\  "c1 c2 .\|.\|."
 Remove the definitions of glyphs
 .IR c1 ,
-.IR c2 ,\|.\|.\|.
+.IR c2 ,
+.I .\|.\|.
 This undoes the effect of a
 .B char
 request.
@@ -1924,10 +1991,11 @@
 No effect otherwise.
 .
 .TP
-.BI .rfschar\  c1\ c2\|.\|.\|.\&
+.BI .rfschar\  "c1 c2 .\|.\|."
 Remove the font-specific definitions of glyphs
 .IR c1 ,
-.IR c2 ,\|.\|.\|.
+.IR c2 ,
+.I .\|.\|.
 This undoes the effect of a
 .B fschar
 request.
@@ -2015,7 +2083,7 @@
 Shifting by negative amounts is currently undefined.
 .
 .TP
-.BI .sizes\  s1\ s2\|.\|.\|.\|sn\  [0]
+.BI .sizes\  s1\ s2\ .\|.\|.\ sn\  [0]
 This command is similar to the
 .B sizes
 command of a
@@ -2024,7 +2092,8 @@
 .
 It sets the available font sizes for the current font to
 .IR s1 ,
-.IR s2 ,\|.\|.\|.\|,\~ sn
+.IR s2 ,
+.IR .\|.\|.\| ,\~ sn
 scaled points.
 .
 The list of sizes can be terminated by an optional\~\c
@@ -2039,10 +2108,11 @@
 than a single line.
 .
 .TP
-.BI .special\  s1\ s2\|.\|.\|.\&
+.BI .special\  "s1 s2 .\|.\|."
 Fonts
 .IR s1 ,
-.IR s2 ,\|.\|.\|.\&
+.IR s2 ,
+.IR .\|.\|. ,
 are special and are searched for glyphs not in the current
 font.
 .
@@ -2539,18 +2609,21 @@
 with either a newline or two spaces.
 .
 .TP
-.BI .ta\  n1\ n2\|.\|.\|.nn \ T\  r1\ r2\|.\|.\|.\|rn
+.BI .ta\  "n1 n2 .\|.\|. nn " "T " "r1 r2 .\|.\|. rn"
 Set tabs at positions
 .IR n1 ,
-.IR n2 ,\|.\|.\|.\|,
+.IR n2 ,
+.IR .\|.\|. ,
 .I nn
 and then set tabs at
 .IR nn \|+\| r1 ,
-.IR nn \|+\| r2 ,\|.\|.\|.\|,
+.IR nn \|+\| r2 ,
+.IR .\|.\|. ,
 .IR nn \|+\| rn
 and then at
 .IR nn \|+\| rn \|+\| r1 ,
-.IR nn \|+\| rn \|+\| r2 ,\|.\|.\|.\|,
+.IR nn \|+\| rn \|+\| r2 ,
+.IR .\|.\|. ,
 .IR nn \|+\| rn \|+\| rn ,
 and so on.
 For example,
@@ -2767,6 +2840,16 @@
 1\~if no-space mode is active, 0\~otherwise.
 .
 .TP
+.B \[rs]n[.O]
+The current output level as set with
+.BR \[rs]O .
+.
+.TP
+.B \[rs]n[.P]
+1\~if the current page is in the output list set with
+.BR \-o .
+.
+.TP
 .B \[rs]n[.pe]
 1\~during a page ejection caused by the
 .B bp
@@ -2900,7 +2983,7 @@
 .B \[rs]n[urx]
 .TQ
 .B \[rs]n[ury]
-These four registers are set by the
+These four read/\:write registers are set by the
 .B psbb
 request and contain the bounding box values (in PostScript units) of a
 given PostScript image.
@@ -2952,6 +3035,14 @@
 The current horizontal position at input line.
 .
 .TP
+.B \[rs]n[lsn]
+.TQ
+.B \[rs]n[lss]
+If there are leading spaces in an input line, these registers
+hold the number of leading spaces and the corresponding
+horizontal space, respectively.
+.
+.TP
 .B \[rs]n[minutes]
 The number of minutes after the hour.
 .
@@ -3783,7 +3874,7 @@
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009
+Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010
 Free Software Foundation, Inc.
 .
 .P
diff -ruN groff-1.20.1/man/groff.man groff-1.21/man/groff.man
--- groff-1.20.1/man/groff.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/man/groff.man	2010-12-31 08:33:09.000000000 +0100
@@ -5,7 +5,7 @@
 This file is part of groff, the GNU roff type-setting system.
 
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-              2009
+              2009, 2010
   Free Software Foundation, Inc.
 written by Bernd Warken <bwarken@mayn.de>
 maintained by Werner Lemberg <wl@gnu.org>
@@ -294,7 +294,7 @@
 The control lines start with a control character, by default a period
 .dquoted_char .
 or a single quote
-.dquoted_char ' ;
+.dquoted_char \[aq] ;
 all other lines are text lines.
 .
 .P
@@ -326,7 +326,7 @@
 These are in-line or even in-word formatting elements or functions.
 .
 Some of these take arguments separated by single quotes
-.dquoted_char ' ,
+.dquoted_char \[aq] ,
 others are regulated by a length encoding introduced by an open
 parenthesis
 .squoted_char (
@@ -391,7 +391,7 @@
 are written on a line of their own starting with a dot
 .squoted_char .
 or a
-.dquoted_char ' ,
+.dquoted_char \[aq] ,
 whereas
 .B Escape sequences
 are in-line functions and in-word formatting elements starting with a
@@ -558,7 +558,7 @@
 line of its own.
 .
 .TP
-\&\f[CB]'\f[]
+\&\f[CB]\[aq]\f[]
 The single quote has two controlling tasks.
 .
 At the beginning of a line and in the conditional requests it is the
@@ -884,21 +884,22 @@
 .BI ! N
 True if the value of
 .I I
-is\~0.
+is\~0 (see below).
 .
 .TPx
-.BI ' s1 ' s2 '
+.BI \[aq] s1 \[aq] s2 \[aq]
 True if string\~\c
 .I s1
 is identical to string\~\c
 .IR s2 .
 .
 .TPx
-.BI !' s1 ' s2 '
+.BI !\[aq] s1 \[aq] s2 \[aq]
 True if string\~\c
 .I s1
 is not identical to string\~\c
-.IR s2 .
+.I s2
+(see below).
 .
 .TPx
 .BI c ch
@@ -952,6 +953,13 @@
 .
 .RE
 .PD
+.P
+Note that the
+.B !
+operator may only appear at the beginning of an expression,
+and negates the entire expression.
+This maintains bug-compatibility with AT&T
+.IR troff .
 .
 .
 .\" --------------------------------------------------------------------
@@ -1240,7 +1248,7 @@
 .TPx
 .REQ .c2
 Reset no-break control character to
-.dquoted_char ' .
+.dquoted_char \[aq] .
 .
 .TPx
 .REQ .c2 "c"
@@ -1304,6 +1312,15 @@
 .IR object .
 .
 .TPx
+.REQ .class "name c1 c2 .\|.\|.\&"
+Assign a set of characters, character ranges, or classes
+.IR c1 ,
+.IR c2 ,
+.I .\|.\|.\&
+to
+.IR name .
+.
+.TPx
 .REQ .close "stream"
 Close the
 .IR stream .
@@ -1873,6 +1890,15 @@
 .scaleindicator m ).
 .
 .TPx
+.REQ .lsm
+Unset the leading spaces macro.
+.
+.TPx
+.REQ .lsm "macro"
+Set the leading spaces macro to
+.IR macro .
+.
+.TPx
 .REQ .ls
 Change to the previous value of additional intra-line skip.
 .
@@ -3439,6 +3465,11 @@
 .PD 0
 .
 .TPx
+.REG $$
+The process ID of 
+.BR troff .
+.
+.TPx
 .REG .$
 Number of arguments in the current macro or string.
 .
@@ -3457,6 +3488,12 @@
 .BR nroff .
 .
 .TPx
+.REG .b
+The emboldening offset while
+.request .bd
+is active.
+.
+.TPx
 .REG .br
 Within a macro, set to\~1 if macro called with the `normal' control
 character, and to\~0 otherwise.
@@ -3512,6 +3549,10 @@
 Current font number.
 .
 .TPx
+.REG .F
+The name of the current input file (string-valued).
+.
+.TPx
 .REG .fam
 The current font family (string-valued).
 .
@@ -3591,6 +3632,15 @@
 .esc c .
 .
 .TPx
+.REG .j
+The current adjustment mode.
+It can be stored and used to set adjustment.
+(n=1, b=1, l=0, r=5, c=3).
+.
+.TPx
+.REG .k
+The current horizontal output position (relative to the current indentation).
+.TPx
 .REG .kern
 1\~if pairwise kerning is enabled, 0\~otherwise.
 .
@@ -3599,6 +3649,11 @@
 Current line length.
 .
 .TPx
+.REG .L
+The current line spacing setting as set by
+.request .ls .
+.
+.TPx
 .REG .lg
 The current ligature mode (as set by the
 .request lg
@@ -3650,10 +3705,21 @@
 Current page offset.
 .
 .TPx
+.REG .O
+The suppression nesting level (see
+.esc O ).
+.
+.TPx
 .REG .p
 Current page length.
 .
 .TPx
+.REG .P
+1\~if the current page is being printed, 0\~otherwise (as determined by the
+.option \-o
+command line option).
+.
+.TPx
 .REG .pe
 1\~during page ejection, 0\~otherwise.
 .
@@ -3676,6 +3742,11 @@
 The current post-vertical line spacing.
 .
 .TPx
+.REG .R
+The number of unused number registers.
+Always 10000 in GNU troff.
+.
+.TPx
 .REG .rj
 The number of lines to be right-justified as set by the
 .request rj
@@ -3857,6 +3928,15 @@
 Output line number.
 .
 .TPx
+.REG lsn
+The number of leading spaces of an input line.
+.
+.TPx
+.REG lss
+The horizontal space corresponding to the leading spaces of an input
+line.
+.
+.TPx
 .REG minutes
 The number of minutes after the hour.
 .
@@ -3871,6 +3951,21 @@
 Vertical position of last printed text base-line.
 .
 .TPx
+.REG opmaxx
+.TPx
+.REG opmaxy
+.TPx
+.REG opminx
+.TPx
+.REG opminy
+These four registers mark the top left and bottom right hand corners of a box
+which encompasses all written glyphs.
+They are reset to \-1 by
+.escarg O 0
+or
+.escarg O 1 .
+.
+.TPx
 .REG rsb
 Like
 .register sb ,
diff -ruN groff-1.20.1/MANIFEST groff-1.21/MANIFEST
--- groff-1.20.1/MANIFEST	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/MANIFEST	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-    Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2009
+    Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -90,6 +90,7 @@
 ./src/include   The *.h C/C++ include files.
 
 ./src/libs      C++ code common to several parts of the groff sources.
+  gnulib        Auxiliary functions copied from the `gnulib' repository.
   libbib        Library of bibliographic functions.
   libdriver     Parser for intermediate output and postprocessor code.
   libgroff      Library for general support functions used everywhere.
diff -ruN groff-1.20.1/mkinstalldirs groff-1.21/mkinstalldirs
--- groff-1.20.1/mkinstalldirs	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/mkinstalldirs	2010-12-31 08:33:08.000000000 +0100
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2006-05-11.19
+scriptversion=2009-04-28.21; # UTC
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -157,5 +157,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -ruN groff-1.20.1/NEWS groff-1.21/NEWS
--- groff-1.20.1/NEWS	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/NEWS	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
     Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                  2009
+                  2009, 2010
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -9,6 +9,57 @@
 This file describes recent user-visible changes in groff.  Bug fixes are not
 described.  There are more details in the man and info pages.
 
+VERSION 1.21
+============
+
+Troff
+-----
+
+o The new `lsm' request specifies a macro to be invoked when leading spaces
+  in an input line are encountered (which are removed then).  Number
+  registers `lsn' and `lss' hold the number of removed leading spaces and
+  the corresponding horizontal space, respectively.
+
+o There is a new warning category `file', enabled by default.  The `mso'
+  request emits warnings in this category when the requested macro file does
+  not exist.
+
+o The new `class' request assigns a short name to a set of characters
+  which can be referred to in the `cflags' request.  This is especially
+  useful to control line-breaking and hyphenation rules in CJK languages.
+
+o Three new values for the `cflags' request have been added, which are
+  needed for proper CJK support.
+
+    128  prohibit before but allow break after character
+    256  prohibit after but allow break before character
+    512  allow break before and after character
+
+Tbl
+---
+
+o A new global option `nowarn' suppresses warnings if tables are longer than
+  the current line width.
+
+Afmtodit
+--------
+
+o New option `-o' to specify the name of the output file.
+
+Macro Packages
+--------------
+
+o A new macro `%U' has been added to the mdoc package to indicate a URL
+  reference within an .Rs/.Re environment.
+
+o Rudimentary support for the Japanese script has been added, most suitable
+  for man page handling as output by grotty.  The file `ja.tmac' contains
+  the necessary setup to allow line breaks before and after CJK characters
+  (with proper exceptions).  Note, however, that no inter-character spacing
+  is implemented yet -- this usually causes many warnings about bad line
+  breaks.
+
+
 VERSION 1.20.1
 ==============
 
diff -ruN groff-1.20.1/PROBLEMS groff-1.21/PROBLEMS
--- groff-1.20.1/PROBLEMS	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/PROBLEMS	2010-12-31 08:33:08.000000000 +0100
@@ -1,4 +1,4 @@
-    Copyright 1989-2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
+    Copyright 1989-2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -22,19 +22,19 @@
   only gives garbage.
 
 groff by default now uses SGR escape sequences (`ANSI color') to
-control the display attributes (bold, underlined, colour) on TTYs. 
+control the display attributes (bold, underlined, colour) on TTYs.
 Some terminals (e.g. `kterm') don't understand SGR, and some pagers
 (e.g. older versions of `less' or `less' without the -R option) don't
-understand SGR either.  There are three solutions to fix this, in order
-of preference; please read the grotty man page for more details.
+understand SGR either.  There are three solutions to fix this, in
+order of preference; please read the grotty man page for more details.
 
 The fourth and probably best option is to update your terminal program
 and pager to versions which can handle SGR.
 
   1. Set the GROFF_NO_SGR environment variable.
 
-  2. Pass option `-c' to grotty (this is, add `-P-c' to groff's command
-     line options).
+  2. Pass option `-c' to grotty (this is, add `-P-c' to groff's
+     command line options).
 
   3. Append the following fragment to the `troffrc' file:
 
@@ -103,9 +103,9 @@
 
 The used Unicode characters (U+2212 for the minus sign and U+2010 for
 the hyphen) are the correct ones, but many programs can't search them
-properly.  The same is true for the right quote (U+201D).  To map those
-characters back to the ASCII characters, insert the following code
-snippet into the `troffrc' configuration file:
+properly.  The same is true for the right quote (U+201D).  To map
+those characters back to the ASCII characters, insert the following
+code snippet into the `troffrc' configuration file:
 
 .if '\*[.T]'utf8' \{\
 .  char \- \N'45'
@@ -115,6 +115,15 @@
 
 ----------------------------------------------------------------------
 
+* Processing mdoc man pages like `groff_mdoc.n' fails if I use
+  `test-groff'.  Why?
+
+The mdoc package works only after installation, not with test-groff. 
+Reason is that the macro files of mdoc get stripped off the `doc-'
+prefix before they are copied to the final destination.
+
+----------------------------------------------------------------------
+
 * My document says that the current year is 19100, not 2000.
 
 In groff, as in traditional troff, the yr number register yields the
@@ -142,10 +151,10 @@
 * groff can't handle my troff document.  It works fine with AT&T
   troff.
 
-Read the section on incompatibilities in groff_diff(7).  Try using
-the -C option.  Alternatively there's the sed script
-`tmac/fixmacros.sed' which attempts to edit a file of macros so
-that it can be used with groff without the -C flag.
+Read the section on incompatibilities in groff_diff(7).  Try using the
+-C option.  Alternatively there's the sed script `tmac/fixmacros.sed'
+which attempts to edit a file of macros so that it can be used with
+groff without the -C flag.
 
 ----------------------------------------------------------------------
 
@@ -166,8 +175,8 @@
 
 Yes, it does.  You may need to compile fonts with Metafont at these
 magnifications.  The CompileFonts script in the devdvi/generate
-directory may help you to do this.  (It takes a *long* time on
-slow computers.)
+directory may help you to do this.  (It takes a *long* time on slow
+computers.)
 
 ----------------------------------------------------------------------
 
@@ -211,8 +220,8 @@
   .ps	\" restore the previous point size
 
 (with a tab after the .ps) does NOT restore the previous point-size;
-instead it is silently ignored.  Since this is very likely to be
-an error, gtroff can give a warning about it.  If you want to align
+instead it is silently ignored.  Since this is very likely to be an
+error, gtroff can give a warning about it.  If you want to align
 comments, you can do it like this:
 
   .ev\"				\" a comment
@@ -222,8 +231,8 @@
 * I don't like the page headers and footers produced by groff -man.
 
 There seem to be many different styles of page header and footer
-produced by different versions of the -man macros.  You need to
-put modified macros from tmac/an-old.tmac into man.local.  More
+produced by different versions of the -man macros.  You need to put
+modified macros from tmac/an-old.tmac into man.local.  More
 information is available in groff_man(7).
 
 ----------------------------------------------------------------------
@@ -244,9 +253,9 @@
 
 \n(st and \n(sb aren't supposed to give the height and depth of the
 string rather they give the minimum and maximum vertical displacement
-of the baseline.  For example for \v'2u'\v'-3u', \n(st is 1 and
-\n(sb is -2.  The height and depth of the string is available in
-the \n[rst] and \n[rsb] registers: these are groff extensions.
+of the baseline.  For example for \v'2u'\v'-3u', \n(st is 1 and \n(sb
+is -2.  The height and depth of the string is available in the \n[rst]
+and \n[rsb] registers: these are groff extensions.
 
 ----------------------------------------------------------------------
 
@@ -421,10 +430,10 @@
 with a body of `help' to ps-file-server@adobe.com.)
 
 If an EPS file to be included via \X'ps: import' does not start with
-`%!PS-Adobe-...', gtroff still includes the file, but grops does
-not add any fonts to the generated output file that are listed in the
-EPS file, even though the files are listed in the `download' file and
-are available in the devps directory.
+`%!PS-Adobe-...', gtroff still includes the file, but grops does not
+add any fonts to the generated output file that are listed in the EPS
+file, even though the files are listed in the `download' file and are
+available in the devps directory.
 
 ----------------------------------------------------------------------
 
@@ -460,11 +469,12 @@
 This error means you haven't correctly installed the application
 defaults file, GXditview.ad; `make install' does this for you
 automatically, so either you didn't do `make install', or you haven't
-passed a good `--appresdir=<DIR>' argument to groff's configure script.
+passed a good `--appresdir=<DIR>' argument to groff's configure
+script.
 
-See the X(7) man page for information how and where application resource
-files have to be located.  Look for the XAPPLRESDIR and XUSERFILESEARCHPATH
-environment variables.
+See the X(7) man page for information how and where application
+resource files have to be located.  Look for the XAPPLRESDIR and
+XUSERFILESEARCHPATH environment variables.
 
 ----------------------------------------------------------------------
 
@@ -532,8 +542,8 @@
 In fact groff generates only level 2 PostScript (or rather level 1
 with some extensions; see grops(1) for more information how to disable
 them).  The `%!PS-Adobe-3.0' comment at the beginning of PostScript
-output generated by groff indicates that the file conforms to
-version 3.0 of the Adobe Document Structuring Conventions.  The output
+output generated by groff indicates that the file conforms to version
+3.0 of the Adobe Document Structuring Conventions.  The output
 generated by groff should be printable on any PostScript printer.
 Problems with groff output's not printing are most often caused by the
 spooling system.
@@ -640,13 +650,13 @@
 are unnecessary if you install with the `g' Makefile variable defined
 as empty):
 
-Create a script called 'eqn':
+Create a script called `eqn':
 
  > #! /bin/sh
  > if [ ${1:-""} = /usr/pub/eqnchar ] ; then shift ; fi
  > geqn $*
 
-and a script called 'neqn':
+and a script called `neqn':
 
  > #! /bin/sh
  > if [ ${1:-""} = /usr/pub/eqnchar ] ; then shift ; fi
@@ -661,8 +671,8 @@
  > rest=`echo ${1+"$@"} | sed -e 's+/usr/lib/tmac+/usr/local/lib/groff/tmac+'`
  > exec groff -Wall -mtty-char $T $opts $rest
 
-To get PostScript output from 'man -t', you also need to create a
-'psroff' script similar to 'nroff'.  Here are the context diffs:
+To get PostScript output from `man -t', you also need to create a
+`psroff' script similar to `nroff'.  Here are the context diffs:
 
 *** /usr/local/bin/nroff        Sat Feb 13 15:51:09 1993
 --- /usr/local/bin/psroff       Sat Feb 13 17:45:46 1993
@@ -753,13 +763,13 @@
 [This has been fixed in z/OS V1R3 (aka OS/390 R13).]
 
 There is a bug in the Language Environment (LE) whereby the test
-program for static destructors fails.  You see the message
-`configure: error: a working C++ compiler is required'.
+program for static destructors fails.  You see the message `configure:
+error: a working C++ compiler is required'.
 
 Applying PTF UQ42006 is supposed to fix this, but the test program is
 still returning the wrong value (1).  To work around this problem, you
-can comment out the following in the configure script (near line 2029).
-This effectively bypasses the test (static constructors and
+can comment out the following in the configure script (near line
+2029).  This effectively bypasses the test (static constructors and
 destructors do actually work properly):
 
 #if { (eval echo "$as_me:2029: \"$ac_link\"") >&5
@@ -919,7 +929,31 @@
 
 ----------------------------------------------------------------------
 
-* When compiling on MacOS X, groff compiles but does not run well,
-  especially `eqn', causing many `can't break line' messages.
+* In MacOS X, I want to completely replace the groff that came with
+  the system.
+
+Use
+
+  ./configure --prefix=/usr --mandir=/usr/share/man
+
+then
+
+  make
+  make install
+
+Note that subsequent system updates may replace your groff.
+
+----------------------------------------------------------------------
+
+* When compiling on MacOS X 10.2, groff compiles but does not run
+  well, especially `eqn', causing many `can't break line' messages.
+
+Use
+
+  ./configure CXX=g++2
+
+then
+
+  make
 
-Use  ./configure CXX=g++2  then make as usual.
+as usual.
diff -ruN groff-1.20.1/REVISION groff-1.21/REVISION
--- groff-1.20.1/REVISION	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/REVISION	2010-12-31 08:33:08.000000000 +0100
@@ -1 +1 @@
-1
+0
diff -ruN groff-1.20.1/src/devices/grohtml/grohtml.man groff-1.21/src/devices/grohtml/grohtml.man
--- groff-1.20.1/src/devices/grohtml/grohtml.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grohtml/grohtml.man	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1999-2000, 2001, 2002, 2003, 2004, 2006, 2007, 2009
+Copyright (C) 1999-2000, 2001, 2002, 2003, 2004, 2006, 2007, 2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of this
@@ -99,6 +99,27 @@
 .B \-P
 option.
 .
+.PP
+.B grohtml
+invokes
+.B groff
+twice.
+In the first pass, pictures, equations, and tables are rendered
+using the
+.B ps
+device, and in the second pass HTML output is generated by the
+.B html
+device.
+.
+.PP
+.B grohtml
+always writes output in \%UTF-8 encoding and has built-in
+entities for all non-composite unicode characters.
+In spite of this, groff may issue warnings about unknown special
+characters if they can't be found during the first pass.
+Such warnings can be safely ignored unless the special characters
+appear inside a table or equation.
+.
 .
 .SH OPTIONS
 .TP
@@ -326,6 +347,14 @@
 encountered.
 .
 .
+.SH FILES
+.B grohtml
+uses temporary files.
+See the
+.BR groff (@MAN1EXT@)
+man page for details where such files are created.
+.
+.
 .SH ENVIRONMENT
 .TP
 .SM
diff -ruN groff-1.20.1/src/devices/grohtml/post-html.cpp groff-1.21/src/devices/grohtml/post-html.cpp
--- groff-1.20.1/src/devices/grohtml/post-html.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grohtml/post-html.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
+ *               2010
  * Free Software Foundation, Inc.
  *
  *  Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cpp
@@ -1588,7 +1589,7 @@
 
 	  buffer += as_string(h);
 	  buffer += '\0';
-	  fprintf(f, buffer.contents());
+	  fprintf(f, "%s", buffer.contents());
 	} else
 	  fputs(g->text_string, f);
 	h++;
@@ -4660,6 +4661,8 @@
       case 0x2663: return "&clubs;";
       case 0x2665: return "&hearts;";
       case 0x2666: return "&diams;";
+      case 0x27E8: return "&lang;";
+      case 0x27E9: return "&rang;";
       default: return to_unicode(code);
     }
   }
diff -ruN groff-1.20.1/src/devices/grolbp/grolbp.man groff-1.21/src/devices/grolbp/grolbp.man
--- groff-1.20.1/src/devices/grolbp/grolbp.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grolbp/grolbp.man	2010-12-31 08:33:08.000000000 +0100
@@ -3,7 +3,7 @@
 .\" vim: set syntax=nroff : 
 .\" The above line should set vim into nroff mode
 .ig
-Copyright (C) 1994-2000, 2002, 2006, 2009
+Copyright (C) 1994-2000, 2002, 2006, 2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -208,7 +208,7 @@
 .
 .PP
 See
-.BR groff_font (@MAN1EXT@)
+.BR groff_font (@MAN5EXT@)
 how to set the paper dimensions in the
 .B DESC
 file.
diff -ruN groff-1.20.1/src/devices/grops/grops.man groff-1.21/src/devices/grops/grops.man
--- groff-1.20.1/src/devices/grops/grops.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grops/grops.man	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 .ig
 Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008,
-              2009
+              2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -1421,6 +1421,9 @@
 .TP
 .BI /tmp/grops XXXXXX
 Temporary file.
+See
+.BR groff (@MAN1EXT@)
+for details on the location of temporary files.
 .
 .
 .SH "SEE ALSO"
diff -ruN groff-1.20.1/src/devices/grops/ps.cpp groff-1.21/src/devices/grops/ps.cpp
--- groff-1.20.1/src/devices/grops/ps.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grops/ps.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1557,6 +1557,9 @@
   }
   for (unsigned int i = 0; i < sizeof(proc_table)/sizeof(proc_table[0]); i++)
     if (strncmp(command, proc_table[i].name, p - command) == 0) {
+      flush_sbuf();
+      if (sbuf_color != *env->col)
+	set_color(env->col);
       (this->*(proc_table[i].proc))(p, env);
       return;
     }
@@ -1583,7 +1586,6 @@
 
 void ps_printer::do_exec(char *arg, const environment *env)
 {
-  flush_sbuf();
   while (csspace(*arg))
     arg++;
   if (*arg == '\0') {
@@ -1609,7 +1611,6 @@
 
 void ps_printer::do_file(char *arg, const environment *env)
 {
-  flush_sbuf();
   while (csspace(*arg))
     arg++;
   if (*arg == '\0') {
@@ -1636,7 +1637,6 @@
 
 void ps_printer::do_def(char *arg, const environment *)
 {
-  flush_sbuf();
   while (csspace(*arg))
     arg++;
   if (!check_line_lengths(arg))
@@ -1652,7 +1652,6 @@
 
 void ps_printer::do_mdef(char *arg, const environment *)
 {
-  flush_sbuf();
   char *p;
   int n = (int)strtol(arg, &p, 10);
   if (n == 0 && p == arg) {
@@ -1677,7 +1676,6 @@
 
 void ps_printer::do_import(char *arg, const environment *env)
 {
-  flush_sbuf();
   while (*arg == ' ' || *arg == '\n')
     arg++;
   char *p;
diff -ruN groff-1.20.1/src/devices/grotty/grotty.man groff-1.21/src/devices/grotty/grotty.man
--- groff-1.20.1/src/devices/grotty/grotty.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grotty/grotty.man	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2005, 2006, 2009
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2005, 2006, 2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -200,6 +200,19 @@
 escape sequence in
 .BR troff .
 .
+.LP
+If the
+.B DESC
+file contains the keyword
+.BR unicode ,
+.B grotty
+emits Unicode characters in UTF-8 encoding.
+Otherwise, it emits characters in a single-byte encoding depending
+on the data in the font description files.
+See the
+.BR groff_font (@MAN5EXT@)
+man page for more details.
+.
 .
 .SH OPTIONS
 .
diff -ruN groff-1.20.1/src/devices/grotty/Makefile.sub groff-1.21/src/devices/grotty/Makefile.sub
--- groff-1.20.1/src/devices/grotty/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grotty/Makefile.sub	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 PROG=grotty$(EXEEXT)
 MAN1=grotty.n
-XLIBS=$(LIBDRIVER) $(LIBGROFF)
+XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
 MLIB=$(LIBM)
 OBJS=tty.$(OBJEXT)
 CCSRCS=$(srcdir)/tty.cpp
diff -ruN groff-1.20.1/src/devices/grotty/tty.cpp groff-1.21/src/devices/grotty/tty.cpp
--- groff-1.20.1/src/devices/grotty/tty.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/devices/grotty/tty.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+                 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -196,7 +197,6 @@
 }
 
 class tty_printer : public printer {
-  int is_utf8;
   tty_glyph **lines;
   int nlines;
   int cached_v;
@@ -219,7 +219,7 @@
   void draw_line(int *, int, const environment *);
   void draw_polygon(int *, int, const environment *);
 public:
-  tty_printer(const char *);
+  tty_printer();
   ~tty_printer();
   void set_char(glyph *, font *, const environment *, int, const char *);
   void draw(int, int *, int, const environment *);
@@ -273,10 +273,9 @@
   return unknown_color;
 }
 
-tty_printer::tty_printer(const char *dev) : cached_v(0)
+tty_printer::tty_printer() : cached_v(0)
 {
-  is_utf8 = !strcmp(dev, "utf8");
-  if (is_utf8) {
+  if (font::is_unicode) {
     hline_char = 0x2500;
     vline_char = 0x2502;
   }
@@ -603,7 +602,7 @@
 
 void tty_printer::put_char(output_character wc)
 {
-  if (is_utf8 && wc >= 0x80) {
+  if (font::is_unicode && wc >= 0x80) {
     char buf[6 + 1];
     int count;
     char *p = buf;
@@ -719,7 +718,7 @@
       if (nextp && p->hpos == nextp->hpos) {
 	if (p->draw_mode() == HDRAW_MODE &&
 	    nextp->draw_mode() == VDRAW_MODE) {
-	  if (is_utf8)
+	  if (font::is_unicode)
 	    nextp->code =
 	      crossings[((p->mode & (START_LINE|END_LINE)) >> 4)
 			+ ((nextp->mode & (START_LINE|END_LINE)) >> 6)];
@@ -844,7 +843,7 @@
 
 printer *make_printer()
 {
-  return new tty_printer(device);
+  return new tty_printer();
 }
 
 static void update_options()
@@ -872,6 +871,7 @@
   if (getenv("GROFF_NO_SGR"))
     old_drawing_scheme = 1;
   setbuf(stderr, stderr_buf);
+  setlocale(LC_CTYPE, "");
   int c;
   static const struct option long_options[] = {
     { "help", no_argument, 0, CHAR_MAX + 1 },
diff -ruN groff-1.20.1/src/include/font.h groff-1.21/src/include/font.h
--- groff-1.20.1/src/include/font.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/include/font.h	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2002, 2004, 2006, 2009
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002, 2004, 2006, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -73,6 +73,9 @@
 			// a numbered character.
 inline int glyph_to_index(glyph *);	// Return the unique index that is
 			// associated with the given glyph. It is >= 0.
+extern int glyph_to_unicode(glyph *);	// Convert the given glyph to its
+			// Unicode codepoint.  Return -1 if it does not
+			// designate a Unicode character.
 
 inline int glyph_to_number(glyph *g)
 {
diff -ruN groff-1.20.1/src/include/lib.h groff-1.21/src/include/lib.h
--- groff-1.20.1/src/include/lib.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/include/lib.h	2010-12-31 08:33:08.000000000 +0100
@@ -22,6 +22,10 @@
 #include <config.h>
 #endif
 
+#if defined(__INTERIX) && !defined(_ALL_SOURCE)
+#define _ALL_SOURCE
+#endif
+
 extern "C" {
 #ifndef HAVE_STRERROR
   char *strerror(int);
diff -ruN groff-1.20.1/src/include/ptable.h groff-1.21/src/include/ptable.h
--- groff-1.20.1/src/include/ptable.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/include/ptable.h	2010-12-31 08:33:08.000000000 +0100
@@ -86,8 +86,8 @@
   unsigned size;							      \
   unsigned used;							      \
   enum {								      \
-    FULL_NUM = 2,							      \
-    FULL_DEN = 3,							      \
+    FULL_NUM = 1,							      \
+    FULL_DEN = 4,							      \
     INITIAL_SIZE = 17							      \
   };									      \
 public:									      \
diff -ruN groff-1.20.1/src/libs/gnulib/aclocal.m4 groff-1.21/src/libs/gnulib/aclocal.m4
--- groff-1.20.1/src/libs/gnulib/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/aclocal.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,1006 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/00gnulib.m4])
+m4_include([m4/codeset.m4])
+m4_include([m4/extensions.m4])
+m4_include([m4/fcntl-o.m4])
+m4_include([m4/glibc21.m4])
+m4_include([m4/gnulib-common.m4])
+m4_include([m4/include_next.m4])
+m4_include([m4/libunistring-base.m4])
+m4_include([m4/localcharset.m4])
+m4_include([m4/longlong.m4])
+m4_include([m4/multiarch.m4])
+m4_include([m4/onceonly.m4])
+m4_include([m4/stddef_h.m4])
+m4_include([m4/stdint.m4])
+m4_include([m4/warn-on-use.m4])
+m4_include([m4/wchar_h.m4])
+m4_include([m4/wchar_t.m4])
+m4_include([m4/wctype_h.m4])
+m4_include([m4/wcwidth.m4])
+m4_include([m4/wint_t.m4])
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/arg-nonnull.h groff-1.21/src/libs/gnulib/build-aux/arg-nonnull.h
--- groff-1.20.1/src/libs/gnulib/build-aux/arg-nonnull.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/arg-nonnull.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/c++defs.h groff-1.21/src/libs/gnulib/build-aux/c++defs.h
--- groff-1.20.1/src/libs/gnulib/build-aux/c++defs.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/c++defs.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,271 @@
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/compile groff-1.21/src/libs/gnulib/build-aux/compile
--- groff-1.20.1/src/libs/gnulib/build-aux/compile	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/compile	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-10-06.20; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/config.guess groff-1.21/src/libs/gnulib/build-aux/config.guess
--- groff-1.20.1/src/libs/gnulib/build-aux/config.guess	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/config.guess	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,1508 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+
+timestamp='2010-09-24'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' HUP INT TERM
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/config.sub groff-1.21/src/libs/gnulib/build-aux/config.sub
--- groff-1.20.1/src/libs/gnulib/build-aux/config.sub	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/config.sub	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,1739 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+
+timestamp='2010-12-11'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+        -bluegene*)
+	        os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+        neo-tandem)
+		basic_machine=neo-tandem
+		;;
+        nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+        -nacl*)
+	        ;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+        mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/depcomp groff-1.21/src/libs/gnulib/build-aux/depcomp
--- groff-1.20.1/src/libs/gnulib/build-aux/depcomp	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/depcomp	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,630 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> "$depfile"
+    echo >> "$depfile"
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/install-sh groff-1.21/src/libs/gnulib/build-aux/install-sh
--- groff-1.20.1/src/libs/gnulib/build-aux/install-sh	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/install-sh	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/missing groff-1.21/src/libs/gnulib/build-aux/missing
--- groff-1.20.1/src/libs/gnulib/build-aux/missing	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/missing	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,376 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar*)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit $?
+    fi
+    ;;
+
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar*)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/build-aux/warn-on-use.h groff-1.21/src/libs/gnulib/build-aux/warn-on-use.h
--- groff-1.20.1/src/libs/gnulib/build-aux/warn-on-use.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/build-aux/warn-on-use.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,109 @@
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   This macro is useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.  However, one of the reasons that a function is a
+   portability trap is if it has the wrong signature.  Declaring
+   FUNCTION with a different signature in C is a compilation error, so
+   this macro must use the same type as any existing declaration so
+   that programs that avoid the problematic FUNCTION do not fail to
+   compile merely because they included a header that poisoned the
+   function.  But this implies that _GL_WARN_ON_USE is only safe to
+   use if FUNCTION is known to already have a declaration.  Use of
+   this macro implies that there must not be any other macro hiding
+   the declaration of FUNCTION; but undefining FUNCTION first is part
+   of the poisoning process anyway (although for symbols that are
+   provided only via a macro, the result is a compilation error rather
+   than a warning containing "literal string").  Also note that in
+   C++, it is only safe to use if FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+   #if HAVE_RAW_DECL_ENVIRON
+   static inline char ***rpl_environ (void) { return &environ; }
+   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+   # undef environ
+   # define environ (*rpl_environ ())
+   #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
diff -ruN groff-1.20.1/src/libs/gnulib/config.h.in groff-1.21/src/libs/gnulib/config.h.in
--- groff-1.20.1/src/libs/gnulib/config.h.in	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/config.h.in	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,266 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if the compiler is building for multiple architectures of Apple
+   platforms at once. */
+#undef AA_APPLE_UNIVERSAL_BUILD
+
+/* Define to the number of bits in type 'ptrdiff_t'. */
+#undef BITSIZEOF_PTRDIFF_T
+
+/* Define to the number of bits in type 'sig_atomic_t'. */
+#undef BITSIZEOF_SIG_ATOMIC_T
+
+/* Define to the number of bits in type 'size_t'. */
+#undef BITSIZEOF_SIZE_T
+
+/* Define to the number of bits in type 'wchar_t'. */
+#undef BITSIZEOF_WCHAR_T
+
+/* Define to the number of bits in type 'wint_t'. */
+#undef BITSIZEOF_WINT_T
+
+/* Define to 1 when the gnulib module wcwidth should be tested. */
+#undef GNULIB_TEST_WCWIDTH
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETC_UNLOCKED
+
+/* Define to 1 if you have the declaration of `iswblank', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ISWBLANK
+
+/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
+   don't. */
+#undef HAVE_DECL_WCWIDTH
+
+/* Define to 1 if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `iswblank' function. */
+#undef HAVE_ISWBLANK
+
+/* Define to 1 if you have the `iswcntrl' function. */
+#undef HAVE_ISWCNTRL
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if btowc is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_BTOWC
+
+/* Define to 1 if mbrlen is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBRLEN
+
+/* Define to 1 if mbrtowc is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBRTOWC
+
+/* Define to 1 if mbsinit is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBSINIT
+
+/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBSNRTOWCS
+
+/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_MBSRTOWCS
+
+/* Define to 1 if wcrtomb is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCRTOMB
+
+/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSNRTOMBS
+
+/* Define to 1 if wcsrtombs is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCSRTOMBS
+
+/* Define to 1 if wctob is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCTOB
+
+/* Define to 1 if wcwidth is declared even after undefining macros. */
+#undef HAVE_RAW_DECL_WCWIDTH
+
+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
+#undef HAVE_SIGNED_SIG_ATOMIC_T
+
+/* Define to 1 if 'wchar_t' is a signed integer type. */
+#undef HAVE_SIGNED_WCHAR_T
+
+/* Define to 1 if 'wint_t' is a signed integer type. */
+#undef HAVE_SIGNED_WINT_T
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+#undef HAVE_SYS_BITYPES_H
+
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+#undef HAVE_SYS_INTTYPES_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
+/* Define if you have the 'wchar_t' type. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#undef HAVE_WCTYPE_H
+
+/* Define to 1 if you have the `wcwidth' function. */
+#undef HAVE_WCWIDTH
+
+/* Define if you have the 'wint_t' type. */
+#undef HAVE_WINT_T
+
+/* Define to 1 if O_NOATIME works. */
+#undef HAVE_WORKING_O_NOATIME
+
+/* Define to 1 if O_NOFOLLOW works. */
+#undef HAVE_WORKING_O_NOFOLLOW
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'ptrdiff_t'. */
+#undef PTRDIFF_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'sig_atomic_t'. */
+#undef SIG_ATOMIC_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'size_t'. */
+#undef SIZE_T_SUFFIX
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wchar_t'. */
+#undef WCHAR_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wint_t'. */
+#undef WINT_T_SUFFIX
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define to 500 only on HP-UX. */
+#undef _XOPEN_SOURCE
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for MacOS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif
+
+/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+#else
+# define _GL_UNUSED
+#endif
+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
+   is a misnomer outside of parameter lists.  */
+#define _UNUSED_PARAMETER_ _GL_UNUSED
+
diff -ruN groff-1.20.1/src/libs/gnulib/configure groff-1.21/src/libs/gnulib/configure
--- groff-1.20.1/src/libs/gnulib/configure	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/configure	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,8507 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.67 for dummy 0.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='dummy'
+PACKAGE_TARNAME='dummy'
+PACKAGE_VERSION='0'
+PACKAGE_STRING='dummy 0'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+gl_header_list=
+gl_func_list=
+ac_subst_vars='gl_LTLIBOBJS
+gl_LIBOBJS
+am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+LIBGNU_LTLIBDEPS
+LIBGNU_LIBDEPS
+REPLACE_ISWCNTRL
+HAVE_WCTYPE_H
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
+NEXT_WCTYPE_H
+REPLACE_ISWBLANK
+HAVE_ISWBLANK
+HAVE_ISWCNTRL
+HAVE_WINT_T
+HAVE_FEATURES_H
+HAVE_WCHAR_H
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
+NEXT_WCHAR_H
+REPLACE_WCWIDTH
+REPLACE_WCSNRTOMBS
+REPLACE_WCSRTOMBS
+REPLACE_WCRTOMB
+REPLACE_MBSNRTOWCS
+REPLACE_MBSRTOWCS
+REPLACE_MBRLEN
+REPLACE_MBRTOWC
+REPLACE_MBSINIT
+REPLACE_WCTOB
+REPLACE_BTOWC
+REPLACE_MBSTATE_T
+HAVE_DECL_WCWIDTH
+HAVE_DECL_WCTOB
+HAVE_WCSNRTOMBS
+HAVE_WCSRTOMBS
+HAVE_WCRTOMB
+HAVE_MBSNRTOWCS
+HAVE_MBSRTOWCS
+HAVE_MBRLEN
+HAVE_MBRTOWC
+HAVE_MBSINIT
+HAVE_BTOWC
+GNULIB_WCWIDTH
+GNULIB_WCSNRTOMBS
+GNULIB_WCSRTOMBS
+GNULIB_WCRTOMB
+GNULIB_MBSNRTOWCS
+GNULIB_MBSRTOWCS
+GNULIB_MBRLEN
+GNULIB_MBRTOWC
+GNULIB_MBSINIT
+GNULIB_WCTOB
+GNULIB_BTOWC
+LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE
+LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE
+LIBUNISTRING_UNIWIDTH_H
+LIBUNISTRING_UNITYPES_H
+STDINT_H
+WINT_T_SUFFIX
+WCHAR_T_SUFFIX
+SIG_ATOMIC_T_SUFFIX
+SIZE_T_SUFFIX
+PTRDIFF_T_SUFFIX
+HAVE_SIGNED_WINT_T
+HAVE_SIGNED_WCHAR_T
+HAVE_SIGNED_SIG_ATOMIC_T
+BITSIZEOF_WINT_T
+BITSIZEOF_WCHAR_T
+BITSIZEOF_SIG_ATOMIC_T
+BITSIZEOF_SIZE_T
+BITSIZEOF_PTRDIFF_T
+HAVE_SYS_BITYPES_H
+HAVE_SYS_INTTYPES_H
+HAVE_STDINT_H
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H
+NEXT_STDINT_H
+HAVE_SYS_TYPES_H
+HAVE_INTTYPES_H
+HAVE_UNSIGNED_LONG_LONG_INT
+HAVE_LONG_LONG_INT
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
+NEXT_STDDEF_H
+PRAGMA_COLUMNS
+PRAGMA_SYSTEM_HEADER
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE
+INCLUDE_NEXT
+STDDEF_H
+HAVE_WCHAR_T
+REPLACE_NULL
+APPLE_UNIVERSAL_BUILD
+LOCALCHARSET_TESTS_ENVIRONMENT
+GLIBC21
+GL_COND_LIBTOOL_FALSE
+GL_COND_LIBTOOL_TRUE
+EGREP
+GREP
+CPP
+RANLIB
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures dummy 0 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/dummy]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of dummy 0:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+dummy configure 0
+generated by GNU Autoconf 2.67
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by dummy $as_me 0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"[]
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"[]
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"[]
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"[]
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+gl_header_list="$gl_header_list stddef.h"
+gl_header_list="$gl_header_list stdint.h"
+gl_header_list="$gl_header_list wchar.h"
+gl_header_list="$gl_header_list features.h"
+gl_func_list="$gl_func_list iswcntrl"
+gl_func_list="$gl_func_list iswblank"
+gl_header_list="$gl_header_list wctype.h"
+gl_func_list="$gl_func_list wcwidth"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_aux_dir=
+for ac_dir in build-aux "$srcdir"/build-aux; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+am__api_version='1.11'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='dummy'
+ VERSION='0'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+# For autobuild.
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+        case "$host_os" in
+    hpux*)
+
+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+      ;;
+  esac
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+
+
+
+
+
+ if false; then
+  GL_COND_LIBTOOL_TRUE=
+  GL_COND_LIBTOOL_FALSE='#'
+else
+  GL_COND_LIBTOOL_TRUE='#'
+  GL_COND_LIBTOOL_FALSE=
+fi
+
+gl_cond_libtool=false
+gl_libdeps=
+gl_ltlibdeps=
+
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parameterization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+
+
+
+
+
+
+          LIBC_FATAL_STDERR_=1
+  export LIBC_FATAL_STDERR_
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_langinfo_codeset=yes
+else
+  am_cv_langinfo_codeset=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
+  if test $am_cv_langinfo_codeset = yes; then
+
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+$as_echo_n "checking for working fcntl.h... " >&6; }
+if test "${gl_cv_header_working_fcntl_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  gl_cv_header_working_fcntl_h=cross-compiling
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+           #include <sys/stat.h>
+           #include <unistd.h>
+           #include <fcntl.h>
+           #ifndef O_NOATIME
+            #define O_NOATIME 0
+           #endif
+           #ifndef O_NOFOLLOW
+            #define O_NOFOLLOW 0
+           #endif
+           static int const constants[] =
+            {
+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+            };
+
+int
+main ()
+{
+
+            int result = !constants;
+            {
+              static char const sym[] = "conftest.sym";
+              if (symlink (".", sym) != 0)
+                result |= 2;
+              else
+                {
+                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
+                  if (fd >= 0)
+                    {
+                      close (fd);
+                      result |= 4;
+                    }
+                }
+              unlink (sym);
+            }
+            {
+              static char const file[] = "confdefs.h";
+              int fd = open (file, O_RDONLY | O_NOATIME);
+              if (fd < 0)
+                result |= 8;
+              else
+                {
+                  struct stat st0;
+                  if (fstat (fd, &st0) != 0)
+                    result |= 16;
+                  else
+                    {
+                      char c;
+                      sleep (1);
+                      if (read (fd, &c, 1) != 1)
+                        result |= 24;
+                      else
+                        {
+                          if (close (fd) != 0)
+                            result |= 32;
+                          else
+                            {
+                              struct stat st1;
+                              if (stat (file, &st1) != 0)
+                                result |= 40;
+                              else
+                                if (st0.st_atime != st1.st_atime)
+                                  result |= 64;
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_header_working_fcntl_h=yes
+else
+  case $? in #(
+        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+         *) gl_cv_header_working_fcntl_h='no';;
+        esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOATIME $ac_val
+_ACEOF
+
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOFOLLOW $ac_val
+_ACEOF
+
+
+
+      ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+_ACEOF
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
+$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Lucky" >/dev/null 2>&1; then :
+  ac_cv_gnu_library_2_1=yes
+else
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+    GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+    gl_cv_c_multiarch=no
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+         not a universal capable compiler
+        #endif
+        typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+               arch=
+     prev=
+     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+       if test -n "$prev"; then
+         case $word in
+           i?86 | x86_64 | ppc | ppc64)
+             if test -z "$arch" || test "$arch" = "$word"; then
+               arch="$word"
+             else
+               gl_cv_c_multiarch=yes
+             fi
+             ;;
+         esac
+         prev=
+       else
+         if test "x$word" = "x-arch"; then
+           prev=arch
+         fi
+       fi
+     done
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test $gl_cv_c_multiarch = yes; then
+
+$as_echo "#define AA_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+    APPLE_UNIVERSAL_BUILD=1
+  else
+    APPLE_UNIVERSAL_BUILD=0
+  fi
+
+
+
+    REPLACE_NULL=0;
+  HAVE_WCHAR_T=1;
+  STDDEF_H='';
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if test "${gt_cv_c_wchar_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+            wchar_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wchar_t=yes
+else
+  gt_cv_c_wchar_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+$as_echo "$gt_cv_c_wchar_t" >&6; }
+  if test $gt_cv_c_wchar_t = yes; then
+
+$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
+
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
+if test "${gl_cv_have_include_next+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -rf conftestd1a conftestd1b conftestd2
+     mkdir conftestd1a conftestd1b conftestd2
+                                                  cat <<EOF > conftestd1a/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd1b/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     gl_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <conftest.h>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_have_include_next=yes
+else
+  CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <conftest.h>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_have_include_next=buggy
+else
+  gl_cv_have_include_next=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CPPFLAGS="$gl_save_CPPFLAGS"
+     rm -rf conftestd1a conftestd1b conftestd2
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+$as_echo "$gl_cv_have_include_next" >&6; }
+  PRAGMA_SYSTEM_HEADER=
+  if test $gl_cv_have_include_next = yes; then
+    INCLUDE_NEXT=include_next
+    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    if test -n "$GCC"; then
+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+    fi
+  else
+    if test $gl_cv_have_include_next = buggy; then
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    else
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+    fi
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
+$as_echo_n "checking whether system header files limit the line length... " >&6; }
+if test "${gl_cv_pragma_columns+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef __TANDEM
+choke me
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "choke me" >/dev/null 2>&1; then :
+  gl_cv_pragma_columns=yes
+else
+  gl_cv_pragma_columns=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
+$as_echo "$gl_cv_pragma_columns" >&6; }
+  if test $gl_cv_pragma_columns = yes; then
+    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+  else
+    PRAGMA_COLUMNS=
+  fi
+
+
+
+
+
+
+  for ac_header in $gl_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if test "${ac_cv_type_long_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* For now, do not test the preprocessor; as of 2007 there are too many
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+                          if test "$cross_compiling" = yes; then :
+  ac_cv_type_long_long_int=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+               #ifndef LLONG_MAX
+               # define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               # define LLONG_MAX (HALF - 1 + HALF)
+               #endif
+int
+main ()
+{
+long long int n = 1;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_type_long_long_int=yes
+else
+  ac_cv_type_long_long_int=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+else
+  ac_cv_type_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+  if test $ac_cv_type_long_long_int = yes; then
+
+$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
+$as_echo_n "checking for unsigned long long int... " >&6; }
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* For now, do not test the preprocessor; as of 2007 there are too many
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_type_unsigned_long_long_int=yes
+else
+  ac_cv_type_unsigned_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+
+
+  if test "$HAVE_LIBUNISTRING" = yes; then
+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+  fi
+
+
+  GNULIB_BTOWC=0;
+  GNULIB_WCTOB=0;
+  GNULIB_MBSINIT=0;
+  GNULIB_MBRTOWC=0;
+  GNULIB_MBRLEN=0;
+  GNULIB_MBSRTOWCS=0;
+  GNULIB_MBSNRTOWCS=0;
+  GNULIB_WCRTOMB=0;
+  GNULIB_WCSRTOMBS=0;
+  GNULIB_WCSNRTOMBS=0;
+  GNULIB_WCWIDTH=0;
+    HAVE_BTOWC=1;
+  HAVE_MBSINIT=1;
+  HAVE_MBRTOWC=1;
+  HAVE_MBRLEN=1;
+  HAVE_MBSRTOWCS=1;
+  HAVE_MBSNRTOWCS=1;
+  HAVE_WCRTOMB=1;
+  HAVE_WCSRTOMBS=1;
+  HAVE_WCSNRTOMBS=1;
+  HAVE_DECL_WCTOB=1;
+  HAVE_DECL_WCWIDTH=1;
+  REPLACE_MBSTATE_T=0;
+  REPLACE_BTOWC=0;
+  REPLACE_WCTOB=0;
+  REPLACE_MBSINIT=0;
+  REPLACE_MBRTOWC=0;
+  REPLACE_MBRLEN=0;
+  REPLACE_MBSRTOWCS=0;
+  REPLACE_MBSNRTOWCS=0;
+  REPLACE_WCRTOMB=0;
+  REPLACE_WCSRTOMBS=0;
+  REPLACE_WCSNRTOMBS=0;
+  REPLACE_WCWIDTH=0;
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
+if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_wchar_h_correct_inline=yes
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+       #define wcstod renamed_wcstod
+#include <wchar.h>
+extern int zero (void);
+int main () { return zero(); }
+
+_ACEOF
+     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+       mv conftest.$ac_objext conftest1.$ac_objext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+         #define wcstod renamed_wcstod
+#include <wchar.h>
+int zero (void) { return 0; }
+
+_ACEOF
+       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+         mv conftest.$ac_objext conftest2.$ac_objext
+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
+           :
+         else
+           gl_cv_header_wchar_h_correct_inline=no
+         fi
+       fi
+     fi
+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
+  if test $gl_cv_header_wchar_h_correct_inline = no; then
+    as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+  - Add the flag -fgnu89-inline to CC and reconfigure, or
+  - Fix your include files, using parts of
+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+  - Use a gcc version older than 4.3, or
+  - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted." "$LINENO" 5
+  fi
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_header_features_h = yes; then
+    HAVE_FEATURES_H=1
+  else
+    HAVE_FEATURES_H=0
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+$as_echo_n "checking for wint_t... " >&6; }
+if test "${gt_cv_c_wint_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+            wint_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gt_cv_c_wint_t=yes
+else
+  gt_cv_c_wint_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+$as_echo "$gt_cv_c_wint_t" >&6; }
+  if test $gt_cv_c_wint_t = yes; then
+
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
+
+  fi
+
+
+
+
+
+  for ac_func in $gl_func_list
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+
+
+
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "iswblank" "ac_cv_have_decl_iswblank" "$ac_includes_default"
+if test "x$ac_cv_have_decl_iswblank" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISWBLANK $ac_have_decl
+_ACEOF
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+
+
+
+
+
+
+gl_m4_base='m4'
+
+
+
+
+
+
+
+
+
+gl_source_base='lib'
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+
+
+
+
+
+
+
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    STDDEF_H=stddef.h
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
+if test "${gl_cv_decl_null_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_decl_null_works=yes
+else
+  gl_cv_decl_null_works=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+$as_echo "$gl_cv_decl_null_works" >&6; }
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    STDDEF_H=stddef.h
+  fi
+  if test -n "$STDDEF_H"; then
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stddef_h='<'stddef.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
+if test "${gl_cv_next_stddef_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_stddef_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stddef.h#{
+                 s#.*"\(.*/stddef.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stddef_h='<'stddef.h'>'
+          fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+$as_echo "$gl_cv_next_stddef_h" >&6; }
+     fi
+     NEXT_STDDEF_H=$gl_cv_next_stddef_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stddef.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stddef_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
+
+
+
+  fi
+
+
+
+
+
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
+
+
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
+  fi
+
+
+      if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
+
+
+      if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdint_h='<'stdint.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if test "${gl_cv_next_stdint_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_stdint_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdint.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/stdint.h#{
+                 s#.*"\(.*/stdint.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_stdint_h='<'stdint.h'>'
+          fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
+     fi
+     NEXT_STDINT_H=$gl_cv_next_stdint_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdint.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdint_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
+
+
+
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
+
+
+    if test $ac_cv_header_stdint_h = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if test "${gl_cv_header_working_stdint_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_working_stdint_h=no
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+                                                    if test "$cross_compiling" = yes; then :
+                 gl_cv_header_working_stdint_h=yes
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
+
+int
+main ()
+{
+
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return mv - macro_values + 1;
+    }
+  return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_header_working_stdint_h=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
+  fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
+            for ac_header in sys/inttypes.h sys/bitypes.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
+
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
+
+
+
+  :
+
+
+
+
+
+
+
+
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+
+
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if eval "test \"\${gl_cv_bitsizeof_${gltype}+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>"; then :
+
+else
+  result=unknown
+fi
+
+       eval gl_cv_bitsizeof_${gltype}=\$result
+
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
+
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
+
+
+  fi
+
+
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if eval "test \"\${gl_cv_bitsizeof_${gltype}+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>"; then :
+
+else
+  result=unknown
+fi
+
+       eval gl_cv_bitsizeof_${gltype}=\$result
+
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
+
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
+
+
+
+
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+$as_echo_n "checking whether $gltype is signed... " >&6; }
+if eval "test \"\${gl_cv_type_${gltype}_signed+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  result=yes
+else
+  result=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       eval gl_cv_type_${gltype}_signed=\$result
+
+fi
+eval ac_res=\$gl_cv_type_${gltype}_signed
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
+
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
+
+
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+
+
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if eval "test \"\${gl_cv_type_${gltype}_suffix+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
+fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
+
+  done
+
+
+  fi
+
+
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+if eval "test \"\${gl_cv_type_${gltype}_suffix+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+              extern $gltype foo;
+              extern $gltype1 foo;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval gl_cv_type_${gltype}_suffix=\$glsuf
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done
+fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
+
+  done
+
+
+
+    STDINT_H=stdint.h
+  fi
+
+
+
+
+
+
+      if  { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+
+
+
+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
+                         }
+                    }
+               }
+
+
+
+
+       }
+  }; then
+    LIBUNISTRING_UNITYPES_H='unitypes.h'
+  else
+    LIBUNISTRING_UNITYPES_H=
+  fi
+
+
+
+
+
+      if  { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+
+
+
+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
+                         }
+                    }
+               }
+
+
+
+
+       }
+  }; then
+    LIBUNISTRING_UNIWIDTH_H='uniwidth.h'
+  else
+    LIBUNISTRING_UNIWIDTH_H=
+  fi
+
+
+
+
+
+       if  { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+
+
+
+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
+                         }
+                    }
+               }
+
+
+
+
+       }
+  }; then
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE=
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE='#'
+else
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE='#'
+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE=
+fi
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wchar_h='<'wchar.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+$as_echo_n "checking absolute name of <wchar.h>... " >&6; }
+if test "${gl_cv_next_wchar_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_wchar_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wchar.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wchar.h#{
+                 s#.*"\(.*/wchar.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_wchar_h='<'wchar.h'>'
+          fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+$as_echo "$gl_cv_next_wchar_h" >&6; }
+     fi
+     NEXT_WCHAR_H=$gl_cv_next_wchar_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'wchar.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wchar_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCHAR_H=$gl_next_as_first_directive
+
+
+
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+
+
+
+
+
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+
+
+
+    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb     wcsrtombs wcsnrtombs wcwidth; do
+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
+if eval "test \"\${$as_gl_Symbol+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Some systems require additional headers.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+
+int
+main ()
+{
+#undef $gl_func
+  (void) $gl_func;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_gl_Symbol=yes"
+else
+  eval "$as_gl_Symbol=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_gl_Symbol
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+     if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
+
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+      done
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
+  else
+    HAVE_ISWCNTRL=0
+  fi
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+    REPLACE_ISWBLANK=0
+  else
+    HAVE_ISWBLANK=0
+    if test $ac_cv_have_decl_iswblank = yes; then
+      REPLACE_ISWBLANK=1
+    else
+      REPLACE_ISWBLANK=0
+    fi
+  fi
+
+
+
+
+  :
+
+
+
+
+
+
+
+
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+
+
+  if test $ac_cv_header_wctype_h = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
+$as_echo_n "checking whether iswcntrl works... " >&6; }
+if test "${gl_cv_func_iswcntrl_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test "$cross_compiling" = yes; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+                          #if __GNU_LIBRARY__ == 1
+                          Linux libc5 i18n is broken.
+                          #endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_func_iswcntrl_works=yes
+else
+  gl_cv_func_iswcntrl_works=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_iswcntrl_works=yes
+else
+  gl_cv_func_iswcntrl_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
+$as_echo "$gl_cv_func_iswcntrl_works" >&6; }
+    fi
+
+
+
+
+  :
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_wctype_h='<'wctype.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
+if test "${gl_cv_next_wctype_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          if test $ac_cv_header_wctype_h = yes; then
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wctype.h>
+
+_ACEOF
+                                                                                                case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+                                                gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+               sed -n '\#/wctype.h#{
+                 s#.*"\(.*/wctype.h\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'
+          else
+            gl_cv_next_wctype_h='<'wctype.h'>'
+          fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
+$as_echo "$gl_cv_next_wctype_h" >&6; }
+     fi
+     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'wctype.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_wctype_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
+
+
+
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+
+
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
+  else
+    REPLACE_ISWCNTRL=0
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+  ac_fn_c_check_decl "$LINENO" "wcwidth" "ac_cv_have_decl_wcwidth" "
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+
+"
+if test "x$ac_cv_have_decl_wcwidth" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_WCWIDTH $ac_have_decl
+_ACEOF
+
+  if test $ac_cv_have_decl_wcwidth != yes; then
+    HAVE_DECL_WCWIDTH=0
+  fi
+
+  if test $ac_cv_func_wcwidth = yes; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+$as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
+if test "${gl_cv_func_wcwidth_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        if test "$cross_compiling" = yes; then :
+
+           case "$host_os" in
+                     # Guess yes on glibc and AIX 7 systems.
+             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)                  gl_cv_func_wcwidth_works="guessing no";;
+           esac
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+#if !HAVE_DECL_WCWIDTH
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int wcwidth (int);
+#endif
+int main ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
+    {
+      if (wcwidth (0x0301) > 0)
+        result |= 1;
+      if (wcwidth (0x200B) > 0)
+        result |= 2;
+    }
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_wcwidth_works=yes
+else
+  gl_cv_func_wcwidth_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_works" >&5
+$as_echo "$gl_cv_func_wcwidth_works" >&6; }
+    case "$gl_cv_func_wcwidth_works" in
+      *yes) ;;
+      *no) REPLACE_WCWIDTH=1 ;;
+    esac
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
+
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
+
+    :
+
+  fi
+
+
+
+
+  GNULIB_WCWIDTH=1
+
+
+
+$as_echo "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+  LIBGNU_LIBDEPS="$gl_libdeps"
+
+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
+
+
+
+ac_config_files="$ac_config_files Makefile lib/Makefile m4/Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
+  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then
+  as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    gl_LIBOBJS=$gl_libobjs
+
+    gl_LTLIBOBJS=$gl_ltlibobjs
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by dummy $as_me 0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+dummy config.status 0
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2010 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff -ruN groff-1.20.1/src/libs/gnulib/configure.ac groff-1.21/src/libs/gnulib/configure.ac
--- groff-1.20.1/src/libs/gnulib/configure.ac	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/configure.ac	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,135 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT([dummy], [0])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE
+
+AC_CONFIG_HEADERS([config.h])
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+# For autobuild.
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
+m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
+m4_pattern_allow([^gl_ES$])dnl a valid locale name
+m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
+m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
+
+AC_PROG_RANLIB
+
+AM_PROG_CC_C_O
+
+gl_USE_SYSTEM_EXTENSIONS
+AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+gl_cond_libtool=false
+gl_libdeps=
+gl_ltlibdeps=
+AC_DEFUN([gl_INIT], [
+gl_m4_base='m4'
+  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
+  m4_pushdef([gl_LIBSOURCES_LIST], [])
+  m4_pushdef([gl_LIBSOURCES_DIR], [])
+  gl_COMMON
+gl_source_base='lib'
+
+
+
+
+
+gl_LOCALCHARSET
+LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+
+gl_MULTIARCH
+
+gl_STDDEF_H
+
+gl_STDINT_H
+
+
+gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+
+gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
+
+gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width])
+
+
+gl_WCHAR_H
+
+gl_WCTYPE_H
+
+gl_FUNC_WCWIDTH
+gl_WCHAR_MODULE_INDICATOR([wcwidth])
+
+  m4_ifval(gl_LIBSOURCES_LIST, [
+    m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
+      for gl_file in ]gl_LIBSOURCES_LIST[ ; do
+        if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
+          exit 1
+        fi
+      done])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
+  ])
+  m4_popdef([gl_LIBSOURCES_DIR])
+  m4_popdef([gl_LIBSOURCES_LIST])
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
+    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
+  ])
+  LIBGNU_LIBDEPS="$gl_libdeps"
+  AC_SUBST([LIBGNU_LIBDEPS])
+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
+  AC_SUBST([LIBGNU_LTLIBDEPS])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
+])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parameterization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gl_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_define([gl_LIBSOURCES_DIR], [lib])
+      m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
+    ])
+  ])
+])
+
+gl_INIT
+
+AC_CONFIG_FILES([Makefile lib/Makefile m4/Makefile])
+AC_OUTPUT
diff -ruN groff-1.20.1/src/libs/gnulib/lib/config.charset groff-1.21/src/libs/gnulib/lib/config.charset
--- groff-1.20.1/src/libs/gnulib/lib/config.charset	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/config.charset	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,683 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name              MIME?             used by which systems
+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+#   ISO-8859-3              Y   glibc solaris cygwin
+#   ISO-8859-4              Y   osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+#   ISO-8859-6              Y   glibc aix hpux solaris cygwin
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin
+#   ISO-8859-8              Y   glibc aix hpux osf solaris cygwin
+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin cygwin
+#   ISO-8859-13                 glibc netbsd openbsd darwin cygwin
+#   ISO-8859-14                 glibc cygwin
+#   ISO-8859-15                 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin
+#   KOI8-R                  Y   glibc solaris freebsd netbsd openbsd darwin
+#   KOI8-U                  Y   glibc freebsd netbsd openbsd darwin cygwin
+#   KOI8-T                      glibc
+#   CP437                       dos
+#   CP775                       dos
+#   CP850                       aix osf dos
+#   CP852                       dos
+#   CP855                       dos
+#   CP856                       aix
+#   CP857                       dos
+#   CP861                       dos
+#   CP862                       dos
+#   CP864                       dos
+#   CP865                       dos
+#   CP866                       freebsd netbsd openbsd darwin dos
+#   CP869                       dos
+#   CP874                       woe32 dos
+#   CP922                       aix
+#   CP932                       aix cygwin woe32 dos
+#   CP943                       aix
+#   CP949                       osf darwin woe32 dos
+#   CP950                       woe32 dos
+#   CP1046                      aix
+#   CP1124                      aix
+#   CP1125                      dos
+#   CP1129                      aix
+#   CP1131                      darwin
+#   CP1250                      woe32
+#   CP1251                      glibc solaris netbsd openbsd darwin cygwin woe32
+#   CP1252                      aix woe32
+#   CP1253                      woe32
+#   CP1254                      woe32
+#   CP1255                      glibc woe32
+#   CP1256                      woe32
+#   CP1257                      woe32
+#   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin
+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
+#   EUC-TW                      glibc aix hpux irix osf solaris netbsd
+#   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin cygwin
+#   BIG5-HKSCS                  glibc solaris darwin
+#   GBK                         glibc aix osf solaris darwin cygwin woe32 dos
+#   GB18030                     glibc solaris netbsd darwin
+#   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
+#   JOHAB                       glibc solaris woe32
+#   TIS-620                     glibc aix hpux osf solaris cygwin
+#   VISCII                  Y   glibc
+#   TCVN5712-1                  glibc
+#   ARMSCII-8                   glibc darwin
+#   GEORGIAN-PS                 glibc cygwin
+#   PT154                       glibc
+#   HP-ROMAN8                   hpux
+#   HP-ARABIC8                  hpux
+#   HP-GREEK8                   hpux
+#   HP-HEBREW8                  hpux
+#   HP-TURKISH8                 hpux
+#   HP-KANA8                    hpux
+#   DEC-KANJI                   osf
+#   DEC-HANYU                   osf
+#   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin cygwin
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+  linux-gnulibc1*)
+    # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "C ASCII"
+    echo "POSIX ASCII"
+    for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+             en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+             en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+             es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+             et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+             fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+             it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+             sv_FI sv_SE; do
+      echo "$l ISO-8859-1"
+      echo "$l.iso-8859-1 ISO-8859-1"
+      echo "$l.iso-8859-15 ISO-8859-15"
+      echo "$l.iso-8859-15@euro ISO-8859-15"
+      echo "$l@euro ISO-8859-15"
+      echo "$l.cp-437 CP437"
+      echo "$l.cp-850 CP850"
+      echo "$l.cp-1252 CP1252"
+      echo "$l.cp-1252@euro CP1252"
+      #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+      echo "$l.utf-8 UTF-8"
+      echo "$l.utf-8@euro UTF-8"
+    done
+    for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+             sl_SI sr sr_CS sr_YU; do
+      echo "$l ISO-8859-2"
+      echo "$l.iso-8859-2 ISO-8859-2"
+      echo "$l.cp-852 CP852"
+      echo "$l.cp-1250 CP1250"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in mk mk_MK ru ru_RU; do
+      echo "$l ISO-8859-5"
+      echo "$l.iso-8859-5 ISO-8859-5"
+      echo "$l.koi8-r KOI8-R"
+      echo "$l.cp-866 CP866"
+      echo "$l.cp-1251 CP1251"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in ar ar_SA; do
+      echo "$l ISO-8859-6"
+      echo "$l.iso-8859-6 ISO-8859-6"
+      echo "$l.cp-864 CP864"
+      #echo "$l.cp-868 CP868" # not a commonly used encoding
+      echo "$l.cp-1256 CP1256"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in el el_GR gr gr_GR; do
+      echo "$l ISO-8859-7"
+      echo "$l.iso-8859-7 ISO-8859-7"
+      echo "$l.cp-869 CP869"
+      echo "$l.cp-1253 CP1253"
+      echo "$l.cp-1253@euro CP1253"
+      echo "$l.utf-8 UTF-8"
+      echo "$l.utf-8@euro UTF-8"
+    done
+    for l in he he_IL iw iw_IL; do
+      echo "$l ISO-8859-8"
+      echo "$l.iso-8859-8 ISO-8859-8"
+      echo "$l.cp-862 CP862"
+      echo "$l.cp-1255 CP1255"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in tr tr_TR; do
+      echo "$l ISO-8859-9"
+      echo "$l.iso-8859-9 ISO-8859-9"
+      echo "$l.cp-857 CP857"
+      echo "$l.cp-1254 CP1254"
+      echo "$l.utf-8 UTF-8"
+    done
+    for l in lt lt_LT lv lv_LV; do
+      #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+      echo "$l ISO-8859-13"
+    done
+    for l in ru_UA uk uk_UA; do
+      echo "$l KOI8-U"
+    done
+    for l in zh zh_CN; do
+      #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+      echo "$l GB2312"
+    done
+    for l in ja ja_JP ja_JP.EUC; do
+      echo "$l EUC-JP"
+    done
+    for l in ko ko_KR; do
+      echo "$l EUC-KR"
+    done
+    for l in th th_TH; do
+      echo "$l TIS-620"
+    done
+    for l in fa fa_IR; do
+      #echo "$l ISIRI-3342" # a broken encoding
+      echo "$l.utf-8 UTF-8"
+    done
+    ;;
+  linux* | *-gnu*)
+    # With glibc-2.1 or newer, we don't need any canonicalization,
+    # because glibc has iconv and both glibc and libiconv support all
+    # GNU canonical names directly. Therefore, the Makefile does not
+    # need to install the alias file at all.
+    # The following applies only to glibc-2.0.x and older libcs.
+    echo "ISO_646.IRV:1983 ASCII"
+    ;;
+  aix*)
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-6 ISO-8859-6"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-8 ISO-8859-8"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "IBM-850 CP850"
+    echo "IBM-856 CP856"
+    echo "IBM-921 ISO-8859-13"
+    echo "IBM-922 CP922"
+    echo "IBM-932 CP932"
+    echo "IBM-943 CP943"
+    echo "IBM-1046 CP1046"
+    echo "IBM-1124 CP1124"
+    echo "IBM-1129 CP1129"
+    echo "IBM-1252 CP1252"
+    echo "IBM-eucCN GB2312"
+    echo "IBM-eucJP EUC-JP"
+    echo "IBM-eucKR EUC-KR"
+    echo "IBM-eucTW EUC-TW"
+    echo "big5 BIG5"
+    echo "GBK GBK"
+    echo "TIS-620 TIS-620"
+    echo "UTF-8 UTF-8"
+    ;;
+  hpux*)
+    echo "iso88591 ISO-8859-1"
+    echo "iso88592 ISO-8859-2"
+    echo "iso88595 ISO-8859-5"
+    echo "iso88596 ISO-8859-6"
+    echo "iso88597 ISO-8859-7"
+    echo "iso88598 ISO-8859-8"
+    echo "iso88599 ISO-8859-9"
+    echo "iso885915 ISO-8859-15"
+    echo "roman8 HP-ROMAN8"
+    echo "arabic8 HP-ARABIC8"
+    echo "greek8 HP-GREEK8"
+    echo "hebrew8 HP-HEBREW8"
+    echo "turkish8 HP-TURKISH8"
+    echo "kana8 HP-KANA8"
+    echo "tis620 TIS-620"
+    echo "big5 BIG5"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    echo "hp15CN GB2312"
+    #echo "ccdc ?" # what is this?
+    echo "SJIS SHIFT_JIS"
+    echo "utf8 UTF-8"
+    ;;
+  irix*)
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "eucCN GB2312"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    ;;
+  osf*)
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-8 ISO-8859-8"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "cp850 CP850"
+    echo "big5 BIG5"
+    echo "dechanyu DEC-HANYU"
+    echo "dechanzi GB2312"
+    echo "deckanji DEC-KANJI"
+    echo "deckorean EUC-KR"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    echo "GBK GBK"
+    echo "KSC5601 CP949"
+    echo "sdeckanji EUC-JP"
+    echo "SJIS SHIFT_JIS"
+    echo "TACTIS TIS-620"
+    echo "UTF-8 UTF-8"
+    ;;
+  solaris*)
+    echo "646 ASCII"
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-3 ISO-8859-3"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-6 ISO-8859-6"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-8 ISO-8859-8"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "koi8-r KOI8-R"
+    echo "ansi-1251 CP1251"
+    echo "BIG5 BIG5"
+    echo "Big5-HKSCS BIG5-HKSCS"
+    echo "gb2312 GB2312"
+    echo "GBK GBK"
+    echo "GB18030 GB18030"
+    echo "cns11643 EUC-TW"
+    echo "5601 EUC-KR"
+    echo "ko_KR.johap92 JOHAB"
+    echo "eucJP EUC-JP"
+    echo "PCK SHIFT_JIS"
+    echo "TIS620.2533 TIS-620"
+    #echo "sun_eu_greek ?" # what is this?
+    echo "UTF-8 UTF-8"
+    ;;
+  freebsd* | os2*)
+    # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+    # reuse FreeBSD's locale data for OS/2.
+    echo "C ASCII"
+    echo "US-ASCII ASCII"
+    for l in la_LN lt_LN; do
+      echo "$l.ASCII ASCII"
+    done
+    for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+             fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+             lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+      echo "$l.ISO_8859-1 ISO-8859-1"
+      echo "$l.DIS_8859-15 ISO-8859-15"
+    done
+    for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+      echo "$l.ISO_8859-2 ISO-8859-2"
+    done
+    for l in la_LN lt_LT; do
+      echo "$l.ISO_8859-4 ISO-8859-4"
+    done
+    for l in ru_RU ru_SU; do
+      echo "$l.KOI8-R KOI8-R"
+      echo "$l.ISO_8859-5 ISO-8859-5"
+      echo "$l.CP866 CP866"
+    done
+    echo "uk_UA.KOI8-U KOI8-U"
+    echo "zh_TW.BIG5 BIG5"
+    echo "zh_TW.Big5 BIG5"
+    echo "zh_CN.EUC GB2312"
+    echo "ja_JP.EUC EUC-JP"
+    echo "ja_JP.SJIS SHIFT_JIS"
+    echo "ja_JP.Shift_JIS SHIFT_JIS"
+    echo "ko_KR.EUC EUC-KR"
+    ;;
+  netbsd*)
+    echo "646 ASCII"
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-13 ISO-8859-13"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "eucCN GB2312"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "eucTW EUC-TW"
+    echo "BIG5 BIG5"
+    echo "SJIS SHIFT_JIS"
+    ;;
+  openbsd*)
+    echo "646 ASCII"
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-13 ISO-8859-13"
+    echo "ISO8859-15 ISO-8859-15"
+    ;;
+  darwin[56]*)
+    # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "C ASCII"
+    for l in en_AU en_CA en_GB en_US la_LN; do
+      echo "$l.US-ASCII ASCII"
+    done
+    for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+             fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+             nl_NL no_NO pt_PT sv_SE; do
+      echo "$l ISO-8859-1"
+      echo "$l.ISO8859-1 ISO-8859-1"
+      echo "$l.ISO8859-15 ISO-8859-15"
+    done
+    for l in la_LN; do
+      echo "$l.ISO8859-1 ISO-8859-1"
+      echo "$l.ISO8859-15 ISO-8859-15"
+    done
+    for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+      echo "$l.ISO8859-2 ISO-8859-2"
+    done
+    for l in la_LN lt_LT; do
+      echo "$l.ISO8859-4 ISO-8859-4"
+    done
+    for l in ru_RU; do
+      echo "$l.KOI8-R KOI8-R"
+      echo "$l.ISO8859-5 ISO-8859-5"
+      echo "$l.CP866 CP866"
+    done
+    for l in bg_BG; do
+      echo "$l.CP1251 CP1251"
+    done
+    echo "uk_UA.KOI8-U KOI8-U"
+    echo "zh_TW.BIG5 BIG5"
+    echo "zh_TW.Big5 BIG5"
+    echo "zh_CN.EUC GB2312"
+    echo "ja_JP.EUC EUC-JP"
+    echo "ja_JP.SJIS SHIFT_JIS"
+    echo "ko_KR.EUC EUC-KR"
+    ;;
+  darwin*)
+    # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
+    # useless:
+    # - It returns the empty string when LANG is set to a locale of the
+    #   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+    #   LC_CTYPE file.
+    # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+    #   the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+    # - The documentation says:
+    #     "... all code that calls BSD system routines should ensure
+    #      that the const *char parameters of these routines are in UTF-8
+    #      encoding. All BSD system functions expect their string
+    #      parameters to be in UTF-8 encoding and nothing else."
+    #   It also says
+    #     "An additional caveat is that string parameters for files,
+    #      paths, and other file-system entities must be in canonical
+    #      UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+    #      characters are decomposed ..."
+    #   but this is not true: You can pass non-decomposed UTF-8 strings
+    #   to file system functions, and it is the OS which will convert
+    #   them to decomposed UTF-8 before accessing the file system.
+    # - The Apple Terminal application displays UTF-8 by default.
+    # - However, other applications are free to use different encodings:
+    #   - xterm uses ISO-8859-1 by default.
+    #   - TextEdit uses MacRoman by default.
+    # We prefer UTF-8 over decomposed UTF-8-MAC because one should
+    # minimize the use of decomposed Unicode. Unfortunately, through the
+    # Darwin file system, decomposed UTF-8 strings are leaked into user
+    # space nevertheless.
+    # Then there are also the locales with encodings other than US-ASCII
+    # and UTF-8. These locales can be occasionally useful to users (e.g.
+    # when grepping through ISO-8859-1 encoded text files), when all their
+    # file names are in US-ASCII.
+    echo "ISO8859-1 ISO-8859-1"
+    echo "ISO8859-2 ISO-8859-2"
+    echo "ISO8859-4 ISO-8859-4"
+    echo "ISO8859-5 ISO-8859-5"
+    echo "ISO8859-7 ISO-8859-7"
+    echo "ISO8859-9 ISO-8859-9"
+    echo "ISO8859-13 ISO-8859-13"
+    echo "ISO8859-15 ISO-8859-15"
+    echo "KOI8-R KOI8-R"
+    echo "KOI8-U KOI8-U"
+    echo "CP866 CP866"
+    echo "CP949 CP949"
+    echo "CP1131 CP1131"
+    echo "CP1251 CP1251"
+    echo "eucCN GB2312"
+    echo "GB2312 GB2312"
+    echo "eucJP EUC-JP"
+    echo "eucKR EUC-KR"
+    echo "Big5 BIG5"
+    echo "Big5HKSCS BIG5-HKSCS"
+    echo "GBK GBK"
+    echo "GB18030 GB18030"
+    echo "SJIS SHIFT_JIS"
+    echo "ARMSCII-8 ARMSCII-8"
+    echo "PT154 PT154"
+    #echo "ISCII-DEV ?"
+    echo "* UTF-8"
+    ;;
+  beos* | haiku*)
+    # BeOS and Haiku have a single locale, and it has UTF-8 encoding.
+    echo "* UTF-8"
+    ;;
+  msdosdjgpp*)
+    # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+    # localcharset.c falls back to using the full locale name
+    # from the environment variables.
+    echo "#"
+    echo "# The encodings given here may not all be correct."
+    echo "# If you find that the encoding given for your language and"
+    echo "# country is not the one your DOS machine actually uses, just"
+    echo "# correct it in this file, and send a mail to"
+    echo "# Juan Manuel Guerrero <juan.guerrero@gmx.de>"
+    echo "# and Bruno Haible <bruno@clisp.org>."
+    echo "#"
+    echo "C ASCII"
+    # ISO-8859-1 languages
+    echo "ca CP850"
+    echo "ca_ES CP850"
+    echo "da CP865"    # not CP850 ??
+    echo "da_DK CP865" # not CP850 ??
+    echo "de CP850"
+    echo "de_AT CP850"
+    echo "de_CH CP850"
+    echo "de_DE CP850"
+    echo "en CP850"
+    echo "en_AU CP850" # not CP437 ??
+    echo "en_CA CP850"
+    echo "en_GB CP850"
+    echo "en_NZ CP437"
+    echo "en_US CP437"
+    echo "en_ZA CP850" # not CP437 ??
+    echo "es CP850"
+    echo "es_AR CP850"
+    echo "es_BO CP850"
+    echo "es_CL CP850"
+    echo "es_CO CP850"
+    echo "es_CR CP850"
+    echo "es_CU CP850"
+    echo "es_DO CP850"
+    echo "es_EC CP850"
+    echo "es_ES CP850"
+    echo "es_GT CP850"
+    echo "es_HN CP850"
+    echo "es_MX CP850"
+    echo "es_NI CP850"
+    echo "es_PA CP850"
+    echo "es_PY CP850"
+    echo "es_PE CP850"
+    echo "es_SV CP850"
+    echo "es_UY CP850"
+    echo "es_VE CP850"
+    echo "et CP850"
+    echo "et_EE CP850"
+    echo "eu CP850"
+    echo "eu_ES CP850"
+    echo "fi CP850"
+    echo "fi_FI CP850"
+    echo "fr CP850"
+    echo "fr_BE CP850"
+    echo "fr_CA CP850"
+    echo "fr_CH CP850"
+    echo "fr_FR CP850"
+    echo "ga CP850"
+    echo "ga_IE CP850"
+    echo "gd CP850"
+    echo "gd_GB CP850"
+    echo "gl CP850"
+    echo "gl_ES CP850"
+    echo "id CP850"    # not CP437 ??
+    echo "id_ID CP850" # not CP437 ??
+    echo "is CP861"    # not CP850 ??
+    echo "is_IS CP861" # not CP850 ??
+    echo "it CP850"
+    echo "it_CH CP850"
+    echo "it_IT CP850"
+    echo "lt CP775"
+    echo "lt_LT CP775"
+    echo "lv CP775"
+    echo "lv_LV CP775"
+    echo "nb CP865"    # not CP850 ??
+    echo "nb_NO CP865" # not CP850 ??
+    echo "nl CP850"
+    echo "nl_BE CP850"
+    echo "nl_NL CP850"
+    echo "nn CP865"    # not CP850 ??
+    echo "nn_NO CP865" # not CP850 ??
+    echo "no CP865"    # not CP850 ??
+    echo "no_NO CP865" # not CP850 ??
+    echo "pt CP850"
+    echo "pt_BR CP850"
+    echo "pt_PT CP850"
+    echo "sv CP850"
+    echo "sv_SE CP850"
+    # ISO-8859-2 languages
+    echo "cs CP852"
+    echo "cs_CZ CP852"
+    echo "hr CP852"
+    echo "hr_HR CP852"
+    echo "hu CP852"
+    echo "hu_HU CP852"
+    echo "pl CP852"
+    echo "pl_PL CP852"
+    echo "ro CP852"
+    echo "ro_RO CP852"
+    echo "sk CP852"
+    echo "sk_SK CP852"
+    echo "sl CP852"
+    echo "sl_SI CP852"
+    echo "sq CP852"
+    echo "sq_AL CP852"
+    echo "sr CP852"    # CP852 or CP866 or CP855 ??
+    echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
+    echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+    # ISO-8859-3 languages
+    echo "mt CP850"
+    echo "mt_MT CP850"
+    # ISO-8859-5 languages
+    echo "be CP866"
+    echo "be_BE CP866"
+    echo "bg CP866"    # not CP855 ??
+    echo "bg_BG CP866" # not CP855 ??
+    echo "mk CP866"    # not CP855 ??
+    echo "mk_MK CP866" # not CP855 ??
+    echo "ru CP866"
+    echo "ru_RU CP866"
+    echo "uk CP1125"
+    echo "uk_UA CP1125"
+    # ISO-8859-6 languages
+    echo "ar CP864"
+    echo "ar_AE CP864"
+    echo "ar_DZ CP864"
+    echo "ar_EG CP864"
+    echo "ar_IQ CP864"
+    echo "ar_IR CP864"
+    echo "ar_JO CP864"
+    echo "ar_KW CP864"
+    echo "ar_MA CP864"
+    echo "ar_OM CP864"
+    echo "ar_QA CP864"
+    echo "ar_SA CP864"
+    echo "ar_SY CP864"
+    # ISO-8859-7 languages
+    echo "el CP869"
+    echo "el_GR CP869"
+    # ISO-8859-8 languages
+    echo "he CP862"
+    echo "he_IL CP862"
+    # ISO-8859-9 languages
+    echo "tr CP857"
+    echo "tr_TR CP857"
+    # Japanese
+    echo "ja CP932"
+    echo "ja_JP CP932"
+    # Chinese
+    echo "zh_CN GBK"
+    echo "zh_TW CP950" # not CP938 ??
+    # Korean
+    echo "kr CP949"    # not CP934 ??
+    echo "kr_KR CP949" # not CP934 ??
+    # Thai
+    echo "th CP874"
+    echo "th_TH CP874"
+    # Other
+    echo "eo CP850"
+    echo "eo_EO CP850"
+    ;;
+esac
diff -ruN groff-1.20.1/src/libs/gnulib/lib/localcharset.c groff-1.21/src/libs/gnulib/lib/localcharset.c
--- groff-1.20.1/src/libs/gnulib/lib/localcharset.c	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/localcharset.c	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,548 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "localcharset.h"
+
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
+# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
+#endif
+
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_NATIVE
+#endif
+
+#if defined __EMX__
+/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
+# ifndef OS2
+#  define OS2
+# endif
+#endif
+
+#if !defined WIN32_NATIVE
+# include <unistd.h>
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if 0 /* see comment below */
+#   include <locale.h>
+#  endif
+# endif
+# ifdef __CYGWIN__
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# endif
+#elif defined WIN32_NATIVE
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+#if defined OS2
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
+/* Get LIBDIR.  */
+#ifndef LIBDIR
+# include "configmake.h"
+#endif
+
+/* Define O_NOFOLLOW to 0 on platforms where it does not exist.  */
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+#if HAVE_DECL_GETC_UNLOCKED
+# undef getc
+# define getc getc_unlocked
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static const char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases (void)
+{
+  const char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
+      const char *dir;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Make it possible to override the charset.alias location.  This is
+         necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+        dir = relocate (LIBDIR);
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+        size_t dir_len = strlen (dir);
+        size_t base_len = strlen (base);
+        int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+        file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+        if (file_name != NULL)
+          {
+            memcpy (file_name, dir, dir_len);
+            if (add_slash)
+              file_name[dir_len] = DIRECTORY_SEPARATOR;
+            memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+          }
+      }
+
+      if (file_name == NULL)
+        /* Out of memory.  Treat the file as empty.  */
+        cp = "";
+      else
+        {
+          int fd;
+
+          /* Open the file.  Reject symbolic links on platforms that support
+             O_NOFOLLOW.  This is a security feature.  Without it, an attacker
+             could retrieve parts of the contents (namely, the tail of the
+             first line that starts with "* ") of an arbitrary file by placing
+             a symbolic link to that file under the name "charset.alias" in
+             some writable directory and defining the environment variable
+             CHARSETALIASDIR to point to that directory.  */
+          fd = open (file_name,
+                     O_RDONLY | (HAVE_WORKING_O_NOFOLLOW ? O_NOFOLLOW : 0));
+          if (fd < 0)
+            /* File not found.  Treat it as empty.  */
+            cp = "";
+          else
+            {
+              FILE *fp;
+
+              fp = fdopen (fd, "r");
+              if (fp == NULL)
+                {
+                  /* Out of memory.  Treat the file as empty.  */
+                  close (fd);
+                  cp = "";
+                }
+              else
+                {
+                  /* Parse the file's contents.  */
+                  char *res_ptr = NULL;
+                  size_t res_size = 0;
+
+                  for (;;)
+                    {
+                      int c;
+                      char buf1[50+1];
+                      char buf2[50+1];
+                      size_t l1, l2;
+                      char *old_res_ptr;
+
+                      c = getc (fp);
+                      if (c == EOF)
+                        break;
+                      if (c == '\n' || c == ' ' || c == '\t')
+                        continue;
+                      if (c == '#')
+                        {
+                          /* Skip comment, to end of line.  */
+                          do
+                            c = getc (fp);
+                          while (!(c == EOF || c == '\n'));
+                          if (c == EOF)
+                            break;
+                          continue;
+                        }
+                      ungetc (c, fp);
+                      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
+                        break;
+                      l1 = strlen (buf1);
+                      l2 = strlen (buf2);
+                      old_res_ptr = res_ptr;
+                      if (res_size == 0)
+                        {
+                          res_size = l1 + 1 + l2 + 1;
+                          res_ptr = (char *) malloc (res_size + 1);
+                        }
+                      else
+                        {
+                          res_size += l1 + 1 + l2 + 1;
+                          res_ptr = (char *) realloc (res_ptr, res_size + 1);
+                        }
+                      if (res_ptr == NULL)
+                        {
+                          /* Out of memory. */
+                          res_size = 0;
+                          if (old_res_ptr != NULL)
+                            free (old_res_ptr);
+                          break;
+                        }
+                      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+                      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+                    }
+                  fclose (fp);
+                  if (res_size == 0)
+                    cp = "";
+                  else
+                    {
+                      *(res_ptr + res_size) = '\0';
+                      cp = res_ptr;
+                    }
+                }
+            }
+
+          free (file_name);
+        }
+
+#else
+
+# if defined DARWIN7
+      /* To avoid the trouble of installing a file that is shared by many
+         GNU packages -- many packaging systems have problems with this --,
+         simply inline the aliases here.  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+           "ISO8859-2" "\0" "ISO-8859-2" "\0"
+           "ISO8859-4" "\0" "ISO-8859-4" "\0"
+           "ISO8859-5" "\0" "ISO-8859-5" "\0"
+           "ISO8859-7" "\0" "ISO-8859-7" "\0"
+           "ISO8859-9" "\0" "ISO-8859-9" "\0"
+           "ISO8859-13" "\0" "ISO-8859-13" "\0"
+           "ISO8859-15" "\0" "ISO-8859-15" "\0"
+           "KOI8-R" "\0" "KOI8-R" "\0"
+           "KOI8-U" "\0" "KOI8-U" "\0"
+           "CP866" "\0" "CP866" "\0"
+           "CP949" "\0" "CP949" "\0"
+           "CP1131" "\0" "CP1131" "\0"
+           "CP1251" "\0" "CP1251" "\0"
+           "eucCN" "\0" "GB2312" "\0"
+           "GB2312" "\0" "GB2312" "\0"
+           "eucJP" "\0" "EUC-JP" "\0"
+           "eucKR" "\0" "EUC-KR" "\0"
+           "Big5" "\0" "BIG5" "\0"
+           "Big5HKSCS" "\0" "BIG5-HKSCS" "\0"
+           "GBK" "\0" "GBK" "\0"
+           "GB18030" "\0" "GB18030" "\0"
+           "SJIS" "\0" "SHIFT_JIS" "\0"
+           "ARMSCII-8" "\0" "ARMSCII-8" "\0"
+           "PT154" "\0" "PT154" "\0"
+         /*"ISCII-DEV" "\0" "?" "\0"*/
+           "*" "\0" "UTF-8" "\0";
+# endif
+
+# if defined VMS
+      /* To avoid the troubles of an extra file charset.alias_vms in the
+         sources of many GNU packages, simply inline the aliases here.  */
+      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+         "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+         section 10.7 "Handling Different Character Sets".  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+           "ISO8859-2" "\0" "ISO-8859-2" "\0"
+           "ISO8859-5" "\0" "ISO-8859-5" "\0"
+           "ISO8859-7" "\0" "ISO-8859-7" "\0"
+           "ISO8859-8" "\0" "ISO-8859-8" "\0"
+           "ISO8859-9" "\0" "ISO-8859-9" "\0"
+           /* Japanese */
+           "eucJP" "\0" "EUC-JP" "\0"
+           "SJIS" "\0" "SHIFT_JIS" "\0"
+           "DECKANJI" "\0" "DEC-KANJI" "\0"
+           "SDECKANJI" "\0" "EUC-JP" "\0"
+           /* Chinese */
+           "eucTW" "\0" "EUC-TW" "\0"
+           "DECHANYU" "\0" "DEC-HANYU" "\0"
+           "DECHANZI" "\0" "GB2312" "\0"
+           /* Korean */
+           "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WIN32_NATIVE || defined __CYGWIN__
+      /* To avoid the troubles of installing a separate file in the same
+         directory as the DLL and of retrieving the DLL's directory at
+         runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+           "CP1361" "\0" "JOHAB" "\0"
+           "CP20127" "\0" "ASCII" "\0"
+           "CP20866" "\0" "KOI8-R" "\0"
+           "CP20936" "\0" "GB2312" "\0"
+           "CP21866" "\0" "KOI8-RU" "\0"
+           "CP28591" "\0" "ISO-8859-1" "\0"
+           "CP28592" "\0" "ISO-8859-2" "\0"
+           "CP28593" "\0" "ISO-8859-3" "\0"
+           "CP28594" "\0" "ISO-8859-4" "\0"
+           "CP28595" "\0" "ISO-8859-5" "\0"
+           "CP28596" "\0" "ISO-8859-6" "\0"
+           "CP28597" "\0" "ISO-8859-7" "\0"
+           "CP28598" "\0" "ISO-8859-8" "\0"
+           "CP28599" "\0" "ISO-8859-9" "\0"
+           "CP28605" "\0" "ISO-8859-15" "\0"
+           "CP38598" "\0" "ISO-8859-8" "\0"
+           "CP51932" "\0" "EUC-JP" "\0"
+           "CP51936" "\0" "GB2312" "\0"
+           "CP51949" "\0" "EUC-KR" "\0"
+           "CP51950" "\0" "EUC-TW" "\0"
+           "CP54936" "\0" "GB18030" "\0"
+           "CP65001" "\0" "UTF-8" "\0";
+# endif
+#endif
+
+      charset_aliases = cp;
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset (void)
+{
+  const char *codeset;
+  const char *aliases;
+
+#if !(defined WIN32_NATIVE || defined OS2)
+
+# if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+#  ifdef __CYGWIN__
+  /* Cygwin < 1.7 does not have locales.  nl_langinfo (CODESET) always
+     returns "US-ASCII".  Return the suffix of the locale name from the
+     environment variables (if present) or the codepage as a number.  */
+  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+    {
+      const char *locale;
+      static char buf[2 + 10 + 1];
+
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+        {
+          locale = getenv ("LC_CTYPE");
+          if (locale == NULL || locale[0] == '\0')
+            locale = getenv ("LANG");
+        }
+      if (locale != NULL && locale[0] != '\0')
+        {
+          /* If the locale name contains an encoding after the dot, return
+             it.  */
+          const char *dot = strchr (locale, '.');
+
+          if (dot != NULL)
+            {
+              const char *modifier;
+
+              dot++;
+              /* Look for the possible @... trailer and remove it, if any.  */
+              modifier = strchr (dot, '@');
+              if (modifier == NULL)
+                return dot;
+              if (modifier - dot < sizeof (buf))
+                {
+                  memcpy (buf, dot, modifier - dot);
+                  buf [modifier - dot] = '\0';
+                  return buf;
+                }
+            }
+        }
+
+      /* Woe32 has a function returning the locale's codepage as a number:
+         GetACP().  This encoding is used by Cygwin, unless the user has set
+         the environment variable CYGWIN=codepage:oem (which very few people
+         do).
+         Output directed to console windows needs to be converted (to
+         GetOEMCP() if the console is using a raster font, or to
+         GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
+         this conversion transparently (see winsup/cygwin/fhandler_console.cc),
+         converting to GetConsoleOutputCP().  This leads to correct results,
+         except when SetConsoleOutputCP has been called and a raster font is
+         in use.  */
+      sprintf (buf, "CP%u", GetACP ());
+      codeset = buf;
+    }
+#  endif
+
+# else
+
+  /* On old systems which lack it, use setlocale or getenv.  */
+  const char *locale = NULL;
+
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if 0
+  locale = setlocale (LC_CTYPE, NULL);
+#  endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+        {
+          locale = getenv ("LC_CTYPE");
+          if (locale == NULL || locale[0] == '\0')
+            locale = getenv ("LANG");
+        }
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+# endif
+
+#elif defined WIN32_NATIVE
+
+  static char buf[2 + 10 + 1];
+
+  /* Woe32 has a function returning the locale's codepage as a number:
+     GetACP().
+     When the output goes to a console window, it needs to be provided in
+     GetOEMCP() encoding if the console is using a raster font, or in
+     GetConsoleOutputCP() encoding if it is using a TrueType font.
+     But in GUI programs and for output sent to files and pipes, GetACP()
+     encoding is the best bet.  */
+  sprintf (buf, "CP%u", GetACP ());
+  codeset = buf;
+
+#elif defined OS2
+
+  const char *locale;
+  static char buf[2 + 10 + 1];
+  ULONG cp[3];
+  ULONG cplen;
+
+  /* Allow user to override the codeset, as set in the operating system,
+     with standard language environment variables.  */
+  locale = getenv ("LC_ALL");
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_CTYPE");
+      if (locale == NULL || locale[0] == '\0')
+        locale = getenv ("LANG");
+    }
+  if (locale != NULL && locale[0] != '\0')
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      const char *dot = strchr (locale, '.');
+
+      if (dot != NULL)
+        {
+          const char *modifier;
+
+          dot++;
+          /* Look for the possible @... trailer and remove it, if any.  */
+          modifier = strchr (dot, '@');
+          if (modifier == NULL)
+            return dot;
+          if (modifier - dot < sizeof (buf))
+            {
+              memcpy (buf, dot, modifier - dot);
+              buf [modifier - dot] = '\0';
+              return buf;
+            }
+        }
+
+      /* Resolve through the charset.alias file.  */
+      codeset = locale;
+    }
+  else
+    {
+      /* OS/2 has a function returning the locale's codepage as a number.  */
+      if (DosQueryCp (sizeof (cp), cp, &cplen))
+        codeset = "";
+      else
+        {
+          sprintf (buf, "CP%u", cp[0]);
+          codeset = buf;
+        }
+    }
+
+#endif
+
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+        || (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+        codeset = aliases + strlen (aliases) + 1;
+        break;
+      }
+
+  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
+     the empty string as denoting "the locale's character encoding",
+     thus GNU libiconv would call this function a second time.  */
+  if (codeset[0] == '\0')
+    codeset = "ASCII";
+
+  return codeset;
+}
diff -ruN groff-1.20.1/src/libs/gnulib/lib/localcharset.h groff-1.21/src/libs/gnulib/lib/localcharset.h
--- groff-1.20.1/src/libs/gnulib/lib/localcharset.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/localcharset.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,41 @@
+/* Determine a canonical name for the current locale's character encoding.
+   Copyright (C) 2000-2003, 2009-2010 Free Software Foundation, Inc.
+   This file is part of the GNU CHARSET Library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _LOCALCHARSET_H
+#define _LOCALCHARSET_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+extern const char * locale_charset (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LOCALCHARSET_H */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/Makefile.am groff-1.21/src/libs/gnulib/lib/Makefile.am
--- groff-1.20.1/src/libs/gnulib/lib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/Makefile.am	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,465 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+## Process this file with automake to produce Makefile.in.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --dir=src/libs/gnulib --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl wcwidth
+
+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
+
+SUBDIRS =
+noinst_HEADERS =
+noinst_LIBRARIES =
+noinst_LTLIBRARIES =
+EXTRA_DIST =
+BUILT_SOURCES =
+SUFFIXES =
+MOSTLYCLEANFILES = core *.stackdump
+MOSTLYCLEANDIRS =
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+
+AM_CPPFLAGS =
+AM_CFLAGS =
+
+noinst_LIBRARIES += libgnu.a
+
+libgnu_a_SOURCES =
+libgnu_a_LIBADD = $(gl_LIBOBJS)
+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
+EXTRA_libgnu_a_SOURCES =
+
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h
+
+## end   gnulib module arg-nonnull
+
+## begin gnulib module c++defs
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h
+
+## end   gnulib module c++defs
+
+## begin gnulib module configmake
+
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+	$(AM_V_GEN)rm -f $@-t && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  echo '#define PREFIX "$(prefix)"'; \
+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+	  echo '#define BINDIR "$(bindir)"'; \
+	  echo '#define SBINDIR "$(sbindir)"'; \
+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+	  echo '#define DATADIR "$(datadir)"'; \
+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define INCLUDEDIR "$(includedir)"'; \
+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+	  echo '#define DOCDIR "$(docdir)"'; \
+	  echo '#define INFODIR "$(infodir)"'; \
+	  echo '#define HTMLDIR "$(htmldir)"'; \
+	  echo '#define DVIDIR "$(dvidir)"'; \
+	  echo '#define PDFDIR "$(pdfdir)"'; \
+	  echo '#define PSDIR "$(psdir)"'; \
+	  echo '#define LIBDIR "$(libdir)"'; \
+	  echo '#define LISPDIR "$(lispdir)"'; \
+	  echo '#define LOCALEDIR "$(localedir)"'; \
+	  echo '#define MANDIR "$(mandir)"'; \
+	  echo '#define MANEXT "$(manext)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t && \
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
+
+BUILT_SOURCES += configmake.h
+CLEANFILES += configmake.h configmake.h-t
+
+## end   gnulib module configmake
+
+## begin gnulib module localcharset
+
+libgnu_a_SOURCES += localcharset.h localcharset.c
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+install-exec-local: install-exec-localcharset
+install-exec-localcharset: all-local
+	if test $(GLIBC21) = no; then \
+	  case '$(host_os)' in \
+	    darwin[56]*) \
+	      need_charset_alias=true ;; \
+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+	      need_charset_alias=false ;; \
+	    *) \
+	      need_charset_alias=true ;; \
+	  esac ; \
+	else \
+	  need_charset_alias=false ; \
+	fi ; \
+	if $$need_charset_alias; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+	fi ; \
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if $$need_charset_alias; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: uninstall-localcharset
+uninstall-localcharset: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
+	mv t-$@ $@
+
+SUFFIXES += .sed .sin
+.sin.sed:
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
+	mv t-$@ $@
+
+CLEANFILES += charset.alias ref-add.sed ref-del.sed
+
+EXTRA_DIST += config.charset ref-add.sin ref-del.sin
+
+## end   gnulib module localcharset
+
+## begin gnulib module stddef
+
+BUILT_SOURCES += $(STDDEF_H)
+
+# We need the following in order to create <stddef.h> when the system
+# doesn't have one that works with the given compiler.
+stddef.h: stddef.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+	      < $(srcdir)/stddef.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += stddef.h stddef.h-t
+
+EXTRA_DIST += stddef.in.h
+
+## end   gnulib module stddef
+
+## begin gnulib module stdint
+
+BUILT_SOURCES += $(STDINT_H)
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+stdint.h: stdint.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += stdint.h stdint.h-t
+
+EXTRA_DIST += stdint.in.h
+
+## end   gnulib module stdint
+
+## begin gnulib module streq
+
+
+EXTRA_DIST += streq.h
+
+## end   gnulib module streq
+
+## begin gnulib module unitypes
+
+BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
+
+unitypes.h: unitypes.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/unitypes.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += unitypes.h unitypes.h-t
+
+EXTRA_DIST += unitypes.in.h
+
+## end   gnulib module unitypes
+
+## begin gnulib module uniwidth/base
+
+BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
+
+uniwidth.h: uniwidth.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/uniwidth.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t
+
+EXTRA_DIST += localcharset.h uniwidth.in.h
+
+## end   gnulib module uniwidth/base
+
+## begin gnulib module uniwidth/width
+
+if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH
+libgnu_a_SOURCES += uniwidth/width.c
+endif
+
+EXTRA_DIST += uniwidth/cjk.h
+
+## end   gnulib module uniwidth/width
+
+## begin gnulib module warn-on-use
+
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
+
+WARN_ON_USE_H=warn-on-use.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
+
+## end   gnulib module warn-on-use
+
+## begin gnulib module wchar
+
+BUILT_SOURCES += wchar.h
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
+	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
+	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
+	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
+	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
+	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
+	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
+	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
+	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
+	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
+	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
+	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
+	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
+	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
+	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t
+
+EXTRA_DIST += wchar.in.h
+
+## end   gnulib module wchar
+
+## begin gnulib module wctype
+
+BUILT_SOURCES += wctype.h
+
+# We need the following in order to create <wctype.h> when the system
+# doesn't have one that works with the given compiler.
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += wctype.h wctype.h-t
+
+EXTRA_DIST += wctype.in.h
+
+## end   gnulib module wctype
+
+## begin gnulib module wcwidth
+
+
+EXTRA_DIST += wcwidth.c
+
+EXTRA_libgnu_a_SOURCES += wcwidth.c
+
+## end   gnulib module wcwidth
+
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	:
diff -ruN groff-1.20.1/src/libs/gnulib/lib/Makefile.in groff-1.21/src/libs/gnulib/lib/Makefile.in
--- groff-1.20.1/src/libs/gnulib/lib/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/Makefile.in	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,1059 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --dir=src/libs/gnulib --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl wcwidth
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_1 = uniwidth/width.c
+subdir = lib
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/include_next.m4 \
+	$(top_srcdir)/m4/libunistring-base.m4 \
+	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype_h.m4 \
+	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libgnu_a_AR = $(AR) $(ARFLAGS)
+am__DEPENDENCIES_1 =
+am__libgnu_a_SOURCES_DIST = localcharset.h localcharset.c \
+	uniwidth/width.c
+am__dirstamp = $(am__leading_dot)dirstamp
+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT)
+am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) $(am__objects_1)
+libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
+DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GLIBC21 = @GLIBC21@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GREP = @GREP@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
+SUBDIRS = 
+noinst_HEADERS = 
+noinst_LIBRARIES = libgnu.a
+noinst_LTLIBRARIES = 
+EXTRA_DIST = $(top_srcdir)/build-aux/arg-nonnull.h \
+	$(top_srcdir)/build-aux/c++defs.h config.charset ref-add.sin \
+	ref-del.sin stddef.in.h stdint.in.h streq.h unitypes.in.h \
+	localcharset.h uniwidth.in.h uniwidth/cjk.h \
+	$(top_srcdir)/build-aux/warn-on-use.h wchar.in.h wctype.in.h \
+	wcwidth.c
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+BUILT_SOURCES = arg-nonnull.h c++defs.h configmake.h $(STDDEF_H) \
+	$(STDINT_H) $(LIBUNISTRING_UNITYPES_H) \
+	$(LIBUNISTRING_UNIWIDTH_H) warn-on-use.h wchar.h wctype.h
+SUFFIXES = .sed .sin
+MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
+	c++defs.h c++defs.h-t stddef.h stddef.h-t stdint.h stdint.h-t \
+	unitypes.h unitypes.h-t uniwidth.h uniwidth.h-t warn-on-use.h \
+	warn-on-use.h-t wchar.h wchar.h-t wctype.h wctype.h-t
+MOSTLYCLEANDIRS = 
+CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
+	ref-del.sed
+DISTCLEANFILES = 
+MAINTAINERCLEANFILES = 
+AM_CPPFLAGS = 
+AM_CFLAGS = 
+libgnu_a_SOURCES = localcharset.h localcharset.c $(am__append_1)
+libgnu_a_LIBADD = $(gl_LIBOBJS)
+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
+EXTRA_libgnu_a_SOURCES = wcwidth.c
+ARG_NONNULL_H = arg-nonnull.h
+CXXDEFS_H = c++defs.h
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+WARN_ON_USE_H = warn-on-use.h
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .sed .sin .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnits lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+uniwidth/$(am__dirstamp):
+	@$(MKDIR_P) uniwidth
+	@: > uniwidth/$(am__dirstamp)
+uniwidth/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) uniwidth/$(DEPDIR)
+	@: > uniwidth/$(DEPDIR)/$(am__dirstamp)
+uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp) \
+	uniwidth/$(DEPDIR)/$(am__dirstamp)
+libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) 
+	-rm -f libgnu.a
+	$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD)
+	$(RANLIB) libgnu.a
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f uniwidth/width.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/width.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f uniwidth/$(DEPDIR)/$(am__dirstamp)
+	-rm -f uniwidth/$(am__dirstamp)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-exec-local
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-local
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	ctags-recursive install install-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am uninstall-local
+
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/build-aux/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+	$(AM_V_GEN)rm -f $@-t && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  echo '#define PREFIX "$(prefix)"'; \
+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+	  echo '#define BINDIR "$(bindir)"'; \
+	  echo '#define SBINDIR "$(sbindir)"'; \
+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
+	  echo '#define DATADIR "$(datadir)"'; \
+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+	  echo '#define INCLUDEDIR "$(includedir)"'; \
+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+	  echo '#define DOCDIR "$(docdir)"'; \
+	  echo '#define INFODIR "$(infodir)"'; \
+	  echo '#define HTMLDIR "$(htmldir)"'; \
+	  echo '#define DVIDIR "$(dvidir)"'; \
+	  echo '#define PDFDIR "$(pdfdir)"'; \
+	  echo '#define PSDIR "$(psdir)"'; \
+	  echo '#define LIBDIR "$(libdir)"'; \
+	  echo '#define LISPDIR "$(lispdir)"'; \
+	  echo '#define LOCALEDIR "$(localedir)"'; \
+	  echo '#define MANDIR "$(mandir)"'; \
+	  echo '#define MANEXT "$(manext)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+	} | sed '/""/d' > $@-t && \
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
+	  rm -f $@-t; \
+	else \
+	  rm -f $@; mv $@-t $@; \
+	fi
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+install-exec-local: install-exec-localcharset
+install-exec-localcharset: all-local
+	if test $(GLIBC21) = no; then \
+	  case '$(host_os)' in \
+	    darwin[56]*) \
+	      need_charset_alias=true ;; \
+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+	      need_charset_alias=false ;; \
+	    *) \
+	      need_charset_alias=true ;; \
+	  esac ; \
+	else \
+	  need_charset_alias=false ; \
+	fi ; \
+	if $$need_charset_alias; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+	fi ; \
+	if test -f $(charset_alias); then \
+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	  rm -f $(charset_tmp) ; \
+	else \
+	  if $$need_charset_alias; then \
+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+	    rm -f $(charset_tmp) ; \
+	  fi ; \
+	fi
+
+uninstall-local: uninstall-localcharset
+uninstall-localcharset: all-local
+	if test -f $(charset_alias); then \
+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+	      > /dev/null; then \
+	    rm -f $(charset_alias); \
+	  else \
+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+	  fi; \
+	  rm -f $(charset_tmp); \
+	fi
+
+charset.alias: config.charset
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
+	mv t-$@ $@
+.sin.sed:
+	$(AM_V_GEN)rm -f t-$@ $@ && \
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
+	mv t-$@ $@
+
+# We need the following in order to create <stddef.h> when the system
+# doesn't have one that works with the given compiler.
+stddef.h: stddef.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+	      < $(srcdir)/stddef.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+stdint.h: stdint.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+unitypes.h: unitypes.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/unitypes.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+
+uniwidth.h: uniwidth.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/uniwidth.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/build-aux/warn-on-use.h \
+	  > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <wchar.h> when the system
+# version does not work standalone.
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \
+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
+	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
+	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
+	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
+	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
+	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
+	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
+	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
+	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
+	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
+	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
+	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
+	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
+	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
+	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	    < $(srcdir)/wchar.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+# We need the following in order to create <wctype.h> when the system
+# doesn't have one that works with the given compiler.
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+	      -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/wctype.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	:
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -ruN groff-1.20.1/src/libs/gnulib/lib/ref-add.sin groff-1.21/src/libs/gnulib/lib/ref-add.sin
--- groff-1.20.1/src/libs/gnulib/lib/ref-add.sin	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/ref-add.sin	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,30 @@
+# Add this package to a list of references stored in a text file.
+#
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  ta
+  :a
+  s/ @PACKAGE@ / @PACKAGE@ /
+  tb
+  s/ $/ @PACKAGE@ /
+  :b
+  s/^/# Packages using this file:/
+}
diff -ruN groff-1.20.1/src/libs/gnulib/lib/ref-del.sin groff-1.21/src/libs/gnulib/lib/ref-del.sin
--- groff-1.20.1/src/libs/gnulib/lib/ref-del.sin	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/ref-del.sin	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,25 @@
+# Remove this package from a list of references stored in a text file.
+#
+#   Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  s/ @PACKAGE@ / /
+  s/^/# Packages using this file:/
+}
diff -ruN groff-1.20.1/src/libs/gnulib/lib/stddef.in.h groff-1.21/src/libs/gnulib/lib/stddef.in.h
--- groff-1.20.1/src/libs/gnulib/lib/stddef.in.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/stddef.in.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,87 @@
+/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
+
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Eric Blake.  */
+
+/*
+ * POSIX 2008 <stddef.h> for platforms that have issues.
+ * <http://www.opengroup.org/susv3xbd/stddef.h.html>
+ */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined __need_wchar_t || defined __need_size_t  \
+  || defined __need_ptrdiff_t || defined __need_NULL \
+  || defined __need_wint_t
+/* Special invocation convention inside gcc header files.  In
+   particular, gcc provides a version of <stddef.h> that blindly
+   redefines NULL even when __need_wint_t was defined, even though
+   wint_t is not normally provided by <stddef.h>.  Hence, we must
+   remember if special invocation has ever been used to obtain wint_t,
+   in which case we need to clean up NULL yet again.  */
+
+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
+#  ifdef __need_wint_t
+#   undef _GL_STDDEF_H
+#   define _GL_STDDEF_WINT_T
+#  endif
+#  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
+# endif
+
+#else
+/* Normal invocation convention.  */
+
+# ifndef _GL_STDDEF_H
+
+/* The include_next requires a split double-inclusion guard.  */
+
+#  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
+
+#  ifndef _GL_STDDEF_H
+#   define _GL_STDDEF_H
+
+/* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
+#if @REPLACE_NULL@
+# undef NULL
+# ifdef __cplusplus
+   /* ISO C++ says that the macro NULL must expand to an integer constant
+      expression, hence '((void *) 0)' is not allowed in C++.  */
+#  if __GNUG__ >= 3
+    /* GNU C++ has a __null macro that behaves like an integer ('int' or
+       'long') but has the same size as a pointer.  Use that, to avoid
+       warnings.  */
+#   define NULL __null
+#  else
+#   define NULL 0L
+#  endif
+# else
+#  define NULL ((void *) 0)
+# endif
+#endif
+
+/* Some platforms lack wchar_t.  */
+#if !@HAVE_WCHAR_T@
+# define wchar_t int
+#endif
+
+#  endif /* _GL_STDDEF_H */
+# endif /* _GL_STDDEF_H */
+#endif /* __need_XXX */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/stdint.in.h groff-1.21/src/libs/gnulib/lib/stdint.in.h
--- groff-1.20.1/src/libs/gnulib/lib/stdint.in.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/stdint.in.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,581 @@
+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
+   Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
+   This file is part of gnulib.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/*
+ * ISO C 99 <stdint.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/stdint.h.html>
+ */
+
+#ifndef _GL_STDINT_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* When including a system file that in turn includes <inttypes.h>,
+   use the system <inttypes.h>, not our substitute.  This avoids
+   problems with (for example) VMS, whose <sys/bitypes.h> includes
+   <inttypes.h>.  */
+#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* Get those types that are already defined in other system include
+   files, so that we can "#define int8_t signed char" below without
+   worrying about a later system include file containing a "typedef
+   signed char int8_t;" that will get messed up by our macro.  Our
+   macros should all be consistent with the system versions, except
+   for the "fast" types and macros, which we recommend against using
+   in public interfaces due to compiler differences.  */
+
+#if @HAVE_STDINT_H@
+# if defined __sgi && ! defined __c99
+   /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
+      with "This header file is to be used only for c99 mode compilations"
+      diagnostics.  */
+#  define __STDINT_H__
+# endif
+  /* Other systems may have an incomplete or buggy <stdint.h>.
+     Include it before <inttypes.h>, since any "#include <stdint.h>"
+     in <inttypes.h> would reinclude us, skipping our contents because
+     _GL_STDINT_H is defined.
+     The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
+#endif
+
+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_STDINT_H
+
+/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
+   IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
+   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
+   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   relies on the system <stdint.h> definitions, so include
+   <sys/types.h> after @NEXT_STDINT_H@.  */
+#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
+# include <sys/types.h>
+#endif
+
+/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
+#include <limits.h>
+
+#if @HAVE_INTTYPES_H@
+  /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
+     int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+     <inttypes.h> also defines intptr_t and uintptr_t.  */
+# include <inttypes.h>
+#elif @HAVE_SYS_INTTYPES_H@
+  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
+     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
+# include <sys/inttypes.h>
+#endif
+
+#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+  /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
+     int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
+     included by <sys/types.h>.  */
+# include <sys/bitypes.h>
+#endif
+
+#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* Minimum and maximum values for a integer type under the usual assumption.
+   Return an unspecified value if BITS == 0, adding a check to pacify
+   picky compilers.  */
+
+#define _STDINT_MIN(signed, bits, zero) \
+  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+
+#define _STDINT_MAX(signed, bits, zero) \
+  ((signed) \
+   ? ~ _STDINT_MIN (signed, bits, zero) \
+   : /* The expression for the unsigned case.  The subtraction of (signed) \
+        is a nop in the unsigned case and avoids "signed integer overflow" \
+        warnings in the signed case.  */ \
+     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+
+/* 7.18.1.1. Exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits.  */
+
+#undef int8_t
+#undef uint8_t
+typedef signed char gl_int8_t;
+typedef unsigned char gl_uint8_t;
+#define int8_t gl_int8_t
+#define uint8_t gl_uint8_t
+
+#undef int16_t
+#undef uint16_t
+typedef short int gl_int16_t;
+typedef unsigned short int gl_uint16_t;
+#define int16_t gl_int16_t
+#define uint16_t gl_uint16_t
+
+#undef int32_t
+#undef uint32_t
+typedef int gl_int32_t;
+typedef unsigned int gl_uint32_t;
+#define int32_t gl_int32_t
+#define uint32_t gl_uint32_t
+
+/* If the system defines INT64_MAX, assume int64_t works.  That way,
+   if the underlying platform defines int64_t to be a 64-bit long long
+   int, the code below won't mistakenly define it to be a 64-bit long
+   int, which would mess up C++ name mangling.  */
+
+#if INT64_MAX
+# define GL_INT64_T
+#else
+/* Do not undefine int64_t if gnulib is not being used with 64-bit
+   types, since otherwise it breaks platforms like Tandem/NSK.  */
+# if LONG_MAX >> 31 >> 31 == 1
+#  undef int64_t
+typedef long int gl_int64_t;
+#  define int64_t gl_int64_t
+#  define GL_INT64_T
+# elif defined _MSC_VER
+#  undef int64_t
+typedef __int64 gl_int64_t;
+#  define int64_t gl_int64_t
+#  define GL_INT64_T
+# elif @HAVE_LONG_LONG_INT@
+#  undef int64_t
+typedef long long int gl_int64_t;
+#  define int64_t gl_int64_t
+#  define GL_INT64_T
+# endif
+#endif
+
+#if UINT64_MAX
+# define GL_UINT64_T
+#else
+# if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#  undef uint64_t
+typedef unsigned long int gl_uint64_t;
+#  define uint64_t gl_uint64_t
+#  define GL_UINT64_T
+# elif defined _MSC_VER
+#  undef uint64_t
+typedef unsigned __int64 gl_uint64_t;
+#  define uint64_t gl_uint64_t
+#  define GL_UINT64_T
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#  undef uint64_t
+typedef unsigned long long int gl_uint64_t;
+#  define uint64_t gl_uint64_t
+#  define GL_UINT64_T
+# endif
+#endif
+
+/* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
+#define _UINT8_T
+#define _UINT32_T
+#define _UINT64_T
+
+
+/* 7.18.1.2. Minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+   are the same as the corresponding N_t types.  */
+
+#undef int_least8_t
+#undef uint_least8_t
+#undef int_least16_t
+#undef uint_least16_t
+#undef int_least32_t
+#undef uint_least32_t
+#undef int_least64_t
+#undef uint_least64_t
+#define int_least8_t int8_t
+#define uint_least8_t uint8_t
+#define int_least16_t int16_t
+#define uint_least16_t uint16_t
+#define int_least32_t int32_t
+#define uint_least32_t uint32_t
+#ifdef GL_INT64_T
+# define int_least64_t int64_t
+#endif
+#ifdef GL_UINT64_T
+# define uint_least64_t uint64_t
+#endif
+
+/* 7.18.1.3. Fastest minimum-width integer types */
+
+/* Note: Other <stdint.h> substitutes may define these types differently.
+   It is not recommended to use these types in public header files. */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+   are taken from the same list of types.  Assume that 'long int'
+   is fast enough for all narrower integers.  */
+
+#undef int_fast8_t
+#undef uint_fast8_t
+#undef int_fast16_t
+#undef uint_fast16_t
+#undef int_fast32_t
+#undef uint_fast32_t
+#undef int_fast64_t
+#undef uint_fast64_t
+typedef long int gl_int_fast8_t;
+typedef unsigned long int gl_uint_fast8_t;
+typedef long int gl_int_fast16_t;
+typedef unsigned long int gl_uint_fast16_t;
+typedef long int gl_int_fast32_t;
+typedef unsigned long int gl_uint_fast32_t;
+#define int_fast8_t gl_int_fast8_t
+#define uint_fast8_t gl_uint_fast8_t
+#define int_fast16_t gl_int_fast16_t
+#define uint_fast16_t gl_uint_fast16_t
+#define int_fast32_t gl_int_fast32_t
+#define uint_fast32_t gl_uint_fast32_t
+#ifdef GL_INT64_T
+# define int_fast64_t int64_t
+#endif
+#ifdef GL_UINT64_T
+# define uint_fast64_t uint64_t
+#endif
+
+/* 7.18.1.4. Integer types capable of holding object pointers */
+
+#undef intptr_t
+#undef uintptr_t
+typedef long int gl_intptr_t;
+typedef unsigned long int gl_uintptr_t;
+#define intptr_t gl_intptr_t
+#define uintptr_t gl_uintptr_t
+
+/* 7.18.1.5. Greatest-width integer types */
+
+/* Note: These types are compiler dependent. It may be unwise to use them in
+   public header files. */
+
+#undef intmax_t
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+typedef long long int gl_intmax_t;
+# define intmax_t gl_intmax_t
+#elif defined GL_INT64_T
+# define intmax_t int64_t
+#else
+typedef long int gl_intmax_t;
+# define intmax_t gl_intmax_t
+#endif
+
+#undef uintmax_t
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+typedef unsigned long long int gl_uintmax_t;
+# define uintmax_t gl_uintmax_t
+#elif defined GL_UINT64_T
+# define uintmax_t uint64_t
+#else
+typedef unsigned long int gl_uintmax_t;
+# define uintmax_t gl_uintmax_t
+#endif
+
+/* Verify that intmax_t and uintmax_t have the same size.  Too much code
+   breaks if this is not the case.  If this check fails, the reason is likely
+   to be found in the autoconf macros.  */
+typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
+                                ? 1 : -1];
+
+/* 7.18.2. Limits of specified-width integer types */
+
+#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
+
+/* 7.18.2.1. Limits of exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits.  */
+
+#undef INT8_MIN
+#undef INT8_MAX
+#undef UINT8_MAX
+#define INT8_MIN  (~ INT8_MAX)
+#define INT8_MAX  127
+#define UINT8_MAX  255
+
+#undef INT16_MIN
+#undef INT16_MAX
+#undef UINT16_MAX
+#define INT16_MIN  (~ INT16_MAX)
+#define INT16_MAX  32767
+#define UINT16_MAX  65535
+
+#undef INT32_MIN
+#undef INT32_MAX
+#undef UINT32_MAX
+#define INT32_MIN  (~ INT32_MAX)
+#define INT32_MAX  2147483647
+#define UINT32_MAX  4294967295U
+
+#if defined GL_INT64_T && ! defined INT64_MAX
+/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
+   evaluates the latter incorrectly in preprocessor expressions.  */
+# define INT64_MIN  (- INTMAX_C (1) << 63)
+# define INT64_MAX  INTMAX_C (9223372036854775807)
+#endif
+
+#if defined GL_UINT64_T && ! defined UINT64_MAX
+# define UINT64_MAX  UINTMAX_C (18446744073709551615)
+#endif
+
+/* 7.18.2.2. Limits of minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+   are the same as the corresponding N_t types.  */
+
+#undef INT_LEAST8_MIN
+#undef INT_LEAST8_MAX
+#undef UINT_LEAST8_MAX
+#define INT_LEAST8_MIN  INT8_MIN
+#define INT_LEAST8_MAX  INT8_MAX
+#define UINT_LEAST8_MAX  UINT8_MAX
+
+#undef INT_LEAST16_MIN
+#undef INT_LEAST16_MAX
+#undef UINT_LEAST16_MAX
+#define INT_LEAST16_MIN  INT16_MIN
+#define INT_LEAST16_MAX  INT16_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+
+#undef INT_LEAST32_MIN
+#undef INT_LEAST32_MAX
+#undef UINT_LEAST32_MAX
+#define INT_LEAST32_MIN  INT32_MIN
+#define INT_LEAST32_MAX  INT32_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+
+#undef INT_LEAST64_MIN
+#undef INT_LEAST64_MAX
+#ifdef GL_INT64_T
+# define INT_LEAST64_MIN  INT64_MIN
+# define INT_LEAST64_MAX  INT64_MAX
+#endif
+
+#undef UINT_LEAST64_MAX
+#ifdef GL_UINT64_T
+# define UINT_LEAST64_MAX  UINT64_MAX
+#endif
+
+/* 7.18.2.3. Limits of fastest minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+   are taken from the same list of types.  */
+
+#undef INT_FAST8_MIN
+#undef INT_FAST8_MAX
+#undef UINT_FAST8_MAX
+#define INT_FAST8_MIN  LONG_MIN
+#define INT_FAST8_MAX  LONG_MAX
+#define UINT_FAST8_MAX  ULONG_MAX
+
+#undef INT_FAST16_MIN
+#undef INT_FAST16_MAX
+#undef UINT_FAST16_MAX
+#define INT_FAST16_MIN  LONG_MIN
+#define INT_FAST16_MAX  LONG_MAX
+#define UINT_FAST16_MAX  ULONG_MAX
+
+#undef INT_FAST32_MIN
+#undef INT_FAST32_MAX
+#undef UINT_FAST32_MAX
+#define INT_FAST32_MIN  LONG_MIN
+#define INT_FAST32_MAX  LONG_MAX
+#define UINT_FAST32_MAX  ULONG_MAX
+
+#undef INT_FAST64_MIN
+#undef INT_FAST64_MAX
+#ifdef GL_INT64_T
+# define INT_FAST64_MIN  INT64_MIN
+# define INT_FAST64_MAX  INT64_MAX
+#endif
+
+#undef UINT_FAST64_MAX
+#ifdef GL_UINT64_T
+# define UINT_FAST64_MAX  UINT64_MAX
+#endif
+
+/* 7.18.2.4. Limits of integer types capable of holding object pointers */
+
+#undef INTPTR_MIN
+#undef INTPTR_MAX
+#undef UINTPTR_MAX
+#define INTPTR_MIN  LONG_MIN
+#define INTPTR_MAX  LONG_MAX
+#define UINTPTR_MAX  ULONG_MAX
+
+/* 7.18.2.5. Limits of greatest-width integer types */
+
+#undef INTMAX_MIN
+#undef INTMAX_MAX
+#ifdef INT64_MAX
+# define INTMAX_MIN  INT64_MIN
+# define INTMAX_MAX  INT64_MAX
+#else
+# define INTMAX_MIN  INT32_MIN
+# define INTMAX_MAX  INT32_MAX
+#endif
+
+#undef UINTMAX_MAX
+#ifdef UINT64_MAX
+# define UINTMAX_MAX  UINT64_MAX
+#else
+# define UINTMAX_MAX  UINT32_MAX
+#endif
+
+/* 7.18.3. Limits of other integer types */
+
+/* ptrdiff_t limits */
+#undef PTRDIFF_MIN
+#undef PTRDIFF_MAX
+#if @APPLE_UNIVERSAL_BUILD@
+# ifdef _LP64
+#  define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
+#  define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
+# else
+#  define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
+#  define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
+# endif
+#else
+# define PTRDIFF_MIN  \
+    _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+# define PTRDIFF_MAX  \
+    _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+#endif
+
+/* sig_atomic_t limits */
+#undef SIG_ATOMIC_MIN
+#undef SIG_ATOMIC_MAX
+#define SIG_ATOMIC_MIN  \
+   _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+                0@SIG_ATOMIC_T_SUFFIX@)
+#define SIG_ATOMIC_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+                0@SIG_ATOMIC_T_SUFFIX@)
+
+
+/* size_t limit */
+#undef SIZE_MAX
+#if @APPLE_UNIVERSAL_BUILD@
+# ifdef _LP64
+#  define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+# else
+#  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
+# endif
+#else
+# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
+#endif
+
+/* wchar_t limits */
+/* Get WCHAR_MIN, WCHAR_MAX.
+   This include is not on the top, above, because on OSF/1 4.0 we have a
+   sequence of nested includes
+   <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+   <stdint.h> and assumes its types are already defined.  */
+#if ! (defined WCHAR_MIN && defined WCHAR_MAX)
+# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+# include <wchar.h>
+# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+#endif
+#undef WCHAR_MIN
+#undef WCHAR_MAX
+#define WCHAR_MIN  \
+   _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+#define WCHAR_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+
+/* wint_t limits */
+#undef WINT_MIN
+#undef WINT_MAX
+#define WINT_MIN  \
+   _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+#define WINT_MAX  \
+   _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+
+#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
+
+/* 7.18.4. Macros for integer constants */
+
+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+
+/* 7.18.4.1. Macros for minimum-width integer constants */
+/* According to ISO C 99 Technical Corrigendum 1 */
+
+/* Here we assume a standard architecture where the hardware integer
+   types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
+
+#undef INT8_C
+#undef UINT8_C
+#define INT8_C(x) x
+#define UINT8_C(x) x
+
+#undef INT16_C
+#undef UINT16_C
+#define INT16_C(x) x
+#define UINT16_C(x) x
+
+#undef INT32_C
+#undef UINT32_C
+#define INT32_C(x) x
+#define UINT32_C(x) x ## U
+
+#undef INT64_C
+#undef UINT64_C
+#if LONG_MAX >> 31 >> 31 == 1
+# define INT64_C(x) x##L
+#elif defined _MSC_VER
+# define INT64_C(x) x##i64
+#elif @HAVE_LONG_LONG_INT@
+# define INT64_C(x) x##LL
+#endif
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# define UINT64_C(x) x##UL
+#elif defined _MSC_VER
+# define UINT64_C(x) x##ui64
+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+# define UINT64_C(x) x##ULL
+#endif
+
+/* 7.18.4.2. Macros for greatest-width integer constants */
+
+#undef INTMAX_C
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# define INTMAX_C(x)   x##LL
+#elif defined GL_INT64_T
+# define INTMAX_C(x)   INT64_C(x)
+#else
+# define INTMAX_C(x)   x##L
+#endif
+
+#undef UINTMAX_C
+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# define UINTMAX_C(x)  x##ULL
+#elif defined GL_UINT64_T
+# define UINTMAX_C(x)  UINT64_C(x)
+#else
+# define UINTMAX_C(x)  x##UL
+#endif
+
+#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
+
+#endif /* _GL_STDINT_H */
+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/streq.h groff-1.21/src/libs/gnulib/lib/streq.h
--- groff-1.20.1/src/libs/gnulib/lib/streq.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/streq.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,176 @@
+/* Optimized string comparison.
+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#ifndef _GL_STREQ_H
+#define _GL_STREQ_H
+
+#include <string.h>
+
+/* STREQ allows to optimize string comparison with a small literal string.
+     STREQ (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+   is semantically equivalent to
+     strcmp (s, "EUC-KR") == 0
+   just faster.  */
+
+/* Help GCC to generate good code for string comparisons with
+   immediate strings. */
+#if defined (__GNUC__) && defined (__OPTIMIZE__)
+
+static inline int
+streq9 (const char *s1, const char *s2)
+{
+  return strcmp (s1 + 9, s2 + 9) == 0;
+}
+
+static inline int
+streq8 (const char *s1, const char *s2, char s28)
+{
+  if (s1[8] == s28)
+    {
+      if (s28 == 0)
+        return 1;
+      else
+        return streq9 (s1, s2);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq7 (const char *s1, const char *s2, char s27, char s28)
+{
+  if (s1[7] == s27)
+    {
+      if (s27 == 0)
+        return 1;
+      else
+        return streq8 (s1, s2, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq6 (const char *s1, const char *s2, char s26, char s27, char s28)
+{
+  if (s1[6] == s26)
+    {
+      if (s26 == 0)
+        return 1;
+      else
+        return streq7 (s1, s2, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq5 (const char *s1, const char *s2, char s25, char s26, char s27, char s28)
+{
+  if (s1[5] == s25)
+    {
+      if (s25 == 0)
+        return 1;
+      else
+        return streq6 (s1, s2, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq4 (const char *s1, const char *s2, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[4] == s24)
+    {
+      if (s24 == 0)
+        return 1;
+      else
+        return streq5 (s1, s2, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq3 (const char *s1, const char *s2, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[3] == s23)
+    {
+      if (s23 == 0)
+        return 1;
+      else
+        return streq4 (s1, s2, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq2 (const char *s1, const char *s2, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[2] == s22)
+    {
+      if (s22 == 0)
+        return 1;
+      else
+        return streq3 (s1, s2, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq1 (const char *s1, const char *s2, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[1] == s21)
+    {
+      if (s21 == 0)
+        return 1;
+      else
+        return streq2 (s1, s2, s22, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+static inline int
+streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
+{
+  if (s1[0] == s20)
+    {
+      if (s20 == 0)
+        return 1;
+      else
+        return streq1 (s1, s2, s21, s22, s23, s24, s25, s26, s27, s28);
+    }
+  else
+    return 0;
+}
+
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+  streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
+
+#else
+
+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
+  (strcmp (s1, s2) == 0)
+
+#endif
+
+#endif /* _GL_STREQ_H */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/unitypes.in.h groff-1.21/src/libs/gnulib/lib/unitypes.in.h
--- groff-1.20.1/src/libs/gnulib/lib/unitypes.in.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/unitypes.in.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,26 @@
+/* Elementary types for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _UNITYPES_H
+#define _UNITYPES_H
+
+/* Get uint8_t, uint16_t, uint32_t.  */
+#include <stdint.h>
+
+/* Type representing a Unicode character.  */
+typedef uint32_t ucs4_t;
+
+#endif /* _UNITYPES_H */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/uniwidth/cjk.h groff-1.21/src/libs/gnulib/lib/uniwidth/cjk.h
--- groff-1.20.1/src/libs/gnulib/lib/uniwidth/cjk.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/uniwidth/cjk.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,37 @@
+/* Test for CJK encoding.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "streq.h"
+
+static int
+is_cjk_encoding (const char *encoding)
+{
+  if (0
+      /* Legacy Japanese encodings */
+      || STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
+      /* Legacy Chinese encodings */
+      || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+      || STREQ (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
+      || STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
+      || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
+      /* Legacy Korean encodings */
+      || STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+      || STREQ (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
+      || STREQ (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
+    return 1;
+  return 0;
+}
diff -ruN groff-1.20.1/src/libs/gnulib/lib/uniwidth/width.c groff-1.21/src/libs/gnulib/lib/uniwidth/width.c
--- groff-1.20.1/src/libs/gnulib/lib/uniwidth/width.c	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/uniwidth/width.c	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,359 @@
+/* Determine display width of Unicode character.
+   Copyright (C) 2001-2002, 2006-2010 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "uniwidth.h"
+
+#include "cjk.h"
+
+/*
+ * Non-spacing attribute table.
+ * Consists of:
+ * - Non-spacing characters; generated from PropList.txt or
+ *   "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt"
+ * - Format control characters; generated from
+ *   "grep '^[^;]*;[^;]*;Cf;' UnicodeData.txt"
+ * - Zero width characters; generated from
+ *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
+ */
+static const unsigned char nonspacing_table_data[26*64] = {
+  /* 0x0000-0x01ff */
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x20, 0x00, 0x00, /* 0x0080-0x00bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x013f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0140-0x017f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x01bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01c0-0x01ff */
+  /* 0x0200-0x03ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0200-0x023f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0240-0x027f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0280-0x02bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c0-0x02ff */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x0300-0x033f */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x0340-0x037f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0380-0x03bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x03c0-0x03ff */
+  /* 0x0400-0x05ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0400-0x043f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0440-0x047f */
+  0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04c0-0x04ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0500-0x053f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0540-0x057f */
+  0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */
+  0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
+  /* 0x0600-0x07ff */
+  0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
+  0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
+  0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
+  0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
+  0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */
+  /* 0x0800-0x09ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */
+  0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */
+  /* 0x0a00-0x0bff */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */
+  0x86, 0x39, 0x02, 0x00, 0x00, 0x00, 0x23, 0x00, /* 0x0a40-0x0a7f */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */
+  0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0ac0-0x0aff */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */
+  0x1e, 0x20, 0x40, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */
+  0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */
+  /* 0x0c00-0x0dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */
+  0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */
+  0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */
+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */
+  0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */
+  /* 0x0e00-0x0fff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x07, /* 0x0e00-0x0e3f */
+  0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0e40-0x0e7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x1b, /* 0x0e80-0x0ebf */
+  0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
+  0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
+  0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
+  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
+  /* 0x1000-0x11ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */
+  0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */
+  0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1180-0x11bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c0-0x11ff */
+  /* 0x1200-0x13ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1200-0x123f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1240-0x127f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
+  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
+  /* 0x1600-0x17ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1600-0x163f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1640-0x167f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1680-0x16bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16c0-0x16ff */
+  0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, /* 0x1700-0x173f */
+  0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, /* 0x1740-0x177f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x3f, /* 0x1780-0x17bf */
+  0x40, 0xfe, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x17c0-0x17ff */
+  /* 0x1800-0x19ff */
+  0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */
+  0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
+  /* 0x1a00-0x1bff */
+  0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
+  0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
+  0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */
+  /* 0x1c00-0x1dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
+  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */
+  /* 0x2000-0x21ff */
+  0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
+  0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */
+  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, /* 0x20c0-0x20ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2140-0x217f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2180-0x21bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x21c0-0x21ff */
+  /* 0x2c00-0x2dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */
+  /* 0x3000-0x31ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, /* 0x3000-0x303f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */
+  0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, /* 0x3080-0x30bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30c0-0x30ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3100-0x313f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3140-0x317f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3180-0x31bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */
+  /* 0xa600-0xa7ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa7c0-0xa7ff */
+  /* 0xa800-0xa9ff */
+  0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
+  0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
+  /* 0xaa00-0xabff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */
+  0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */
+  /* 0xfa00-0xfbff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa80-0xfabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfac0-0xfaff */
+  0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0xfb00-0xfb3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb40-0xfb7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */
+  /* 0xfe00-0xffff */
+  0xff, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff00-0xff3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff40-0xff7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff80-0xffbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, /* 0xffc0-0xffff */
+  /* 0x10000-0x101ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10000-0x1003f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10040-0x1007f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10080-0x100bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x100c0-0x100ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10100-0x1013f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10140-0x1017f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10180-0x101bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, /* 0x101c0-0x101ff */
+  /* 0x10a00-0x10bff */
+  0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a80-0x10abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b00-0x10b3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
+  /* 0x1d000-0x1d1ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */
+  0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
+  /* 0x1d200-0x1d3ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d200-0x1d23f */
+  0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d240-0x1d27f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d280-0x1d2bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d2c0-0x1d2ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d300-0x1d33f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d340-0x1d37f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d380-0x1d3bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* 0x1d3c0-0x1d3ff */
+};
+static const signed char nonspacing_table_ind[240] = {
+   0,  1,  2,  3,  4,  5,  6,  7, /* 0x0000-0x0fff */
+   8,  9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */
+  14, -1, -1, -1, -1, -1, 15, -1, /* 0x2000-0x2fff */
+  16, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x4000-0x4fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x5000-0x5fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x6000-0x6fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x7000-0x7fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x8000-0x8fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x9000-0x9fff */
+  -1, -1, -1, 17, 18, 19, -1, -1, /* 0xa000-0xafff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb000-0xbfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc000-0xcfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd000-0xdfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
+  -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
+  22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x16000-0x16fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
+  24, 25, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
+};
+
+/* Determine number of column positions required for UC.  */
+int
+uc_width (ucs4_t uc, const char *encoding)
+{
+  /* Test for non-spacing or control character.  */
+  if ((uc >> 9) < 240)
+    {
+      int ind = nonspacing_table_ind[uc >> 9];
+      if (ind >= 0)
+        if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1)
+          {
+            if (uc > 0 && uc < 0xa0)
+              return -1;
+            else
+              return 0;
+          }
+    }
+  else if ((uc >> 9) == (0xe0000 >> 9))
+    {
+      if (uc >= 0xe0100)
+        {
+          if (uc <= 0xe01ef)
+            return 0;
+        }
+      else
+        {
+          if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001)
+            return 0;
+        }
+    }
+  /* Test for double-width character.
+   * Generated from "grep '^[^;]\{4,5\};[WF]' EastAsianWidth.txt"
+   * and            "grep '^[^;]\{4,5\};[^WF]' EastAsianWidth.txt"
+   */
+  if (uc >= 0x1100
+      && ((uc < 0x1160) /* Hangul Jamo */
+          || (uc >= 0x2329 && uc < 0x232b) /* Angle Brackets */
+          || (uc >= 0x2e80 && uc < 0xa4d0  /* CJK ... Yi */
+              && !(uc == 0x303f) && !(uc >= 0x4dc0 && uc < 0x4e00))
+          || (uc >= 0xac00 && uc < 0xd7a4) /* Hangul Syllables */
+          || (uc >= 0xf900 && uc < 0xfb00) /* CJK Compatibility Ideographs */
+          || (uc >= 0xfe10 && uc < 0xfe20) /* Presentation Forms for Vertical */
+          || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
+          || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
+          || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
+          || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
+          || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
+     )   )
+    return 2;
+  /* In ancient CJK encodings, Cyrillic and most other characters are
+     double-width as well.  */
+  if (uc >= 0x00A1 && uc < 0xFF61 && uc != 0x20A9
+      && is_cjk_encoding (encoding))
+    return 2;
+  return 1;
+}
diff -ruN groff-1.20.1/src/libs/gnulib/lib/uniwidth.in.h groff-1.21/src/libs/gnulib/lib/uniwidth.in.h
--- groff-1.20.1/src/libs/gnulib/lib/uniwidth.in.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/uniwidth.in.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,65 @@
+/* Display width functions.
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _UNIWIDTH_H
+#define _UNIWIDTH_H
+
+#include "unitypes.h"
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get locale_charset() declaration.  */
+#include "localcharset.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Display width.  */
+
+/* These functions are locale dependent.  The encoding argument identifies
+   the encoding (e.g. "ISO-8859-2" for Polish).  */
+
+/* Determine number of column positions required for UC.  */
+extern int
+       uc_width (ucs4_t uc, const char *encoding);
+
+/* Determine number of column positions required for first N units
+   (or fewer if S ends before this) in S.  */
+extern int
+       u8_width (const uint8_t *s, size_t n, const char *encoding);
+extern int
+       u16_width (const uint16_t *s, size_t n, const char *encoding);
+extern int
+       u32_width (const uint32_t *s, size_t n, const char *encoding);
+
+/* Determine number of column positions required for S.  */
+extern int
+       u8_strwidth (const uint8_t *s, const char *encoding);
+extern int
+       u16_strwidth (const uint16_t *s, const char *encoding);
+extern int
+       u32_strwidth (const uint32_t *s, const char *encoding);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNIWIDTH_H */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/wchar.in.h groff-1.21/src/libs/gnulib/lib/wchar.in.h
--- groff-1.20.1/src/libs/gnulib/lib/wchar.in.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/wchar.in.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,433 @@
+/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Eric Blake.  */
+
+/*
+ * ISO C 99 <wchar.h> for platforms that have issues.
+ * <http://www.opengroup.org/susv3xbd/wchar.h.html>
+ *
+ * For now, this just ensures proper prerequisite inclusion order and
+ * the declaration of wcwidth().
+ */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
+/* Special invocation convention:
+   - Inside glibc and uClibc header files.
+   - On HP-UX 11.00 we have a sequence of nested includes
+     <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>,
+     once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h>
+     and once directly.  In both situations 'wint_t' is not yet defined,
+     therefore we cannot provide the function overrides; instead include only
+     the system's <wchar.h>.
+   - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and
+     the latter includes <wchar.h>.  But here, we have no way to detect whether
+     <wctype.h> is completely included or is still being included.  */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _GL_WCHAR_H
+
+#define _GL_ALREADY_INCLUDING_WCHAR_H
+
+#if @HAVE_FEATURES_H@
+# include <features.h> /* for __GLIBC__ */
+#endif
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.
+   But avoid namespace pollution on glibc systems.  */
+#ifndef __GLIBC__
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+
+/* Include the original <wchar.h> if it exists.
+   Some builds of uClibc lack it.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCHAR_H@
+# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
+#endif
+
+#undef _GL_ALREADY_INCLUDING_WCHAR_H
+
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
+/* Define wint_t and WEOF.  (Also done in wctype.in.h.)  */
+#if !@HAVE_WINT_T@ && !defined wint_t
+# define wint_t int
+# ifndef WEOF
+#  define WEOF -1
+# endif
+#else
+# ifndef WEOF
+#  define WEOF ((wint_t) -1)
+# endif
+#endif
+
+
+/* Override mbstate_t if it is too small.
+   On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
+   implementing mbrtowc for encodings like UTF-8.  */
+#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
+typedef int rpl_mbstate_t;
+# undef mbstate_t
+# define mbstate_t rpl_mbstate_t
+# define GNULIB_defined_mbstate_t 1
+#endif
+
+
+/* Convert a single-byte character to a wide character.  */
+#if @GNULIB_BTOWC@
+# if @REPLACE_BTOWC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef btowc
+#   define btowc rpl_btowc
+#  endif
+_GL_FUNCDECL_RPL (btowc, wint_t, (int c));
+_GL_CXXALIAS_RPL (btowc, wint_t, (int c));
+# else
+#  if !@HAVE_BTOWC@
+_GL_FUNCDECL_SYS (btowc, wint_t, (int c));
+#  endif
+_GL_CXXALIAS_SYS (btowc, wint_t, (int c));
+# endif
+_GL_CXXALIASWARN (btowc);
+#elif defined GNULIB_POSIXCHECK
+# undef btowc
+# if HAVE_RAW_DECL_BTOWC
+_GL_WARN_ON_USE (btowc, "btowc is unportable - "
+                 "use gnulib module btowc for portability");
+# endif
+#endif
+
+
+/* Convert a wide character to a single-byte character.  */
+#if @GNULIB_WCTOB@
+# if @REPLACE_WCTOB@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wctob
+#   define wctob rpl_wctob
+#  endif
+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc));
+_GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
+# else
+#  if !defined wctob && !@HAVE_DECL_WCTOB@
+/* wctob is provided by gnulib, or wctob exists but is not declared.  */
+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc));
+#  endif
+_GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
+# endif
+_GL_CXXALIASWARN (wctob);
+#elif defined GNULIB_POSIXCHECK
+# undef wctob
+# if HAVE_RAW_DECL_WCTOB
+_GL_WARN_ON_USE (wctob, "wctob is unportable - "
+                 "use gnulib module wctob for portability");
+# endif
+#endif
+
+
+/* Test whether *PS is in the initial state.  */
+#if @GNULIB_MBSINIT@
+# if @REPLACE_MBSINIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbsinit
+#   define mbsinit rpl_mbsinit
+#  endif
+_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps));
+_GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps));
+# else
+#  if !@HAVE_MBSINIT@
+_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbsinit);
+#elif defined GNULIB_POSIXCHECK
+# undef mbsinit
+# if HAVE_RAW_DECL_MBSINIT
+_GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - "
+                 "use gnulib module mbsinit for portability");
+# endif
+#endif
+
+
+/* Convert a multibyte character to a wide character.  */
+#if @GNULIB_MBRTOWC@
+# if @REPLACE_MBRTOWC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrtowc
+#   define mbrtowc rpl_mbrtowc
+#  endif
+_GL_FUNCDECL_RPL (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+_GL_CXXALIAS_RPL (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !@HAVE_MBRTOWC@
+_GL_FUNCDECL_SYS (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (mbrtowc, size_t,
+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbrtowc);
+#elif defined GNULIB_POSIXCHECK
+# undef mbrtowc
+# if HAVE_RAW_DECL_MBRTOWC
+_GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
+                 "use gnulib module mbrtowc for portability");
+# endif
+#endif
+
+
+/* Recognize a multibyte character.  */
+#if @GNULIB_MBRLEN@
+# if @REPLACE_MBRLEN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrlen
+#   define mbrlen rpl_mbrlen
+#  endif
+_GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+_GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !@HAVE_MBRLEN@
+_GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbrlen);
+#elif defined GNULIB_POSIXCHECK
+# undef mbrlen
+# if HAVE_RAW_DECL_MBRLEN
+_GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - "
+                 "use gnulib module mbrlen for portability");
+# endif
+#endif
+
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSRTOWCS@
+# if @REPLACE_MBSRTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbsrtowcs
+#   define mbsrtowcs rpl_mbsrtowcs
+#  endif
+_GL_FUNCDECL_RPL (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_MBSRTOWCS@
+_GL_FUNCDECL_SYS (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (mbsrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbsrtowcs);
+#elif defined GNULIB_POSIXCHECK
+# undef mbsrtowcs
+# if HAVE_RAW_DECL_MBSRTOWCS
+_GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - "
+                 "use gnulib module mbsrtowcs for portability");
+# endif
+#endif
+
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSNRTOWCS@
+# if @REPLACE_MBSNRTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbsnrtowcs
+#   define mbsnrtowcs rpl_mbsnrtowcs
+#  endif
+_GL_FUNCDECL_RPL (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_MBSNRTOWCS@
+_GL_FUNCDECL_SYS (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (mbsnrtowcs, size_t,
+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (mbsnrtowcs);
+#elif defined GNULIB_POSIXCHECK
+# undef mbsnrtowcs
+# if HAVE_RAW_DECL_MBSNRTOWCS
+_GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
+                 "use gnulib module mbsnrtowcs for portability");
+# endif
+#endif
+
+
+/* Convert a wide character to a multibyte character.  */
+#if @GNULIB_WCRTOMB@
+# if @REPLACE_WCRTOMB@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcrtomb
+#   define wcrtomb rpl_wcrtomb
+#  endif
+_GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+_GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+# else
+#  if !@HAVE_WCRTOMB@
+_GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+#  endif
+_GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (wcrtomb);
+#elif defined GNULIB_POSIXCHECK
+# undef wcrtomb
+# if HAVE_RAW_DECL_WCRTOMB
+_GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - "
+                 "use gnulib module wcrtomb for portability");
+# endif
+#endif
+
+
+/* Convert a wide string to a string.  */
+#if @GNULIB_WCSRTOMBS@
+# if @REPLACE_WCSRTOMBS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsrtombs
+#   define wcsrtombs rpl_wcsrtombs
+#  endif
+_GL_FUNCDECL_RPL (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_WCSRTOMBS@
+_GL_FUNCDECL_SYS (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (wcsrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (wcsrtombs);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsrtombs
+# if HAVE_RAW_DECL_WCSRTOMBS
+_GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - "
+                 "use gnulib module wcsrtombs for portability");
+# endif
+#endif
+
+
+/* Convert a wide string to a string.  */
+#if @GNULIB_WCSNRTOMBS@
+# if @REPLACE_WCSNRTOMBS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsnrtombs
+#   define wcsnrtombs rpl_wcsnrtombs
+#  endif
+_GL_FUNCDECL_RPL (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# else
+#  if !@HAVE_WCSNRTOMBS@
+_GL_FUNCDECL_SYS (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps)
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (wcsnrtombs, size_t,
+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+# endif
+_GL_CXXALIASWARN (wcsnrtombs);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsnrtombs
+# if HAVE_RAW_DECL_WCSNRTOMBS
+_GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
+                 "use gnulib module wcsnrtombs for portability");
+# endif
+#endif
+
+
+/* Return the number of screen columns needed for WC.  */
+#if @GNULIB_WCWIDTH@
+# if @REPLACE_WCWIDTH@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcwidth
+#   define wcwidth rpl_wcwidth
+#  endif
+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
+_GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
+# else
+#  if !@HAVE_DECL_WCWIDTH@
+/* wcwidth exists but is not declared.  */
+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
+#  endif
+_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
+# endif
+_GL_CXXALIASWARN (wcwidth);
+#elif defined GNULIB_POSIXCHECK
+# undef wcwidth
+# if HAVE_RAW_DECL_WCWIDTH
+_GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - "
+                 "use gnulib module wcwidth for portability");
+# endif
+#endif
+
+
+#endif /* _GL_WCHAR_H */
+#endif /* _GL_WCHAR_H */
+#endif
diff -ruN groff-1.20.1/src/libs/gnulib/lib/wctype.in.h groff-1.21/src/libs/gnulib/lib/wctype.in.h
--- groff-1.20.1/src/libs/gnulib/lib/wctype.in.h	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/wctype.in.h	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,393 @@
+/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
+
+   Copyright (C) 2006-2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Bruno Haible and Paul Eggert.  */
+
+/*
+ * ISO C 99 <wctype.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/wctype.h.html>
+ *
+ * iswctype, towctrans, towlower, towupper, wctrans, wctype,
+ * wctrans_t, and wctype_t are not yet implemented.
+ */
+
+#ifndef _GL_WCTYPE_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if @HAVE_WINT_T@
+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
+   Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+# include <wchar.h>
+#endif
+
+/* Include the original <wctype.h> if it exists.
+   BeOS 5 has the functions but no <wctype.h>.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCTYPE_H@
+# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+#endif
+
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
+#if !@HAVE_WINT_T@ && !defined wint_t
+# define wint_t int
+# ifndef WEOF
+#  define WEOF -1
+# endif
+#else
+# ifndef WEOF
+#  define WEOF ((wint_t) -1)
+# endif
+#endif
+
+
+/* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
+   Linux libc5 has <wctype.h> and the functions but they are broken.
+   Assume all 11 functions (all isw* except iswblank) are implemented the
+   same way, or not at all.  */
+#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
+
+/* IRIX 5.3 has macros but no functions, its isw* macros refer to an
+   undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
+   refer to system functions like _iswctype that are not in the
+   standard C library.  Rather than try to get ancient buggy
+   implementations like this to work, just disable them.  */
+# undef iswalnum
+# undef iswalpha
+# undef iswblank
+# undef iswcntrl
+# undef iswdigit
+# undef iswgraph
+# undef iswlower
+# undef iswprint
+# undef iswpunct
+# undef iswspace
+# undef iswupper
+# undef iswxdigit
+# undef towlower
+# undef towupper
+
+/* Linux libc5 has <wctype.h> and the functions but they are broken.  */
+# if @REPLACE_ISWCNTRL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define iswalnum rpl_iswalnum
+#   define iswalpha rpl_iswalpha
+#   define iswblank rpl_iswblank
+#   define iswcntrl rpl_iswcntrl
+#   define iswdigit rpl_iswdigit
+#   define iswgraph rpl_iswgraph
+#   define iswlower rpl_iswlower
+#   define iswprint rpl_iswprint
+#   define iswpunct rpl_iswpunct
+#   define iswspace rpl_iswspace
+#   define iswupper rpl_iswupper
+#   define iswxdigit rpl_iswxdigit
+#   define towlower rpl_towlower
+#   define towupper rpl_towupper
+#  endif
+# endif
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswalnum
+# else
+iswalnum
+# endif
+         (wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswalpha
+# else
+iswalpha
+# endif
+         (wint_t wc)
+{
+  return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswblank
+# else
+iswblank
+# endif
+         (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswcntrl
+# else
+iswcntrl
+# endif
+        (wint_t wc)
+{
+  return (wc & ~0x1f) == 0 || wc == 0x7f;
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswdigit
+# else
+iswdigit
+# endif
+         (wint_t wc)
+{
+  return wc >= '0' && wc <= '9';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswgraph
+# else
+iswgraph
+# endif
+         (wint_t wc)
+{
+  return wc >= '!' && wc <= '~';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswlower
+# else
+iswlower
+# endif
+         (wint_t wc)
+{
+  return wc >= 'a' && wc <= 'z';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswprint
+# else
+iswprint
+# endif
+         (wint_t wc)
+{
+  return wc >= ' ' && wc <= '~';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswpunct
+# else
+iswpunct
+# endif
+         (wint_t wc)
+{
+  return (wc >= '!' && wc <= '~'
+          && !((wc >= '0' && wc <= '9')
+               || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswspace
+# else
+iswspace
+# endif
+         (wint_t wc)
+{
+  return (wc == ' ' || wc == '\t'
+          || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswupper
+# else
+iswupper
+# endif
+         (wint_t wc)
+{
+  return wc >= 'A' && wc <= 'Z';
+}
+
+static inline int
+# if @REPLACE_ISWCNTRL@
+rpl_iswxdigit
+# else
+iswxdigit
+# endif
+          (wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
+}
+
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
+rpl_towlower
+# else
+towlower
+# endif
+         (wint_t wc)
+{
+  return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
+}
+
+static inline wint_t
+# if @REPLACE_ISWCNTRL@
+rpl_towupper
+# else
+towupper
+# endif
+         (wint_t wc)
+{
+  return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
+}
+
+#elif ! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@
+/* Only the iswblank function is missing.  */
+
+# if @REPLACE_ISWBLANK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define iswblank rpl_iswblank
+#  endif
+# endif
+
+static inline int
+# if @REPLACE_ISWBLANK@
+rpl_iswblank
+# else
+iswblank
+# endif
+         (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
+
+#endif
+
+#if defined __MINGW32__
+
+/* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t.
+   The functions towlower and towupper are implemented in the MSVCRT library
+   to take a wchar_t argument and return a wchar_t result.  mingw declares
+   these functions to take a wint_t argument and return a wint_t result.
+   This means that:
+   1. When the user passes an argument outside the range 0x0000..0xFFFF, the
+      function will look only at the lower 16 bits.  This is allowed according
+      to POSIX.
+   2. The return value is returned in the lower 16 bits of the result register.
+      The upper 16 bits are random: whatever happened to be in that part of the
+      result register.  We need to fix this by adding a zero-extend from
+      wchar_t to wint_t after the call.  */
+
+static inline wint_t
+rpl_towlower (wint_t wc)
+{
+  return (wint_t) (wchar_t) towlower (wc);
+}
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towlower rpl_towlower
+# endif
+
+static inline wint_t
+rpl_towupper (wint_t wc)
+{
+  return (wint_t) (wchar_t) towupper (wc);
+}
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  define towupper rpl_towupper
+# endif
+
+#endif /* __MINGW32__ */
+
+#if @REPLACE_ISWCNTRL@
+_GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc));
+_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc));
+#else
+_GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc));
+# if @REPLACE_ISWBLANK@
+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
+# else
+_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
+# endif
+_GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswlower, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswprint, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswspace, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswupper, int, (wint_t wc));
+_GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc));
+#endif
+_GL_CXXALIASWARN (iswalnum);
+_GL_CXXALIASWARN (iswalpha);
+_GL_CXXALIASWARN (iswblank);
+_GL_CXXALIASWARN (iswcntrl);
+_GL_CXXALIASWARN (iswdigit);
+_GL_CXXALIASWARN (iswgraph);
+_GL_CXXALIASWARN (iswlower);
+_GL_CXXALIASWARN (iswprint);
+_GL_CXXALIASWARN (iswpunct);
+_GL_CXXALIASWARN (iswspace);
+_GL_CXXALIASWARN (iswupper);
+_GL_CXXALIASWARN (iswxdigit);
+
+#if @REPLACE_ISWCNTRL@ || defined __MINGW32__
+_GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
+_GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));
+#else
+_GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc));
+_GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc));
+#endif
+_GL_CXXALIASWARN (towlower);
+_GL_CXXALIASWARN (towupper);
+
+
+#endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */
diff -ruN groff-1.20.1/src/libs/gnulib/lib/wcwidth.c groff-1.21/src/libs/gnulib/lib/wcwidth.c
--- groff-1.20.1/src/libs/gnulib/lib/wcwidth.c	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/lib/wcwidth.c	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,50 @@
+/* Determine the number of screen columns needed for a character.
+   Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+/* Get iswprint.  */
+#include <wctype.h>
+
+#include "localcharset.h"
+#include "streq.h"
+#include "uniwidth.h"
+
+int
+wcwidth (wchar_t wc)
+#undef wcwidth
+{
+  /* In UTF-8 locales, use a Unicode aware width function.  */
+  const char *encoding = locale_charset ();
+  if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
+    {
+      /* We assume that in a UTF-8 locale, a wide character is the same as a
+         Unicode character.  */
+      return uc_width (wc, encoding);
+    }
+  else
+    {
+      /* Otherwise, fall back to the system's wcwidth function.  */
+#if HAVE_WCWIDTH
+      return wcwidth (wc);
+#else
+      return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
+#endif
+    }
+}
diff -ruN groff-1.20.1/src/libs/gnulib/m4/00gnulib.m4 groff-1.21/src/libs/gnulib/m4/00gnulib.m4
--- groff-1.20.1/src/libs/gnulib/m4/00gnulib.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/00gnulib.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,30 @@
+# 00gnulib.m4 serial 2
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This file must be named something that sorts before all other
+dnl gnulib-provided .m4 files.  It is needed until such time as we can
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
+
+# AC_DEFUN_ONCE([NAME], VALUE)
+# ----------------------------
+# Define NAME to expand to VALUE on the first use (whether by direct
+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
+# definition is slower than the version in Autoconf 2.64, because it
+# can only use interfaces that existed since 2.59; but it achieves the
+# same effect.  Quoting is necessary to avoid confusing Automake.
+m4_version_prereq([2.63.263], [],
+[m4_define([AC][_DEFUN_ONCE],
+  [AC][_DEFUN([$1],
+    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
+      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
+
+# gl_00GNULIB
+# -----------
+# Witness macro that this file has been included.  Needed to force
+# Automake to include this file prior to all other gnulib .m4 files.
+AC_DEFUN([gl_00GNULIB])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/codeset.m4 groff-1.21/src/libs/gnulib/m4/codeset.m4
--- groff-1.20.1/src/libs/gnulib/m4/codeset.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/codeset.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,23 @@
+# codeset.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <langinfo.h>]],
+          [[char* cs = nl_langinfo(CODESET); return !cs;]])],
+       [am_cv_langinfo_codeset=yes],
+       [am_cv_langinfo_codeset=no])
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/extensions.m4 groff-1.21/src/libs/gnulib/m4/extensions.m4
--- groff-1.20.1/src/libs/gnulib/m4/extensions.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/extensions.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,118 @@
+# serial 9  -*- Autoconf -*-
+# Enable extensions on systems that normally disable them.
+
+# Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
+# enough in this area it's likely we'll need to redefine
+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
+
+# If autoconf reports a warning
+#     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
+# or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
+# the fix is
+#   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
+#      but always AC_REQUIREd,
+#   2) to ensure that for each occurrence of
+#        AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+#      or
+#        AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+#      the corresponding gnulib module description has 'extensions' among
+#      its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS
+#      invocation occurs in gl_EARLY, not in gl_INIT.
+
+# AC_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
+# AC_DEFINE.  The goal here is to define all known feature-enabling
+# macros, then, if reports of conflicts are made, disable macros that
+# cause problems on some platforms (such as __EXTENSIONS__).
+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
+  if test "$MINIX" = yes; then
+    AC_DEFINE([_POSIX_SOURCE], [1],
+      [Define to 1 if you need to in order for `stat' and other
+       things to work.])
+    AC_DEFINE([_POSIX_1_SOURCE], [2],
+      [Define to 2 if the system does not provide POSIX.1 features
+       except with this defined.])
+    AC_DEFINE([_MINIX], [1],
+      [Define to 1 if on MINIX.])
+  fi
+
+  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
+  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
+  dnl provided.
+  case "$host_os" in
+    hpux*)
+      AC_DEFINE([_XOPEN_SOURCE], [500],
+        [Define to 500 only on HP-UX.])
+      ;;
+  esac
+
+  AH_VERBATIM([__EXTENSIONS__],
+[/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+#         define __EXTENSIONS__ 1
+          ]AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_ALL_SOURCE])
+  AC_DEFINE([_GNU_SOURCE])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([_TANDEM_SOURCE])
+])# AC_USE_SYSTEM_EXTENSIONS
+
+# gl_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
+[
+  dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
+  dnl gnulib does not need it. But if it gets required by third-party macros
+  dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
+  dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
+  dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
+  dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
+  AC_REQUIRE([AC_GNU_SOURCE])
+
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/fcntl-o.m4 groff-1.21/src/libs/gnulib/m4/fcntl-o.m4
--- groff-1.20.1/src/libs/gnulib/m4/fcntl-o.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/fcntl-o.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,112 @@
+# fcntl-o.m4 serial 3
+dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
+# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
+# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
+AC_DEFUN([gl_FCNTL_O_FLAGS],
+[
+  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+  dnl AC_GNU_SOURCE.
+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+    [AC_REQUIRE([AC_GNU_SOURCE])])
+  AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <sys/types.h>
+           #include <sys/stat.h>
+           #include <unistd.h>
+           #include <fcntl.h>
+           #ifndef O_NOATIME
+            #define O_NOATIME 0
+           #endif
+           #ifndef O_NOFOLLOW
+            #define O_NOFOLLOW 0
+           #endif
+           static int const constants[] =
+            {
+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+            };
+          ]],
+          [[
+            int result = !constants;
+            {
+              static char const sym[] = "conftest.sym";
+              if (symlink (".", sym) != 0)
+                result |= 2;
+              else
+                {
+                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
+                  if (fd >= 0)
+                    {
+                      close (fd);
+                      result |= 4;
+                    }
+                }
+              unlink (sym);
+            }
+            {
+              static char const file[] = "confdefs.h";
+              int fd = open (file, O_RDONLY | O_NOATIME);
+              if (fd < 0)
+                result |= 8;
+              else
+                {
+                  struct stat st0;
+                  if (fstat (fd, &st0) != 0)
+                    result |= 16;
+                  else
+                    {
+                      char c;
+                      sleep (1);
+                      if (read (fd, &c, 1) != 1)
+                        result |= 24;
+                      else
+                        {
+                          if (close (fd) != 0)
+                            result |= 32;
+                          else
+                            {
+                              struct stat st1;
+                              if (stat (file, &st1) != 0)
+                                result |= 40;
+                              else
+                                if (st0.st_atime != st1.st_atime)
+                                  result |= 64;
+                            }
+                        }
+                    }
+                }
+            }
+            return result;]])],
+       [gl_cv_header_working_fcntl_h=yes],
+       [case $? in #(
+        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+         *) gl_cv_header_working_fcntl_h='no';;
+        esac],
+       [gl_cv_header_working_fcntl_h=cross-compiling])])
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
+    [Define to 1 if O_NOATIME works.])
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
+    [Define to 1 if O_NOFOLLOW works.])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/glibc21.m4 groff-1.21/src/libs/gnulib/m4/glibc21.m4
--- groff-1.20.1/src/libs/gnulib/m4/glibc21.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/glibc21.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,33 @@
+# glibc21.m4 serial 5
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.1 or newer, or uClibc.
+# From Bruno Haible.
+
+AC_DEFUN([gl_GLIBC21],
+  [
+    AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
+      [ac_cv_gnu_library_2_1],
+      [AC_EGREP_CPP([Lucky],
+        [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+        ],
+        [ac_cv_gnu_library_2_1=yes],
+        [ac_cv_gnu_library_2_1=no])
+      ]
+    )
+    AC_SUBST([GLIBC21])
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff -ruN groff-1.20.1/src/libs/gnulib/m4/gnulib-cache.m4 groff-1.21/src/libs/gnulib/m4/gnulib-cache.m4
--- groff-1.20.1/src/libs/gnulib/m4/gnulib-cache.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/gnulib-cache.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,34 @@
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects that use version control, this file is meant to be put under
+# version control, like the configure.ac and various Makefile.am files.
+
+
+# Specification in the form of a command-line invocation:
+#   gnulib-tool --import --dir=src/libs/gnulib --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl wcwidth
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([])
+gl_MODULES([
+  wcwidth
+])
+gl_AVOID([])
+gl_SOURCE_BASE([lib])
+gl_M4_BASE([m4])
+gl_PO_BASE([])
+gl_DOC_BASE([doc])
+gl_TESTS_BASE([tests])
+gl_LIB([libgnu])
+gl_MAKEFILE_NAME([])
+gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/gnulib-common.m4 groff-1.21/src/libs/gnulib/m4/gnulib-common.m4
--- groff-1.20.1/src/libs/gnulib/m4/gnulib-common.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/gnulib-common.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,214 @@
+# gnulib-common.m4 serial 21
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_COMMON
+# is expanded unconditionally through gnulib-tool magic.
+AC_DEFUN([gl_COMMON], [
+  dnl Use AC_REQUIRE here, so that the code is expanded once only.
+  AC_REQUIRE([gl_00GNULIB])
+  AC_REQUIRE([gl_COMMON_BODY])
+])
+AC_DEFUN([gl_COMMON_BODY], [
+  AH_VERBATIM([isoc99_inline],
+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
+   __APPLE__ && __MACH__ test for MacOS X.
+   __APPLE_CC__ tests for the Apple compiler and its version.
+   __STDC_VERSION__ tests for the C99 mode.  */
+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
+# define __GNUC_STDC_INLINE__ 1
+#endif])
+  AH_VERBATIM([unused_parameter],
+[/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+#else
+# define _GL_UNUSED
+#endif
+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
+   is a misnomer outside of parameter lists.  */
+#define _UNUSED_PARAMETER_ _GL_UNUSED
+])
+  dnl Preparation for running test programs:
+  dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
+  dnl to /dev/tty, so they can be redirected to log files.  Such diagnostics
+  dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N.
+  LIBC_FATAL_STDERR_=1
+  export LIBC_FATAL_STDERR_
+])
+
+# gl_MODULE_INDICATOR_CONDITION
+# expands to a C preprocessor expression that evaluates to 1 or 0, depending
+# whether a gnulib module that has been requested shall be considered present
+# or not.
+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
+
+# gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
+# sets the shell variable that indicates the presence of the given module to
+# a C preprocessor expression that will evaluate to 1.
+AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
+[
+  GNULIB_[]m4_translit([[$1]],
+    [abcdefghijklmnopqrstuvwxyz./-],
+    [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
+])
+
+# gl_MODULE_INDICATOR([modulename])
+# defines a C macro indicating the presence of the given module
+# in a location where it can be used.
+#                                             |  Value  |   Value   |
+#                                             | in lib/ | in tests/ |
+# --------------------------------------------+---------+-----------+
+# Module present among main modules:          |    1    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module present among tests-related modules: |    0    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module not present at all:                  |    0    |     0     |
+# --------------------------------------------+---------+-----------+
+AC_DEFUN([gl_MODULE_INDICATOR],
+[
+  AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
+      [abcdefghijklmnopqrstuvwxyz./-],
+      [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
+    [gl_MODULE_INDICATOR_CONDITION],
+    [Define to a C preprocessor expression that evaluates to 1 or 0,
+     depending whether the gnulib module $1 shall be considered present.])
+])
+
+# gl_MODULE_INDICATOR_FOR_TESTS([modulename])
+# defines a C macro indicating the presence of the given module
+# in lib or tests. This is useful to determine whether the module
+# should be tested.
+#                                             |  Value  |   Value   |
+#                                             | in lib/ | in tests/ |
+# --------------------------------------------+---------+-----------+
+# Module present among main modules:          |    1    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module present among tests-related modules: |    1    |     1     |
+# --------------------------------------------+---------+-----------+
+# Module not present at all:                  |    0    |     0     |
+# --------------------------------------------+---------+-----------+
+AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
+[
+  AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
+      [abcdefghijklmnopqrstuvwxyz./-],
+      [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
+    [Define to 1 when the gnulib module $1 should be tested.])
+])
+
+# Test whether <features.h> exists.
+# Set HAVE_FEATURES_H.
+AC_DEFUN([gl_FEATURES_H],
+[
+  AC_CHECK_HEADERS_ONCE([features.h])
+  if test $ac_cv_header_features_h = yes; then
+    HAVE_FEATURES_H=1
+  else
+    HAVE_FEATURES_H=0
+  fi
+  AC_SUBST([HAVE_FEATURES_H])
+])
+
+# m4_foreach_w
+# is a backport of autoconf-2.59c's m4_foreach_w.
+# Remove this macro when we can assume autoconf >= 2.60.
+m4_ifndef([m4_foreach_w],
+  [m4_define([m4_foreach_w],
+    [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
+
+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
+# ----------------------------------------------------
+# Backport of autoconf-2.63b's macro.
+# Remove this macro when we can assume autoconf >= 2.64.
+m4_ifndef([AS_VAR_IF],
+[m4_define([AS_VAR_IF],
+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
+
+# AC_PROG_MKDIR_P
+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
+# for interoperability with automake-1.9.6 from autoconf-2.62.
+# Remove this macro when we can assume autoconf >= 2.62 or
+# autoconf >= 2.60 && automake >= 1.10.
+m4_ifdef([AC_PROG_MKDIR_P], [
+  dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
+  m4_define([AC_PROG_MKDIR_P],
+    m4_defn([AC_PROG_MKDIR_P])[
+    AC_SUBST([MKDIR_P])])], [
+  dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
+  AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
+    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+     MKDIR_P='$(mkdir_p)'
+     AC_SUBST([MKDIR_P])])])
+
+# AC_C_RESTRICT
+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
+# works.
+# This definition can be removed once autoconf >= 2.62 can be assumed.
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
+AC_DEFUN([AC_C_RESTRICT],
+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
+  [ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[typedef int * int_ptr;
+        int foo (int_ptr $ac_kw ip) {
+        return ip[0];
+       }]],
+      [[int s[1];
+        int * $ac_kw t = s;
+        t[0] = 0;
+        return foo(t)]])],
+      [ac_cv_c_restrict=$ac_kw])
+     test "$ac_cv_c_restrict" != no && break
+   done
+  ])
+ AH_VERBATIM([restrict],
+[/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif])
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) AC_DEFINE([restrict], []) ;;
+   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
+ esac
+])
+])
+
+# gl_BIGENDIAN
+# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
+# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
+# macros invoke AC_C_BIGENDIAN with arguments.
+AC_DEFUN([gl_BIGENDIAN],
+[
+  AC_C_BIGENDIAN
+])
+
+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
+# output a spurious "(cached)" mark in the midst of other configure output.
+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
+AC_DEFUN([gl_CACHE_VAL_SILENT],
+[
+  saved_as_echo_n="$as_echo_n"
+  as_echo_n=':'
+  AC_CACHE_VAL([$1], [$2])
+  as_echo_n="$saved_as_echo_n"
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/gnulib-comp.m4 groff-1.21/src/libs/gnulib/m4/gnulib-comp.m4
--- groff-1.20.1/src/libs/gnulib/m4/gnulib-comp.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/gnulib-comp.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,274 @@
+# DO NOT EDIT! GENERATED AUTOMATICALLY!
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the compiled summary of the specification in
+# gnulib-cache.m4. It lists the computed macro invocations that need
+# to be invoked from configure.ac.
+# In projects that use version control, this file can be treated like
+# other built files.
+
+
+# This macro should be invoked from src/libs/gnulib/configure.ac, in the section
+# "Checks for programs", right after AC_PROG_CC, and certainly before
+# any checks for libraries, header files, types and library functions.
+AC_DEFUN([gl_EARLY],
+[
+  m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
+  m4_pattern_allow([^gl_ES$])dnl a valid locale name
+  m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
+  m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
+  AC_REQUIRE([AC_PROG_RANLIB])
+  AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module arg-nonnull:
+  # Code from module c++defs:
+  # Code from module configmake:
+  # Code from module extensions:
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module include_next:
+  # Code from module localcharset:
+  # Code from module multiarch:
+  # Code from module stddef:
+  # Code from module stdint:
+  # Code from module streq:
+  # Code from module unitypes:
+  # Code from module uniwidth/base:
+  # Code from module uniwidth/width:
+  # Code from module warn-on-use:
+  # Code from module wchar:
+  # Code from module wctype:
+  # Code from module wcwidth:
+])
+
+# This macro should be invoked from src/libs/gnulib/configure.ac, in the section
+# "Check for header files, types and library functions".
+AC_DEFUN([gl_INIT],
+[
+  AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+  gl_cond_libtool=false
+  gl_libdeps=
+  gl_ltlibdeps=
+  gl_m4_base='m4'
+  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
+  m4_pushdef([gl_LIBSOURCES_LIST], [])
+  m4_pushdef([gl_LIBSOURCES_DIR], [])
+  gl_COMMON
+  gl_source_base='lib'
+  # Code from module arg-nonnull:
+  # Code from module c++defs:
+  # Code from module configmake:
+  # Code from module extensions:
+  # Code from module include_next:
+  # Code from module localcharset:
+  gl_LOCALCHARSET
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+  AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+  # Code from module multiarch:
+  gl_MULTIARCH
+  # Code from module stddef:
+  gl_STDDEF_H
+  # Code from module stdint:
+  gl_STDINT_H
+  # Code from module streq:
+  # Code from module unitypes:
+  gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+  # Code from module uniwidth/base:
+  gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
+  # Code from module uniwidth/width:
+  gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width])
+  # Code from module warn-on-use:
+  # Code from module wchar:
+  gl_WCHAR_H
+  # Code from module wctype:
+  gl_WCTYPE_H
+  # Code from module wcwidth:
+  gl_FUNC_WCWIDTH
+  gl_WCHAR_MODULE_INDICATOR([wcwidth])
+  # End of code from modules
+  m4_ifval(gl_LIBSOURCES_LIST, [
+    m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
+      for gl_file in ]gl_LIBSOURCES_LIST[ ; do
+        if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
+          exit 1
+        fi
+      done])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
+  ])
+  m4_popdef([gl_LIBSOURCES_DIR])
+  m4_popdef([gl_LIBSOURCES_LIST])
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gl_libobjs=
+    gl_ltlibobjs=
+    if test -n "$gl_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gl_libobjs="$gl_libobjs $i.$ac_objext"
+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
+    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
+  ])
+  gltests_libdeps=
+  gltests_ltlibdeps=
+  m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
+  m4_pushdef([gltests_LIBSOURCES_LIST], [])
+  m4_pushdef([gltests_LIBSOURCES_DIR], [])
+  gl_COMMON
+  gl_source_base='tests'
+changequote(,)dnl
+  gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
+changequote([, ])dnl
+  AC_SUBST([gltests_WITNESS])
+  gl_module_indicator_condition=$gltests_WITNESS
+  m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
+  m4_popdef([gl_MODULE_INDICATOR_CONDITION])
+  m4_ifval(gltests_LIBSOURCES_LIST, [
+    m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
+      for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
+        if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
+          echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
+          exit 1
+        fi
+      done])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
+  ])
+  m4_popdef([gltests_LIBSOURCES_DIR])
+  m4_popdef([gltests_LIBSOURCES_LIST])
+  m4_popdef([AC_LIBSOURCES])
+  m4_popdef([AC_REPLACE_FUNCS])
+  m4_popdef([AC_LIBOBJ])
+  AC_CONFIG_COMMANDS_PRE([
+    gltests_libobjs=
+    gltests_ltlibobjs=
+    if test -n "$gltests_LIBOBJS"; then
+      # Remove the extension.
+      sed_drop_objext='s/\.o$//;s/\.obj$//'
+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
+        gltests_libobjs="$gltests_libobjs $i.$ac_objext"
+        gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
+      done
+    fi
+    AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
+    AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
+  ])
+  LIBGNU_LIBDEPS="$gl_libdeps"
+  AC_SUBST([LIBGNU_LIBDEPS])
+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
+  AC_SUBST([LIBGNU_LTLIBDEPS])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
+])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gl_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parameterization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gl_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_define([gl_LIBSOURCES_DIR], [lib])
+      m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
+    ])
+  ])
+])
+
+# Like AC_LIBOBJ, except that the module name goes
+# into gltests_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gltests_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
+  gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
+])
+
+# Like AC_REPLACE_FUNCS, except that the module name goes
+# into gltests_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([gltests_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
+])
+
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parameterization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gltests_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_define([gltests_LIBSOURCES_DIR], [tests])
+      m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ])
+    ])
+  ])
+])
+
+# This macro records the list of files which have been installed by
+# gnulib-tool and may be removed by future gnulib-tool invocations.
+AC_DEFUN([gl_FILE_LIST], [
+  build-aux/arg-nonnull.h
+  build-aux/c++defs.h
+  build-aux/warn-on-use.h
+  lib/config.charset
+  lib/localcharset.c
+  lib/localcharset.h
+  lib/ref-add.sin
+  lib/ref-del.sin
+  lib/stddef.in.h
+  lib/stdint.in.h
+  lib/streq.h
+  lib/unitypes.in.h
+  lib/uniwidth.in.h
+  lib/uniwidth/cjk.h
+  lib/uniwidth/width.c
+  lib/wchar.in.h
+  lib/wctype.in.h
+  lib/wcwidth.c
+  m4/00gnulib.m4
+  m4/codeset.m4
+  m4/extensions.m4
+  m4/fcntl-o.m4
+  m4/glibc21.m4
+  m4/gnulib-common.m4
+  m4/include_next.m4
+  m4/libunistring-base.m4
+  m4/localcharset.m4
+  m4/longlong.m4
+  m4/multiarch.m4
+  m4/onceonly.m4
+  m4/stddef_h.m4
+  m4/stdint.m4
+  m4/warn-on-use.m4
+  m4/wchar_h.m4
+  m4/wchar_t.m4
+  m4/wctype_h.m4
+  m4/wcwidth.m4
+  m4/wint_t.m4
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/gnulib-tool.m4 groff-1.21/src/libs/gnulib/m4/gnulib-tool.m4
--- groff-1.20.1/src/libs/gnulib/m4/gnulib-tool.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/gnulib-tool.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,57 @@
+# gnulib-tool.m4 serial 2
+dnl Copyright (C) 2004-2005, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl The following macros need not be invoked explicitly.
+dnl Invoking them does nothing except to declare default arguments
+dnl for "gnulib-tool --import".
+
+dnl Usage: gl_LOCAL_DIR([DIR])
+AC_DEFUN([gl_LOCAL_DIR], [])
+
+dnl Usage: gl_MODULES([module1 module2 ...])
+AC_DEFUN([gl_MODULES], [])
+
+dnl Usage: gl_AVOID([module1 module2 ...])
+AC_DEFUN([gl_AVOID], [])
+
+dnl Usage: gl_SOURCE_BASE([DIR])
+AC_DEFUN([gl_SOURCE_BASE], [])
+
+dnl Usage: gl_M4_BASE([DIR])
+AC_DEFUN([gl_M4_BASE], [])
+
+dnl Usage: gl_PO_BASE([DIR])
+AC_DEFUN([gl_PO_BASE], [])
+
+dnl Usage: gl_DOC_BASE([DIR])
+AC_DEFUN([gl_DOC_BASE], [])
+
+dnl Usage: gl_TESTS_BASE([DIR])
+AC_DEFUN([gl_TESTS_BASE], [])
+
+dnl Usage: gl_WITH_TESTS
+AC_DEFUN([gl_WITH_TESTS], [])
+
+dnl Usage: gl_LIB([LIBNAME])
+AC_DEFUN([gl_LIB], [])
+
+dnl Usage: gl_LGPL or gl_LGPL([VERSION])
+AC_DEFUN([gl_LGPL], [])
+
+dnl Usage: gl_MAKEFILE_NAME([FILENAME])
+AC_DEFUN([gl_MAKEFILE_NAME], [])
+
+dnl Usage: gl_LIBTOOL
+AC_DEFUN([gl_LIBTOOL], [])
+
+dnl Usage: gl_MACRO_PREFIX([PREFIX])
+AC_DEFUN([gl_MACRO_PREFIX], [])
+
+dnl Usage: gl_PO_DOMAIN([DOMAIN])
+AC_DEFUN([gl_PO_DOMAIN], [])
+
+dnl Usage: gl_VC_FILES([BOOLEAN])
+AC_DEFUN([gl_VC_FILES], [])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/include_next.m4 groff-1.21/src/libs/gnulib/m4/include_next.m4
--- groff-1.20.1/src/libs/gnulib/m4/include_next.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/include_next.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,217 @@
+# include_next.m4 serial 16
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert and Derek Price.
+
+dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER.
+dnl
+dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to
+dnl 'include' otherwise.
+dnl
+dnl INCLUDE_NEXT_AS_FIRST_DIRECTIVE expands to 'include_next' if the compiler
+dnl supports it in the special case that it is the first include directive in
+dnl the given file, or to 'include' otherwise.
+dnl
+dnl PRAGMA_SYSTEM_HEADER can be used in files that contain #include_next,
+dnl so as to avoid GCC warnings when the gcc option -pedantic is used.
+dnl '#pragma GCC system_header' has the same effect as if the file was found
+dnl through the include search path specified with '-isystem' options (as
+dnl opposed to the search path specified with '-I' options). Namely, gcc
+dnl does not warn about some things, and on some systems (Solaris and Interix)
+dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
+dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
+dnl of plain '__STDC__'.
+dnl
+dnl PRAGMA_COLUMNS can be used in files that override system header files, so
+dnl as to avoid compilation errors on HP NonStop systems when the gnulib file
+dnl is included by a system header file that does a "#pragma COLUMNS 80" (which
+dnl has the effect of truncating the lines of that file and all files that it
+dnl includes to 80 columns) and the gnulib file has lines longer than 80
+dnl columns.
+
+AC_DEFUN([gl_INCLUDE_NEXT],
+[
+  AC_LANG_PREPROC_REQUIRE()
+  AC_CACHE_CHECK([whether the preprocessor supports include_next],
+    [gl_cv_have_include_next],
+    [rm -rf conftestd1a conftestd1b conftestd2
+     mkdir conftestd1a conftestd1b conftestd2
+     dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on
+     dnl AIX 6.1 support include_next when used as first preprocessor directive
+     dnl in a file, but not when preceded by another include directive. Check
+     dnl for this bug by including <stdio.h>.
+     dnl Additionally, with this same compiler, include_next is a no-op when
+     dnl used in a header file that was included by specifying its absolute
+     dnl file name. Despite these two bugs, include_next is used in the
+     dnl compiler's <math.h>. By virtue of the second bug, we need to use
+     dnl include_next as well in this case.
+     cat <<EOF > conftestd1a/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd1b/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     gl_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+dnl We intentionally avoid using AC_LANG_SOURCE here.
+     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+       [gl_cv_have_include_next=yes],
+       [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+          [gl_cv_have_include_next=buggy],
+          [gl_cv_have_include_next=no])
+       ])
+     CPPFLAGS="$gl_save_CPPFLAGS"
+     rm -rf conftestd1a conftestd1b conftestd2
+    ])
+  PRAGMA_SYSTEM_HEADER=
+  if test $gl_cv_have_include_next = yes; then
+    INCLUDE_NEXT=include_next
+    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    if test -n "$GCC"; then
+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+    fi
+  else
+    if test $gl_cv_have_include_next = buggy; then
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    else
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+    fi
+  fi
+  AC_SUBST([INCLUDE_NEXT])
+  AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
+  AC_SUBST([PRAGMA_SYSTEM_HEADER])
+  AC_CACHE_CHECK([whether system header files limit the line length],
+    [gl_cv_pragma_columns],
+    [dnl HP NonStop systems, which define __TANDEM, have this misfeature.
+     AC_EGREP_CPP([choke me],
+       [
+#ifdef __TANDEM
+choke me
+#endif
+       ],
+       [gl_cv_pragma_columns=yes],
+       [gl_cv_pragma_columns=no])
+    ])
+  if test $gl_cv_pragma_columns = yes; then
+    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+  else
+    PRAGMA_COLUMNS=
+  fi
+  AC_SUBST([PRAGMA_COLUMNS])
+])
+
+# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
+# ------------------------------------------
+# For each arg foo.h, if #include_next works, define NEXT_FOO_H to be
+# '<foo.h>'; otherwise define it to be
+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
+# Also, if #include_next works as first preprocessing directive in a file,
+# define NEXT_AS_FIRST_DIRECTIVE_FOO_H to be '<foo.h>'; otherwise define it to
+# be
+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
+# That way, a header file with the following line:
+#       #@INCLUDE_NEXT@ @NEXT_FOO_H@
+# or
+#       #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@
+# behaves (after sed substitution) as if it contained
+#       #include_next <foo.h>
+# even if the compiler does not support include_next.
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+AC_DEFUN([gl_CHECK_NEXT_HEADERS],
+[
+  AC_REQUIRE([gl_INCLUDE_NEXT])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_HEADERS_ONCE([$1])
+
+  m4_foreach_w([gl_HEADER_NAME], [$1],
+    [AS_VAR_PUSHDEF([gl_next_header],
+                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
+     if test $gl_cv_have_include_next = yes; then
+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+     else
+       AC_CACHE_CHECK(
+         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+         m4_defn([gl_next_header]),
+         [AS_VAR_PUSHDEF([gl_header_exists],
+                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+          if test AS_VAR_GET(gl_header_exists) = yes; then
+            AC_LANG_CONFTEST(
+              [AC_LANG_SOURCE(
+                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
+               )])
+            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+            dnl that contain only a #include of other header files and no
+            dnl non-comment tokens of their own. This leads to a failure to
+            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+            dnl and others. The workaround is to force preservation of comments
+            dnl through option -C. This ensures all necessary #line directives
+            dnl are present. GCC supports option -C as well.
+            case "$host_os" in
+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
+              *)    gl_absname_cpp="$ac_cpp" ;;
+            esac
+            dnl eval is necessary to expand gl_absname_cpp.
+            dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+            dnl so use subshell.
+            AS_VAR_SET([gl_next_header],
+              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
+                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
+                 s#^/[^/]#//&#
+                 p
+                 q
+               }'`'"'])
+          else
+            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+          fi
+          AS_VAR_POPDEF([gl_header_exists])])
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
+       [AS_VAR_GET([gl_next_header])])
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'gl_HEADER_NAME'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
+       [$gl_next_as_first_directive])
+     AS_VAR_POPDEF([gl_next_header])])
+])
+
+# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
+# this fallback is safe for all earlier autoconf versions.
+m4_define_default([AC_LANG_DEFINES_PROVIDED])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/libunistring-base.m4 groff-1.21/src/libs/gnulib/m4/libunistring-base.m4
--- groff-1.20.1/src/libs/gnulib/m4/libunistring-base.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/libunistring-base.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,141 @@
+# libunistring-base.m4 serial 5
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paolo Bonzini and Bruno Haible.
+
+dnl gl_LIBUNISTRING_MODULE([VERSION], [Module])
+dnl Declares that the source files of Module should be compiled, unless we
+dnl are linking with libunistring and its version is >= the given VERSION.
+dnl Defines an automake conditional LIBUNISTRING_COMPILE_$MODULE that is
+dnl true if the source files of Module should be compiled.
+dnl This macro is to be used for public libunistring API, not for
+dnl undocumented API.
+dnl
+dnl You have to bump the VERSION argument to the next projected version
+dnl number each time you make a change that affects the behaviour of the
+dnl functions defined in Module (even if the sources of Module itself do not
+dnl change).
+
+AC_DEFUN([gl_LIBUNISTRING_MODULE],
+[
+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
+  AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
+    [gl_LIBUNISTRING_VERSION_CMP([$1])])
+])
+
+dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile])
+dnl Declares that HeaderFile should be created, unless we are linking
+dnl with libunistring and its version is >= the given VERSION.
+dnl HeaderFile should be relative to the lib directory and end in '.h'.
+dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty).
+dnl
+dnl When we are linking with the already installed libunistring and its version
+dnl is < VERSION, we create HeaderFile here, because we may compile functions
+dnl (via gl_LIBUNISTRING_MODULE above) that are not contained in the installed
+dnl version.
+dnl When we are linking with the already installed libunistring and its version
+dnl is > VERSION, we don't create HeaderFile here: it could cause compilation
+dnl errors in other libunistring header files if some types are missing.
+dnl
+dnl You have to bump the VERSION argument to the next projected version
+dnl number each time you make a non-comment change to the HeaderFile.
+
+AC_DEFUN([gl_LIBUNISTRING_LIBHEADER],
+[
+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
+  if gl_LIBUNISTRING_VERSION_CMP([$1]); then
+    LIBUNISTRING_[]AS_TR_CPP([$2])='$2'
+  else
+    LIBUNISTRING_[]AS_TR_CPP([$2])=
+  fi
+  AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2]))
+])
+
+dnl Miscellaneous preparations/initializations.
+
+AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE],
+[
+  dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point.
+  m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])])
+
+  AC_REQUIRE([AC_PROG_AWK])
+
+dnl Sed expressions to extract the parts of a version number.
+changequote(,)
+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+changequote([,])
+
+  if test "$HAVE_LIBUNISTRING" = yes; then
+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+  fi
+])
+
+dnl gl_LIBUNISTRING_VERSION_CMP([VERSION])
+dnl Expands to a shell statement that evaluates to true if LIBUNISTRING_VERSION
+dnl is less than the VERSION argument.
+AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP],
+[ { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+         dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least.
+         AS_LITERAL_IF([$1],
+           [dnl This is the optimized variant, that assumes the argument is a literal:
+            m4_pushdef([requested_version_major],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])])
+            m4_pushdef([requested_version_minor],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
+            m4_pushdef([requested_version_subminor],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
+            test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor
+                         }
+                    }
+               }
+            m4_popdef([requested_version_subminor])
+            m4_popdef([requested_version_minor])
+            m4_popdef([requested_version_major])
+           ],
+           [dnl This is the unoptimized variant:
+            requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"`
+            requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"`
+            requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+            test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor
+                         }
+                    }
+               }
+           ])
+       }
+  }])
+
+dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the
+dnl same as ORIG, otherwise to 0.
+m4_define([gl_LIBUNISTRING_ARG_OR_ZERO], [m4_if([$1], [$2], [0], [$1])])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/localcharset.m4 groff-1.21/src/libs/gnulib/m4/localcharset.m4
--- groff-1.20.1/src/libs/gnulib/m4/localcharset.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/localcharset.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,17 @@
+# localcharset.m4 serial 7
+dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LOCALCHARSET],
+[
+  dnl Prerequisites of lib/localcharset.c.
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_REQUIRE([gl_FCNTL_O_FLAGS])
+  AC_CHECK_DECLS_ONCE([getc_unlocked])
+
+  dnl Prerequisites of the lib/Makefile.am snippet.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_GLIBC21])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/longlong.m4 groff-1.21/src/libs/gnulib/m4/longlong.m4
--- groff-1.20.1/src/libs/gnulib/m4/longlong.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/longlong.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,106 @@
+# longlong.m4 serial 14
+dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
+
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+        dnl If cross compiling, assume the bug isn't important, since
+        dnl nobody cross compiles for this platform as far as we know.
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[@%:@include <limits.h>
+               @%:@ifndef LLONG_MAX
+               @%:@ define HALF \
+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+               @%:@ define LLONG_MAX (HALF - 1 + HALF)
+               @%:@endif]],
+             [[long long int n = 1;
+               int i;
+               for (i = 0; ; i++)
+                 {
+                   long long int m = n << i;
+                   if (m >> i != n)
+                     return 1;
+                   if (LLONG_MAX / 2 < m)
+                     break;
+                 }
+               return 0;]])],
+          [ac_cv_type_long_long_int=yes],
+          [ac_cv_type_long_long_int=no],
+          [ac_cv_type_long_long_int=yes])],
+       [ac_cv_type_long_long_int=no])])
+  if test $ac_cv_type_long_long_int = yes; then
+    AC_DEFINE([HAVE_LONG_LONG_INT], [1],
+      [Define to 1 if the system has the type `long long int'.])
+  fi
+])
+
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
+
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
+      [Define to 1 if the system has the type `unsigned long long int'.])
+  fi
+])
+
+# Expands to a C program that can be used to test for simultaneous support
+# of 'long long' and 'unsigned long long'. We don't want to say that
+# 'long long' is available if 'unsigned long long' is not, or vice versa,
+# because too many programs rely on the symmetry between signed and unsigned
+# integer types (excluding 'bool').
+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
+[
+  AC_LANG_PROGRAM(
+    [[/* For now, do not test the preprocessor; as of 2007 there are too many
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                     ? 1 : -1)];
+      int i = 63;]],
+    [[/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));]])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/Makefile.am groff-1.21/src/libs/gnulib/m4/Makefile.am
--- groff-1.20.1/src/libs/gnulib/m4/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/Makefile.am	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,22 @@
+## Process this file with automake to produce Makefile.in.
+
+EXTRA_DIST =
+EXTRA_DIST += 00gnulib.m4
+EXTRA_DIST += codeset.m4
+EXTRA_DIST += extensions.m4
+EXTRA_DIST += fcntl-o.m4
+EXTRA_DIST += glibc21.m4
+EXTRA_DIST += gnulib-common.m4
+EXTRA_DIST += include_next.m4
+EXTRA_DIST += libunistring-base.m4
+EXTRA_DIST += localcharset.m4
+EXTRA_DIST += longlong.m4
+EXTRA_DIST += multiarch.m4
+EXTRA_DIST += stddef_h.m4
+EXTRA_DIST += stdint.m4
+EXTRA_DIST += warn-on-use.m4
+EXTRA_DIST += wchar_h.m4
+EXTRA_DIST += wchar_t.m4
+EXTRA_DIST += wctype_h.m4
+EXTRA_DIST += wcwidth.m4
+EXTRA_DIST += wint_t.m4
diff -ruN groff-1.20.1/src/libs/gnulib/m4/Makefile.in groff-1.21/src/libs/gnulib/m4/Makefile.in
--- groff-1.20.1/src/libs/gnulib/m4/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/Makefile.in	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,428 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = m4
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/include_next.m4 \
+	$(top_srcdir)/m4/libunistring-base.m4 \
+	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype_h.m4 \
+	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GLIBC21 = @GLIBC21@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GREP = @GREP@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = 00gnulib.m4 codeset.m4 extensions.m4 fcntl-o.m4 \
+	glibc21.m4 gnulib-common.m4 include_next.m4 \
+	libunistring-base.m4 localcharset.m4 longlong.m4 multiarch.m4 \
+	stddef_h.m4 stdint.m4 warn-on-use.m4 wchar_h.m4 wchar_t.m4 \
+	wctype_h.m4 wcwidth.m4 wint_t.m4
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign m4/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -ruN groff-1.20.1/src/libs/gnulib/m4/multiarch.m4 groff-1.21/src/libs/gnulib/m4/multiarch.m4
--- groff-1.20.1/src/libs/gnulib/m4/multiarch.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/multiarch.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,65 @@
+# multiarch.m4 serial 5
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Determine whether the compiler is or may be producing universal binaries.
+#
+# On MacOS X 10.5 and later systems, the user can create libraries and
+# executables that work on multiple system types--known as "fat" or
+# "universal" binaries--by specifying multiple '-arch' options to the
+# compiler but only a single '-arch' option to the preprocessor.  Like
+# this:
+#
+#     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+#                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+#                 CPP="gcc -E" CXXCPP="g++ -E"
+#
+# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
+# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
+
+AC_DEFUN_ONCE([gl_MULTIARCH],
+[
+  dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
+  gl_cv_c_multiarch=no
+  AC_COMPILE_IFELSE(
+    [AC_LANG_SOURCE(
+      [[#ifndef __APPLE_CC__
+         not a universal capable compiler
+        #endif
+        typedef int dummy;
+      ]])],
+    [
+     dnl Check for potential -arch flags.  It is not universal unless
+     dnl there are at least two -arch flags with different values.
+     arch=
+     prev=
+     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+       if test -n "$prev"; then
+         case $word in
+           i?86 | x86_64 | ppc | ppc64)
+             if test -z "$arch" || test "$arch" = "$word"; then
+               arch="$word"
+             else
+               gl_cv_c_multiarch=yes
+             fi
+             ;;
+         esac
+         prev=
+       else
+         if test "x$word" = "x-arch"; then
+           prev=arch
+         fi
+       fi
+     done
+    ])
+  if test $gl_cv_c_multiarch = yes; then
+    AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1],
+      [Define if the compiler is building for multiple architectures of Apple platforms at once.])
+    APPLE_UNIVERSAL_BUILD=1
+  else
+    APPLE_UNIVERSAL_BUILD=0
+  fi
+  AC_SUBST([APPLE_UNIVERSAL_BUILD])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/onceonly.m4 groff-1.21/src/libs/gnulib/m4/onceonly.m4
--- groff-1.20.1/src/libs/gnulib/m4/onceonly.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/onceonly.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,91 @@
+# onceonly.m4 serial 7
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE          like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE            like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE            like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_FUNC_STRCOLL])  like  AC_FUNC_STRCOLL
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl The original code implemented AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE
+dnl in terms of AC_DEFUN and AC_REQUIRE. This implementation uses diversions to
+dnl named sections DEFAULTS and INIT_PREPARE in order to check all requested
+dnl headers at once, thus reducing the size of 'configure'. It is known to work
+dnl with autoconf 2.57..2.62 at least . The size reduction is ca. 9%.
+
+dnl Autoconf version 2.59 plus gnulib is required; this file is not needed
+dnl with Autoconf 2.60 or greater. But note that autoconf's implementation of
+dnl AC_CHECK_DECLS_ONCE expects a comma-separated list of symbols as first
+dnl argument!
+AC_PREREQ([2.59])
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  m4_foreach_w([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME,
+                                                    [./-], [___])), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
+      gl_HEADERS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME,
+                                                      [./-], [___])))
+  ])
+])
+m4_define([gl_HEADERS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_header_list=])
+  AC_CHECK_HEADERS([$gl_header_list])
+  m4_define([gl_HEADERS_EXPANSION], [])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  m4_foreach_w([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
+      gl_FUNCS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
+  ])
+])
+m4_define([gl_FUNCS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_func_list=])
+  AC_CHECK_FUNCS([$gl_func_list])
+  m4_define([gl_FUNCS_EXPANSION], [])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  m4_foreach_w([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
+  ])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/stddef_h.m4 groff-1.21/src/libs/gnulib/m4/stddef_h.m4
--- groff-1.20.1/src/libs/gnulib/m4/stddef_h.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/stddef_h.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,45 @@
+dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
+# stddef_h.m4 serial 2
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_STDDEF_H],
+[
+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    STDDEF_H=stddef.h
+  fi
+  AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
+    [gl_cv_decl_null_works],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+]])],
+      [gl_cv_decl_null_works=yes],
+      [gl_cv_decl_null_works=no])])
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    STDDEF_H=stddef.h
+  fi
+  if test -n "$STDDEF_H"; then
+    gl_CHECK_NEXT_HEADERS([stddef.h])
+  fi
+])
+
+AC_DEFUN([gl_STDDEF_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+])
+
+AC_DEFUN([gl_STDDEF_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
+  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
+  STDDEF_H='';                   AC_SUBST([STDDEF_H])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/stdint.m4 groff-1.21/src/libs/gnulib/m4/stdint.m4
--- groff-1.20.1/src/libs/gnulib/m4/stdint.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/stdint.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,472 @@
+# stdint.m4 serial 36
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert and Bruno Haible.
+dnl Test whether <stdint.h> is supported or must be substituted.
+
+AC_DEFUN([gl_STDINT_H],
+[
+  AC_PREREQ([2.59])dnl
+
+  dnl Check for long long int and unsigned long long int.
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
+  AC_SUBST([HAVE_LONG_LONG_INT])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
+  fi
+  AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
+
+  dnl Check for <inttypes.h>.
+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
+  if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
+  AC_SUBST([HAVE_INTTYPES_H])
+
+  dnl Check for <sys/types.h>.
+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h.
+  if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
+  AC_SUBST([HAVE_SYS_TYPES_H])
+
+  gl_CHECK_NEXT_HEADERS([stdint.h])
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
+  AC_SUBST([HAVE_STDINT_H])
+
+  dnl Now see whether we need a substitute <stdint.h>.
+  if test $ac_cv_header_stdint_h = yes; then
+    AC_CACHE_CHECK([whether stdint.h conforms to C99],
+      [gl_cv_header_working_stdint_h],
+      [gl_cv_header_working_stdint_h=no
+       AC_COMPILE_IFELSE([
+         AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+]
+gl_STDINT_INCLUDES
+[
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
+         ]])],
+         [dnl Determine whether the various *_MIN, *_MAX macros are usable
+          dnl in preprocessor expression. We could do it by compiling a test
+          dnl program for each of these macros. It is faster to run a program
+          dnl that inspects the macro expansion.
+          dnl This detects a bug on HP-UX 11.23/ia64.
+          AC_RUN_IFELSE([
+            AC_LANG_PROGRAM([[
+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
+]], [[
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return mv - macro_values + 1;
+    }
+  return 0;
+]])],
+              [gl_cv_header_working_stdint_h=yes],
+              [],
+              [dnl When cross-compiling, assume it works.
+               gl_cv_header_working_stdint_h=yes
+              ])
+         ])
+      ])
+  fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
+    dnl Check for <sys/inttypes.h>, and for
+    dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
+    AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
+    AC_SUBST([HAVE_SYS_INTTYPES_H])
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
+    AC_SUBST([HAVE_SYS_BITYPES_H])
+
+    dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+    dnl character support).
+    AC_CHECK_HEADERS_ONCE([wchar.h])
+
+    gl_STDINT_TYPE_PROPERTIES
+    STDINT_H=stdint.h
+  fi
+  AC_SUBST([STDINT_H])
+])
+
+dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
+dnl Determine the size of each of the given types in bits.
+AC_DEFUN([gl_STDINT_BITSIZEOF],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to the number of bits in type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
+      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
+         [$2
+#include <limits.h>], [result=unknown])
+       eval gl_cv_bitsizeof_${gltype}=\$result
+      ])
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
+      dnl do a syntax check even on unused #if conditions and give an error
+      dnl on valid C code like this:
+      dnl   #if 0
+      dnl   # if  > 32
+      dnl   # endif
+      dnl   #endif
+      result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+
+dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
+dnl Determine the signedness of each of the given types.
+dnl Define HAVE_SIGNED_TYPE if type is signed.
+AC_DEFUN([gl_CHECK_TYPES_SIGNED],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to 1 if ']gltype[' is a signed integer type.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([$2[
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
+         result=yes, result=no)
+       eval gl_cv_type_${gltype}_signed=\$result
+      ])
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1])
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+
+dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
+dnl Determine the suffix to use for integer constants of the given types.
+dnl Define t_SUFFIX for each such type.
+AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
+[
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
+       [Define to l, ll, u, ul, ull, etc., as suitable for
+        constants of type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for $gltype integer literal suffix],
+      [gl_cv_type_${gltype}_suffix],
+      [eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([$2[
+              extern $gltype foo;
+              extern $gltype1 foo;]])],
+           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done])
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
+])
+
+dnl gl_STDINT_INCLUDES
+AC_DEFUN([gl_STDINT_INCLUDES],
+[[
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+]])
+
+dnl gl_STDINT_TYPE_PROPERTIES
+dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
+dnl of interest to stdint.in.h.
+AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
+[
+  AC_REQUIRE([gl_MULTIARCH])
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_STDINT_BITSIZEOF([ptrdiff_t size_t],
+      [gl_STDINT_INCLUDES])
+  fi
+  gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t],
+      [gl_STDINT_INCLUDES])
+  fi
+  gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+])
+
+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
+dnl Remove this when we can assume autoconf >= 2.61.
+m4_ifdef([AC_COMPUTE_INT], [], [
+  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+])
+
+# Hey Emacs!
+# Local Variables:
+# indent-tabs-mode: nil
+# End:
diff -ruN groff-1.20.1/src/libs/gnulib/m4/warn-on-use.m4 groff-1.21/src/libs/gnulib/m4/warn-on-use.m4
--- groff-1.20.1/src/libs/gnulib/m4/warn-on-use.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/warn-on-use.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,45 @@
+# warn-on-use.m4 serial 2
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES)
+# ---------------------------------------
+# For each whitespace-separated element in the list of NAMES, define
+# HAVE_RAW_DECL_name if the function has a declaration among INCLUDES
+# even after being undefined as a macro.
+#
+# See warn-on-use.h for some hints on how to poison function names, as
+# well as ideas on poisoning global variables and macros.  NAMES may
+# include global variables, but remember that only functions work with
+# _GL_WARN_ON_USE.  Typically, INCLUDES only needs to list a single
+# header, but if the replacement header pulls in other headers because
+# some systems declare functions in the wrong header, then INCLUDES
+# should do likewise.
+#
+# If you assume C89, then it is generally safe to assume declarations
+# for functions declared in that standard (such as gets) without
+# needing gl_WARN_ON_USE_PREPARE.
+AC_DEFUN([gl_WARN_ON_USE_PREPARE],
+[
+  m4_foreach_w([gl_decl], [$2],
+    [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
+      [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
+       undefining macros.])])dnl
+  for gl_func in m4_flatten([$2]); do
+    AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
+    AC_CACHE_CHECK([whether $gl_func is declared without a macro],
+      gl_Symbol,
+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
+[@%:@undef $gl_func
+  (void) $gl_func;])],
+        [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
+     AS_VAR_IF(gl_Symbol, [yes],
+       [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
+       dnl shortcut - if the raw declaration exists, then set a cache
+       dnl variable to allow skipping any later AC_CHECK_DECL efforts
+       eval ac_cv_have_decl_$gl_func=yes])
+    AS_VAR_POPDEF([gl_Symbol])dnl
+  done
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/wchar_h.m4 groff-1.21/src/libs/gnulib/m4/wchar_h.m4
--- groff-1.20.1/src/libs/gnulib/m4/wchar_h.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/wchar_h.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,154 @@
+dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
+
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Eric Blake.
+
+# wchar_h.m4 serial 35
+
+AC_DEFUN([gl_WCHAR_H],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
+  dnl Prepare for creating substitute <wchar.h>.
+  dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+  dnl character support).
+  dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  gl_CHECK_NEXT_HEADERS([wchar.h])
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+  AC_SUBST([HAVE_WCHAR_H])
+
+  AC_REQUIRE([gl_FEATURES_H])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+  AC_SUBST([HAVE_WINT_T])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+/* Some systems require additional headers.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+#endif
+#include <wchar.h>
+    ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
+    wcsrtombs wcsnrtombs wcwidth])
+])
+
+dnl Check whether <wchar.h> is usable at all.
+AC_DEFUN([gl_WCHAR_H_INLINE_OK],
+[
+  dnl Test whether <wchar.h> suffers due to the transition from '__inline' to
+  dnl 'gnu_inline'. See <http://sourceware.org/bugzilla/show_bug.cgi?id=4022>
+  dnl and <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>. In summary,
+  dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and
+  dnl the option -std=c99 or -std=gnu99, leads to a broken <wchar.h>.
+  AC_CACHE_CHECK([whether <wchar.h> uses 'inline' correctly],
+    [gl_cv_header_wchar_h_correct_inline],
+    [gl_cv_header_wchar_h_correct_inline=yes
+     AC_LANG_CONFTEST([
+       AC_LANG_SOURCE([[#define wcstod renamed_wcstod
+#include <wchar.h>
+extern int zero (void);
+int main () { return zero(); }
+]])])
+     if AC_TRY_EVAL([ac_compile]); then
+       mv conftest.$ac_objext conftest1.$ac_objext
+       AC_LANG_CONFTEST([
+         AC_LANG_SOURCE([[#define wcstod renamed_wcstod
+#include <wchar.h>
+int zero (void) { return 0; }
+]])])
+       if AC_TRY_EVAL([ac_compile]); then
+         mv conftest.$ac_objext conftest2.$ac_objext
+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
+           :
+         else
+           gl_cv_header_wchar_h_correct_inline=no
+         fi
+       fi
+     fi
+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
+    ])
+  if test $gl_cv_header_wchar_h_correct_inline = no; then
+    AC_MSG_ERROR([<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+  - Add the flag -fgnu89-inline to CC and reconfigure, or
+  - Fix your include files, using parts of
+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+  - Use a gcc version older than 4.3, or
+  - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted.])
+  fi
+])
+
+dnl Unconditionally enables the replacement of <wchar.h>.
+AC_DEFUN([gl_REPLACE_WCHAR_H],
+[
+  dnl This is a no-op, because <wchar.h> is always overridden.
+  :
+])
+
+AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_WCHAR_H_DEFAULTS],
+[
+  GNULIB_BTOWC=0;      AC_SUBST([GNULIB_BTOWC])
+  GNULIB_WCTOB=0;      AC_SUBST([GNULIB_WCTOB])
+  GNULIB_MBSINIT=0;    AC_SUBST([GNULIB_MBSINIT])
+  GNULIB_MBRTOWC=0;    AC_SUBST([GNULIB_MBRTOWC])
+  GNULIB_MBRLEN=0;     AC_SUBST([GNULIB_MBRLEN])
+  GNULIB_MBSRTOWCS=0;  AC_SUBST([GNULIB_MBSRTOWCS])
+  GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS])
+  GNULIB_WCRTOMB=0;    AC_SUBST([GNULIB_WCRTOMB])
+  GNULIB_WCSRTOMBS=0;  AC_SUBST([GNULIB_WCSRTOMBS])
+  GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS])
+  GNULIB_WCWIDTH=0;    AC_SUBST([GNULIB_WCWIDTH])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
+  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
+  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
+  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
+  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
+  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
+  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
+  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
+  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
+  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
+  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
+  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
+  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
+  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
+  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
+  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
+  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
+  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
+  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
+  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
+  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
+  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
+  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/wchar_t.m4 groff-1.21/src/libs/gnulib/m4/wchar_t.m4
--- groff-1.20.1/src/libs/gnulib/m4/wchar_t.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/wchar_t.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,24 @@
+# wchar_t.m4 serial 4 (gettext-0.18.2)
+dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stddef.h>
+            wchar_t foo = (wchar_t)'\0';]],
+          [[]])],
+       [gt_cv_c_wchar_t=yes],
+       [gt_cv_c_wchar_t=no])])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+  fi
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/wctype_h.m4 groff-1.21/src/libs/gnulib/m4/wctype_h.m4
--- groff-1.20.1/src/libs/gnulib/m4/wctype_h.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/wctype_h.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,85 @@
+# wctype_h.m4 serial 8
+
+dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
+
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN([gl_WCTYPE_H],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_FUNCS_ONCE([iswcntrl])
+  if test $ac_cv_func_iswcntrl = yes; then
+    HAVE_ISWCNTRL=1
+  else
+    HAVE_ISWCNTRL=0
+  fi
+  AC_SUBST([HAVE_ISWCNTRL])
+  AC_CHECK_FUNCS_ONCE([iswblank])
+  AC_CHECK_DECLS_ONCE([iswblank])
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+    REPLACE_ISWBLANK=0
+  else
+    HAVE_ISWBLANK=0
+    if test $ac_cv_have_decl_iswblank = yes; then
+      REPLACE_ISWBLANK=1
+    else
+      REPLACE_ISWBLANK=0
+    fi
+  fi
+  AC_SUBST([HAVE_ISWBLANK])
+  AC_SUBST([REPLACE_ISWBLANK])
+
+  AC_CHECK_HEADERS_ONCE([wctype.h])
+  AC_REQUIRE([AC_C_INLINE])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+  AC_SUBST([HAVE_WINT_T])
+
+  if test $ac_cv_header_wctype_h = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
+      dnl Linux libc5 has an iswprint function that returns 0 for all arguments.
+      dnl The other functions are likely broken in the same way.
+      AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works],
+        [
+          AC_RUN_IFELSE([AC_LANG_SOURCE([[
+                            #include <stddef.h>
+                            #include <stdio.h>
+                            #include <time.h>
+                            #include <wchar.h>
+                            #include <wctype.h>
+                            int main () { return iswprint ('x') == 0; }]])],
+            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no],
+            [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+                          #if __GNU_LIBRARY__ == 1
+                          Linux libc5 i18n is broken.
+                          #endif]], [])],
+              [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
+            ])
+        ])
+    fi
+    gl_CHECK_NEXT_HEADERS([wctype.h])
+    HAVE_WCTYPE_H=1
+  else
+    HAVE_WCTYPE_H=0
+  fi
+  AC_SUBST([HAVE_WCTYPE_H])
+
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
+  else
+    REPLACE_ISWCNTRL=0
+  fi
+  AC_SUBST([REPLACE_ISWCNTRL])
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/wcwidth.m4 groff-1.21/src/libs/gnulib/m4/wcwidth.m4
--- groff-1.20.1/src/libs/gnulib/m4/wcwidth.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/wcwidth.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,102 @@
+# wcwidth.m4 serial 18
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_WCWIDTH],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Persuade glibc <wchar.h> to declare wcwidth().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  AC_CHECK_FUNCS_ONCE([wcwidth])
+
+  AC_CHECK_DECLS([wcwidth], [], [], [
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+])
+  if test $ac_cv_have_decl_wcwidth != yes; then
+    HAVE_DECL_WCWIDTH=0
+  fi
+
+  if test $ac_cv_func_wcwidth = yes; then
+    dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
+    dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+    dnl This leads to bugs in 'ls' (coreutils).
+    AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
+      [gl_cv_func_wcwidth_works],
+      [
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#include <string.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+#if !HAVE_DECL_WCWIDTH
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int wcwidth (int);
+#endif
+int main ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
+    {
+      if (wcwidth (0x0301) > 0)
+        result |= 1;
+      if (wcwidth (0x200B) > 0)
+        result |= 2;
+    }
+  return result;
+}]])],
+          [gl_cv_func_wcwidth_works=yes],
+          [gl_cv_func_wcwidth_works=no],
+          [
+changequote(,)dnl
+           case "$host_os" in
+                     # Guess yes on glibc and AIX 7 systems.
+             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+             *)                  gl_cv_func_wcwidth_works="guessing no";;
+           esac
+changequote([,])dnl
+          ])
+      ])
+    case "$gl_cv_func_wcwidth_works" in
+      *yes) ;;
+      *no) REPLACE_WCWIDTH=1 ;;
+    esac
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+  fi
+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
+     || test $HAVE_DECL_WCWIDTH = 0; then
+    gl_REPLACE_WCHAR_H
+  fi
+  dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
+  dnl have the wcwidth function, then it does not declare it.
+])
diff -ruN groff-1.20.1/src/libs/gnulib/m4/wint_t.m4 groff-1.21/src/libs/gnulib/m4/wint_t.m4
--- groff-1.20.1/src/libs/gnulib/m4/wint_t.m4	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/m4/wint_t.m4	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,32 @@
+# wint_t.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+            wint_t foo = (wchar_t)'\0';]],
+          [[]])],
+       [gt_cv_c_wint_t=yes],
+       [gt_cv_c_wint_t=no])])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+  fi
+])
diff -ruN groff-1.20.1/src/libs/gnulib/Makefile.am groff-1.21/src/libs/gnulib/Makefile.am
--- groff-1.20.1/src/libs/gnulib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/Makefile.am	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = 1.5 foreign
+
+SUBDIRS = lib m4
+
+ACLOCAL_AMFLAGS = -I m4
diff -ruN groff-1.20.1/src/libs/gnulib/Makefile.in groff-1.21/src/libs/gnulib/Makefile.in
--- groff-1.20.1/src/libs/gnulib/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/src/libs/gnulib/Makefile.in	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,788 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/configure build-aux/compile \
+	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/gnulib-common.m4 \
+	$(top_srcdir)/m4/include_next.m4 \
+	$(top_srcdir)/m4/libunistring-base.m4 \
+	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \
+	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype_h.m4 \
+	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GLIBC21 = @GLIBC21@
+GNULIB_BTOWC = @GNULIB_BTOWC@
+GNULIB_MBRLEN = @GNULIB_MBRLEN@
+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
+GNULIB_MBSINIT = @GNULIB_MBSINIT@
+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GREP = @GREP@
+HAVE_BTOWC = @HAVE_BTOWC@
+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
+HAVE_MBRLEN = @HAVE_MBRLEN@
+HAVE_MBRTOWC = @HAVE_MBRTOWC@
+HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_STDINT_H = @HAVE_STDINT_H@
+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WINT_T = @HAVE_WINT_T@
+INCLUDE_NEXT = @INCLUDE_NEXT@
+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
+NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_WCHAR_H = @NEXT_WCHAR_H@
+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+RANLIB = @RANLIB@
+REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_MBRLEN = @REPLACE_MBRLEN@
+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
+REPLACE_MBSINIT = @REPLACE_MBSINIT@
+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDDEF_H = @STDDEF_H@
+STDINT_H = @STDINT_H@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINT_T_SUFFIX = @WINT_T_SUFFIX@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gl_LIBOBJS = @gl_LIBOBJS@
+gl_LTLIBOBJS = @gl_LTLIBOBJS@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = 1.5 foreign
+SUBDIRS = lib m4
+ACLOCAL_AMFLAGS = -I m4
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-generic distclean-hdr distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -ruN groff-1.20.1/src/libs/libdriver/input.cpp groff-1.21/src/libs/libdriver/input.cpp
--- groff-1.20.1/src/libs/libdriver/input.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/libs/libdriver/input.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -3,13 +3,13 @@
 // <groff_src_dir>/src/libs/libdriver/input.cpp
 
 /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2008, 2009
+                 2006, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    Written by James Clark (jjc@jclark.com)
    Major rewrite 2001 by Bernd Warken (bwarken@mayn.de)
 
-   Last update: 5 Jan 2009
+   Last update: 9 May 2010
 
    This file is part of groff, the GNU roff text processing system.
 
@@ -790,7 +790,7 @@
     c = get_char();
   }
   if (!isdigit((int) c))
-    error("integer argument expected");
+    fatal("integer argument expected");
   while (isdigit((int) c)) {
     buf.append(c);
     c = get_char();
@@ -879,6 +879,7 @@
       break;
     default:
       error("integer argument expected");
+      done = true;
       break;
     }
   }
@@ -946,7 +947,7 @@
     case '\n':
     case EOF:
       error("missing argument");
-      break;
+      return c;
     default:			// first essential character
       return c;
     }
diff -ruN groff-1.20.1/src/libs/libgroff/font.cpp groff-1.21/src/libs/libgroff/font.cpp
--- groff-1.20.1/src/libs/libgroff/font.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/libs/libgroff/font.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2008, 2009
+                 2006, 2008, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "errarg.h"
 #include "error.h"
 #include "cset.h"
@@ -147,6 +148,47 @@
     error_with_file_and_line(path, lineno, format, arg1, arg2, arg3);
 }
 
+int glyph_to_unicode(glyph *g)
+{
+  const char *nm = glyph_to_name(g);
+  if (nm != NULL) {
+    // ASCII character?
+    if (nm[0] == 'c' && nm[1] == 'h' && nm[2] == 'a' && nm[3] == 'r'
+	&& (nm[4] >= '0' && nm[4] <= '9')) {
+      int n = (nm[4] - '0');
+      if (nm[5] == '\0')
+	return n;
+      if (n > 0 && (nm[5] >= '0' && nm[5] <= '9')) {
+	n = 10*n + (nm[5] - '0');
+	if (nm[6] == '\0')
+	  return n;
+	if (nm[6] >= '0' && nm[6] <= '9') {
+	  n = 10*n + (nm[6] - '0');
+	  if (nm[7] == '\0' && n < 128)
+	    return n;
+	}
+      }
+    }
+    // Unicode character?
+    if (check_unicode_name(nm)) {
+      char *ignore;
+      return (int)strtol(nm + 1, &ignore, 16);
+    }
+    // If `nm' is a single letter `x', the glyph name is `\x'.
+    char buf[] = { '\\', '\0', '\0' };
+    if (nm[1] == '\0') {
+      buf[1] = nm[0];
+      nm = buf;
+    }
+    // groff glyphs that map to Unicode?
+    const char *unicode = glyph_name_to_unicode(nm);
+    if (unicode != NULL && strchr(unicode, '_') == NULL) {
+      char *ignore;
+      return (int)strtol(unicode, &ignore, 16);
+    }
+  }
+  return -1;
+}
 
 /* font functions */
 
@@ -269,42 +311,11 @@
     return 1;
   if (is_unicode) {
     // Unicode font
-    const char *nm = glyph_to_name(g);
-    if (nm != NULL) {
-      // ASCII character?
-      if (nm[0] == 'c' && nm[1] == 'h' && nm[2] == 'a' && nm[3] == 'r'
-          && (nm[4] >= '0' && nm[4] <= '9')) {
-	int n = (nm[4] - '0');
-	if (nm[5] == '\0')
-	  return 1;
-	if (n > 0 && (nm[5] >= '0' && nm[5] <= '9')) {
-	  n = 10*n + (nm[5] - '0');
-	  if (nm[6] == '\0')
-	    return 1;
-	  if (nm[6] >= '0' && nm[6] <= '9') {
-	    n = 10*n + (nm[6] - '0');
-	    if (nm[7] == '\0' && n < 128)
-	      return 1;
-	  }
-	}
-      }
-      // Unicode character?
-      if (check_unicode_name(nm))
-	return 1;
-      // If `nm' is a single letter `x', the glyph name is `\x'.
-      char buf[] = { '\\', '\0', '\0' };
-      if (nm[1] == '\0') {
-	buf[1] = nm[0];
-        nm = buf;
-      }
-      // groff glyph name that maps to Unicode?
-      const char *unicode = glyph_name_to_unicode(nm);
-      if (unicode != NULL && strchr(unicode, '_') == NULL)
-	return 1;
-    }
+    // ASCII or Unicode character, or groff glyph name that maps to Unicode?
+    if (glyph_to_unicode(g) >= 0)
+      return 1;
     // Numbered character?
-    int n = glyph_to_number(g);
-    if (n >= 0)
+    if (glyph_to_number(g) >= 0)
       return 1;
   }
   return 0;
@@ -373,9 +384,10 @@
   }
   if (is_unicode) {
     // Unicode font
-    int width = 24;	// value found in the original font files
-			// XXX: this must be eventually moved back to the
-			//      font description file!
+    int width = 24; // XXX: Add a request to override this.
+    int w = wcwidth(get_code(g));
+    if (w > 1)
+      width *= w;
     if (real_size == unitwidth || font::unscaled_charwidths)
       return width;
     else
@@ -394,9 +406,7 @@
   }
   if (is_unicode) {
     // Unicode font
-    return 0;	// value found in the original font files
-		// XXX: this must be eventually moved back to the
-		//      font description file!
+    return 0;
   }
   abort();
 }
@@ -411,9 +421,7 @@
   }
   if (is_unicode) {
     // Unicode font
-    return 0;	// value found in the original font files
-		// XXX: this must be eventually moved back to the
-		//      font description file!
+    return 0;
   }
   abort();
 }
@@ -428,9 +436,7 @@
   }
   if (is_unicode) {
     // Unicode font
-    return 0;	// value found in the original font files
-		// XXX: this must be eventually moved back to the
-		//      font description file!
+    return 0;
   }
   abort();
 }
@@ -445,9 +451,7 @@
   }
   if (is_unicode) {
     // Unicode font
-    return 0;	// value found in the original font files
-		// XXX: this must be eventually moved back to the
-		//      font description file!
+    return 0;
   }
   abort();
 }
@@ -462,9 +466,7 @@
   }
   if (is_unicode) {
     // Unicode font
-    return 0;	// value found in the original font files
-		// XXX: this must be eventually moved back to the
-		//      font description file!
+    return 0;
   }
   abort();
 }
@@ -537,9 +539,7 @@
   }
   if (is_unicode) {
     // Unicode font
-    return 0;	// value found in the original font files
-		// XXX: this must be eventually moved back to the
-		//      font description file!
+    return 0;
   }
   abort();
 }
@@ -554,43 +554,10 @@
   }
   if (is_unicode) {
     // Unicode font
-    const char *nm = glyph_to_name(g);
-    if (nm != NULL) {
-      // ASCII character?
-      if (nm[0] == 'c' && nm[1] == 'h' && nm[2] == 'a' && nm[3] == 'r'
-          && (nm[4] >= '0' && nm[4] <= '9')) {
-	int n = (nm[4] - '0');
-	if (nm[5] == '\0')
-	  return n;
-	if (n > 0 && (nm[5] >= '0' && nm[5] <= '9')) {
-	  n = 10*n + (nm[5] - '0');
-	  if (nm[6] == '\0')
-	    return n;
-	  if (nm[6] >= '0' && nm[6] <= '9') {
-	    n = 10*n + (nm[6] - '0');
-	    if (nm[7] == '\0' && n < 128)
-	      return n;
-	  }
-	}
-      }
-      // Unicode character?
-      if (check_unicode_name(nm)) {
-	char *ignore;
-	return (int)strtol(nm + 1, &ignore, 16);
-      }
-      // If `nm' is a single letter `x', the glyph name is `\x'.
-      char buf[] = { '\\', '\0', '\0' };
-      if (nm[1] == '\0') {
-	buf[1] = nm[0];
-        nm = buf;
-      }
-      // groff glyphs that map to Unicode?
-      const char *unicode = glyph_name_to_unicode(nm);
-      if (unicode != NULL && strchr(unicode, '_') == NULL) {
-	char *ignore;
-	return (int)strtol(unicode, &ignore, 16);
-      }
-    }
+    // ASCII or Unicode character, or groff glyph name that maps to Unicode?
+    int uni = glyph_to_unicode(g);
+    if (uni >= 0)
+      return uni;
     // Numbered character?
     int n = glyph_to_number(g);
     if (n >= 0)
@@ -995,6 +962,11 @@
 	      t.error("bad code `%1' for character `%2'", p, nm);
 	      return 0;
 	    }
+	    if (is_unicode) {
+	      int w = wcwidth(metric.code);
+	      if (w > 1)
+	        metric.width *= w;
+	    }
 	    p = strtok(0, WS);
 	    if ((p == NULL) || (strcmp(p, "--") == 0)) {
 	      metric.special_device_coding = NULL;
diff -ruN groff-1.20.1/src/libs/libgroff/relocate.cpp groff-1.21/src/libs/libgroff/relocate.cpp
--- groff-1.20.1/src/libs/libgroff/relocate.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/libs/libgroff/relocate.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -151,7 +151,7 @@
   while (*s) {
     if (*s == '\\')
       *s = '/';
-    *s++;
+    s++;
   }
   return path;
 }
diff -ruN groff-1.20.1/src/libs/libgroff/string.cpp groff-1.21/src/libs/libgroff/string.cpp
--- groff-1.20.1/src/libs/libgroff/string.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/libs/libgroff/string.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2009
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -318,6 +318,7 @@
       if (ptr) {
 	a_delete ptr;
 	ptr = 0;
+	sz = 0;
       }
     }
   }
diff -ruN groff-1.20.1/src/preproc/eqn/eqn.cpp groff-1.21/src/preproc/eqn/eqn.cpp
--- groff-1.20.1/src/preproc/eqn/eqn.cpp	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/src/preproc/eqn/eqn.cpp	2010-12-31 08:33:10.000000000 +0100
@@ -1,37 +1,75 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
 
-#include <stdlib.h>
-#include <string.h>
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20081224
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.4.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-#ifdef YYPARSE_PARAM_TYPE
-#define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-#else
-#define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-#endif
-#else
-#define YYPARSE_DECL() yyparse(void)
-#endif /* YYPARSE_PARAM */
 
-extern int YYPARSE_DECL();
 
-static int yygrowstack(void);
-#define YYPREFIX "yy"
-#line 20 "eqn.y"
+/* Copy the first part of user declarations.  */
+
+/* Line 189 of yacc.c  */
+#line 19 "eqn.y"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -41,1208 +79,2291 @@
 extern int non_empty_flag;
 int yylex();
 void yyerror(const char *);
+
+
+/* Line 189 of yacc.c  */
+#line 86 "eqn.cpp"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     OVER = 258,
+     SMALLOVER = 259,
+     SQRT = 260,
+     SUB = 261,
+     SUP = 262,
+     LPILE = 263,
+     RPILE = 264,
+     CPILE = 265,
+     PILE = 266,
+     LEFT = 267,
+     RIGHT = 268,
+     TO = 269,
+     FROM = 270,
+     SIZE = 271,
+     FONT = 272,
+     ROMAN = 273,
+     BOLD = 274,
+     ITALIC = 275,
+     FAT = 276,
+     ACCENT = 277,
+     BAR = 278,
+     UNDER = 279,
+     ABOVE = 280,
+     TEXT = 281,
+     QUOTED_TEXT = 282,
+     FWD = 283,
+     BACK = 284,
+     DOWN = 285,
+     UP = 286,
+     MATRIX = 287,
+     COL = 288,
+     LCOL = 289,
+     RCOL = 290,
+     CCOL = 291,
+     MARK = 292,
+     LINEUP = 293,
+     TYPE = 294,
+     VCENTER = 295,
+     PRIME = 296,
+     SPLIT = 297,
+     NOSPLIT = 298,
+     UACCENT = 299,
+     SPECIAL = 300,
+     SPACE = 301,
+     GFONT = 302,
+     GSIZE = 303,
+     DEFINE = 304,
+     NDEFINE = 305,
+     TDEFINE = 306,
+     SDEFINE = 307,
+     UNDEF = 308,
+     IFDEF = 309,
+     INCLUDE = 310,
+     DELIM = 311,
+     CHARTYPE = 312,
+     SET = 313,
+     GRFONT = 314,
+     GBFONT = 315
+   };
+#endif
+/* Tokens.  */
+#define OVER 258
+#define SMALLOVER 259
+#define SQRT 260
+#define SUB 261
+#define SUP 262
+#define LPILE 263
+#define RPILE 264
+#define CPILE 265
+#define PILE 266
+#define LEFT 267
+#define RIGHT 268
+#define TO 269
+#define FROM 270
+#define SIZE 271
+#define FONT 272
+#define ROMAN 273
+#define BOLD 274
+#define ITALIC 275
+#define FAT 276
+#define ACCENT 277
+#define BAR 278
+#define UNDER 279
+#define ABOVE 280
+#define TEXT 281
+#define QUOTED_TEXT 282
+#define FWD 283
+#define BACK 284
+#define DOWN 285
+#define UP 286
+#define MATRIX 287
+#define COL 288
+#define LCOL 289
+#define RCOL 290
+#define CCOL 291
+#define MARK 292
+#define LINEUP 293
+#define TYPE 294
+#define VCENTER 295
+#define PRIME 296
+#define SPLIT 297
+#define NOSPLIT 298
+#define UACCENT 299
+#define SPECIAL 300
+#define SPACE 301
+#define GFONT 302
+#define GSIZE 303
+#define DEFINE 304
+#define NDEFINE 305
+#define TDEFINE 306
+#define SDEFINE 307
+#define UNDEF 308
+#define IFDEF 309
+#define INCLUDE 310
+#define DELIM 311
+#define CHARTYPE 312
+#define SET 313
+#define GRFONT 314
+#define GBFONT 315
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 214 of yacc.c  */
 #line 31 "eqn.y"
-typedef union {
+
 	char *str;
 	box *b;
 	pile_box *pb;
 	matrix_box *mb;
 	int n;
 	column *col;
+
+
+
+/* Line 214 of yacc.c  */
+#line 253 "eqn.cpp"
 } YYSTYPE;
-#line 53 "eqn.cpp"
-#define OVER 257
-#define SMALLOVER 258
-#define SQRT 259
-#define SUB 260
-#define SUP 261
-#define LPILE 262
-#define RPILE 263
-#define CPILE 264
-#define PILE 265
-#define LEFT 266
-#define RIGHT 267
-#define TO 268
-#define FROM 269
-#define SIZE 270
-#define FONT 271
-#define ROMAN 272
-#define BOLD 273
-#define ITALIC 274
-#define FAT 275
-#define ACCENT 276
-#define BAR 277
-#define UNDER 278
-#define ABOVE 279
-#define TEXT 280
-#define QUOTED_TEXT 281
-#define FWD 282
-#define BACK 283
-#define DOWN 284
-#define UP 285
-#define MATRIX 286
-#define COL 287
-#define LCOL 288
-#define RCOL 289
-#define CCOL 290
-#define MARK 291
-#define LINEUP 292
-#define TYPE 293
-#define VCENTER 294
-#define PRIME 295
-#define SPLIT 296
-#define NOSPLIT 297
-#define UACCENT 298
-#define SPECIAL 299
-#define SPACE 300
-#define GFONT 301
-#define GSIZE 302
-#define DEFINE 303
-#define NDEFINE 304
-#define TDEFINE 305
-#define SDEFINE 306
-#define UNDEF 307
-#define IFDEF 308
-#define INCLUDE 309
-#define DELIM 310
-#define CHARTYPE 311
-#define SET 312
-#define GRFONT 313
-#define GBFONT 314
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    6,    6,    1,    1,    1,    2,    2,    2,
-    2,    2,    3,    3,    3,    3,    4,    4,    7,    7,
-    7,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    8,   11,   11,   12,   12,   13,
-   13,   16,   16,   15,   15,   14,   14,   14,   14,    9,
-    9,   10,   10,   10,
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 264 of yacc.c  */
+#line 265 "eqn.cpp"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
+{
+  return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
 };
-static const short yylen[] = {                            2,
-    0,    1,    1,    2,    1,    2,    2,    1,    3,    3,
-    5,    5,    1,    2,    3,    3,    1,    3,    1,    3,
-    5,    1,    1,    2,    2,    1,    1,    1,    3,    2,
-    2,    2,    2,    4,    5,    3,    2,    2,    2,    3,
-    3,    2,    2,    2,    2,    3,    3,    3,    3,    3,
-    3,    3,    2,    3,    1,    1,    3,    3,    4,    1,
-    2,    1,    3,    3,    4,    2,    2,    2,    2,    1,
-    1,    1,    1,    1,
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  72
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   379
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  66
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  18
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  75
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  142
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   315
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,    63,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    61,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    64,     2,    65,    62,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60
 };
-static const short yydefred[] = {                         0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   22,   23,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   26,   27,   28,    0,
-    0,    3,    5,    0,   13,    0,    0,   17,   14,   70,
-   71,    0,    0,   55,   31,   32,   33,   30,   73,   74,
-   72,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    6,    7,    0,    0,   24,   25,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   37,   38,
-   39,    0,    4,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   60,    0,
-    0,   29,   15,   16,    9,    0,    0,   20,   18,   40,
-   41,    0,   58,    0,    0,    0,    0,   66,   67,   68,
-   69,   34,   61,    0,    0,    0,    0,   59,   35,    0,
-    0,    0,   11,   12,   21,    0,   64,    0,    0,   65,
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     4,     6,     8,    11,    13,    16,    19,
+      21,    25,    29,    35,    41,    43,    46,    50,    54,    56,
+      60,    62,    66,    72,    74,    76,    79,    82,    84,    86,
+      88,    92,    95,    98,   101,   104,   109,   115,   119,   122,
+     125,   128,   132,   136,   139,   142,   145,   148,   152,   156,
+     160,   164,   168,   172,   176,   179,   183,   185,   187,   191,
+     195,   200,   202,   205,   207,   211,   215,   220,   223,   226,
+     229,   232,   234,   236,   238,   240
 };
-static const short yydgoto[] = {                         31,
-   32,   33,   34,   35,   36,   84,   38,   43,   44,   52,
-   85,   45,   98,   99,  118,  131,
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      67,     0,    -1,    -1,    68,    -1,    69,    -1,    68,    69,
+      -1,    70,    -1,    37,    69,    -1,    38,    69,    -1,    71,
+      -1,    71,    14,    70,    -1,    71,    15,    71,    -1,    71,
+      15,    71,    14,    70,    -1,    71,    15,    71,    15,    70,
+      -1,    72,    -1,     5,    71,    -1,    71,     3,    71,    -1,
+      71,     4,    71,    -1,    73,    -1,    74,     7,    72,    -1,
+      74,    -1,    74,     6,    73,    -1,    74,     6,    74,     7,
+      72,    -1,    26,    -1,    27,    -1,    42,    27,    -1,    43,
+      26,    -1,    61,    -1,    62,    -1,    63,    -1,    64,    68,
+      65,    -1,    11,    77,    -1,     8,    77,    -1,     9,    77,
+      -1,    10,    77,    -1,    32,    64,    78,    65,    -1,    12,
+      83,    68,    13,    83,    -1,    12,    83,    68,    -1,    74,
+      23,    -1,    74,    24,    -1,    74,    41,    -1,    74,    22,
+      74,    -1,    74,    44,    74,    -1,    18,    74,    -1,    19,
+      74,    -1,    20,    74,    -1,    21,    74,    -1,    17,    82,
+      74,    -1,    16,    82,    74,    -1,    28,    75,    74,    -1,
+      29,    75,    74,    -1,    31,    75,    74,    -1,    30,    75,
+      74,    -1,    39,    82,    74,    -1,    40,    74,    -1,    45,
+      82,    74,    -1,    82,    -1,    68,    -1,    76,    25,    68,
+      -1,    64,    76,    65,    -1,    75,    64,    76,    65,    -1,
+      81,    -1,    78,    81,    -1,    68,    -1,    79,    25,    68,
+      -1,    64,    79,    65,    -1,    75,    64,    79,    65,    -1,
+      33,    80,    -1,    34,    80,    -1,    35,    80,    -1,    36,
+      80,    -1,    26,    -1,    27,    -1,    82,    -1,    64,    -1,
+      65,    -1
 };
-static const short yysindex[] = {                      1488,
- 1527, -120, -120, -120, -120, -123, -249, -249, 1566, 1566,
- 1566, 1566,    0,    0, -249, -249, -249, -249, -115, 1488,
- 1488, -249, 1566, -256, -251, -249,    0,    0,    0, 1488,
-    0,    0,    0, -221,    0, -233, 1488,    0,    0,    0,
-    0, 1488,  -85,    0,    0,    0,    0,    0,    0,    0,
-    0, 1488, 1566, 1566, -195, -195, -195, -195, 1566, 1566,
- 1566, 1566, -272,    0,    0, 1566, -195,    0,    0, 1566,
- 1402, 1527, 1527, 1527, 1527, 1566, 1566, 1566,    0,    0,
-    0, 1566,    0, 1488, -113, 1488, 1444, -195, -195, -195,
- -195, -195, -195, -117, -117, -117, -117, -118,    0, -195,
- -195,    0,    0,    0,    0, -167, -189,    0,    0,    0,
-    0, 1488,    0, -106, -123, 1488,  -83,    0,    0,    0,
-    0,    0,    0, 1527, 1527, 1566, 1488,    0,    0, 1488,
- -105, 1488,    0,    0,    0, 1488,    0, -104, 1488,    0,
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   122,   122,   124,   129,   131,   142,   144,   146,   151,
+     153,   155,   157,   159,   164,   166,   168,   170,   175,   177,
+     182,   184,   186,   191,   193,   195,   197,   199,   201,   203,
+     205,   207,   209,   211,   213,   215,   217,   219,   221,   223,
+     225,   227,   229,   231,   233,   235,   237,   239,   241,   243,
+     245,   247,   249,   251,   253,   255,   260,   270,   272,   277,
+     279,   284,   286,   291,   293,   298,   300,   305,   307,   309,
+     311,   315,   317,   322,   324,   326
 };
-static const short yyrindex[] = {                        41,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    1,    0, 1220,   46,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   85,  128,  363,  406,    0,    0,
-    0,    0,    0,    0,    0,    0,  449,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, -103,    0,    0,  185,  492,  727,  770,
-  813,  856, 1091,    0,    0,    0,    0,    0,    0, 1134,
- 1177,    0,    0,    0,    0,   42, 1220,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0, -102,    0,    0, -101,
-    0,    0,    0,    0,    0,    0,    0,    0,  -99,    0,
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "OVER", "SMALLOVER", "SQRT", "SUB",
+  "SUP", "LPILE", "RPILE", "CPILE", "PILE", "LEFT", "RIGHT", "TO", "FROM",
+  "SIZE", "FONT", "ROMAN", "BOLD", "ITALIC", "FAT", "ACCENT", "BAR",
+  "UNDER", "ABOVE", "TEXT", "QUOTED_TEXT", "FWD", "BACK", "DOWN", "UP",
+  "MATRIX", "COL", "LCOL", "RCOL", "CCOL", "MARK", "LINEUP", "TYPE",
+  "VCENTER", "PRIME", "SPLIT", "NOSPLIT", "UACCENT", "SPECIAL", "SPACE",
+  "GFONT", "GSIZE", "DEFINE", "NDEFINE", "TDEFINE", "SDEFINE", "UNDEF",
+  "IFDEF", "INCLUDE", "DELIM", "CHARTYPE", "SET", "GRFONT", "GBFONT",
+  "'^'", "'~'", "'\\t'", "'{'", "'}'", "$accept", "top", "equation",
+  "mark", "from_to", "sqrt_over", "script", "nonsup", "simple", "number",
+  "pile_element_list", "pile_arg", "column_list", "column_element_list",
+  "column_arg", "column", "text", "delim", 0
 };
-static const short yygindex[] = {                         0,
-   -7,  -69,    3,  -66,  458,    9,  -26,   52,   27,  -63,
-  -32,   54,    0,  -35,    2,  -59,
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,    94,   126,     9,   123,   125
 };
-#define YYTABLESIZE 1865
-static const short yytable[] = {                         49,
-    8,   50,   42,   39,  105,  116,  122,   63,   37,    8,
-  109,  113,   64,   65,   94,   95,   96,   97,  128,  137,
-  140,   56,   57,   62,   68,   63,   76,   77,   69,   83,
-   40,   41,   51,   53,   54,   72,   73,   86,   71,  132,
-    1,   10,   78,   79,   80,    2,   74,   75,   66,  108,
-   10,  129,   70,  114,  133,  134,   46,   47,   48,  135,
-   87,   81,  123,   83,   82,    0,   59,   60,   61,   62,
-   76,  126,  138,    0,  103,  104,   83,  106,    0,   83,
-   78,   79,   80,    0,   42,    0,   78,   79,   80,   72,
-   73,    0,    0,   42,    8,    0,  119,  120,  121,   81,
-  124,  125,   82,    0,    0,   81,    0,    0,   82,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   83,
-  127,    0,   83,    8,  130,    8,    8,   43,    0,    0,
-    0,   83,    0,    0,    0,   10,   43,    0,    0,    0,
-  130,   51,    0,    0,  139,  117,  117,  117,  117,    0,
-    0,    0,    0,    0,    0,    0,   40,   41,    0,   40,
-   41,    0,   40,   41,   10,  112,   10,   10,   94,   95,
-   96,   97,  112,  136,  136,   56,   57,   62,   42,   63,
-    0,    0,    0,    0,   36,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   42,    0,   42,
-   42,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   43,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   43,    0,   43,   43,    0,    0,    0,    0,    0,    8,
-    8,    8,    8,    8,    8,    8,    8,    8,    0,    0,
-    8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-    8,    8,    8,    8,    8,    8,    8,    0,    0,    0,
-    0,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-   10,   10,   10,   10,   10,   10,   10,   10,   10,   36,
-    0,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   10,   10,   10,   10,   10,   10,    0,    0,
-    0,    0,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-   42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-    0,    0,   44,   42,   42,   42,   42,   42,   42,   42,
-   42,   44,    0,    0,    0,   42,   42,   42,   42,    0,
-   42,   42,    0,   42,   43,   43,   43,   43,   43,   43,
-   43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
-   43,   43,   43,    0,    0,   45,   43,   43,   43,   43,
-   43,   43,   43,   43,   45,    0,    0,    0,   43,   43,
-   43,   43,    0,   43,   43,    0,   43,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   36,   36,    0,   36,   36,    0,    0,   53,    0,
-    0,    0,   36,   36,    0,    0,   44,   53,    0,    0,
-   36,   36,   36,   36,    0,    0,   55,   56,   57,   58,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   36,
-   67,    0,   36,    0,    0,   44,    0,   44,   44,    0,
-    0,   47,    0,    0,    0,    0,    0,    0,    0,   45,
-   47,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   88,   89,    0,    0,    0,    0,   90,   91,   92,   93,
-    0,    0,    0,  100,    0,    0,    0,  101,   45,    0,
-   45,   45,    0,  107,    0,  110,    0,    0,    0,  111,
-    0,    0,   53,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   53,    0,   53,   53,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   47,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   47,    0,   47,   47,    0,   44,
-   44,   44,   44,   44,   44,   44,   44,   44,   44,   44,
-   44,   44,   44,   44,   44,   44,   44,   44,    0,    0,
-    0,   44,   44,   44,   44,   44,   44,   44,   44,    0,
-    0,    0,    0,   44,   44,   44,   44,    0,   44,   44,
-    0,   44,   45,   45,   45,   45,   45,   45,   45,   45,
-   45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-   45,    0,    0,    0,   45,   45,   45,   45,   45,   45,
-   45,   45,    0,    0,    0,    0,   45,   45,   45,   45,
-    0,   45,   45,    0,   45,   53,   53,   53,   53,   53,
-   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
-   53,   53,   53,   53,    0,    0,   46,   53,   53,   53,
-   53,   53,   53,   53,   53,   46,    0,    0,    0,   53,
-   53,   53,   53,    0,   53,   53,    0,   53,   47,   47,
-   47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-   47,   47,   47,   47,   47,   47,   47,    0,    0,   48,
-   47,   47,   47,   47,   47,   47,   47,   47,   48,    0,
-    0,    0,   47,   47,   47,   47,    0,   47,   47,    0,
-   47,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   49,    0,    0,    0,    0,    0,    0,    0,
-   46,   49,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   46,
-    0,   46,   46,    0,    0,   51,    0,    0,    0,    0,
-    0,    0,    0,   48,   51,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   48,    0,   48,   48,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   49,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   49,    0,   49,   49,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   51,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   51,    0,
-   51,   51,    0,   46,   46,   46,   46,   46,   46,   46,
-   46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
-   46,   46,    0,    0,    0,   46,   46,   46,   46,   46,
-   46,   46,   46,    0,    0,    0,    0,   46,   46,   46,
-   46,    0,   46,   46,    0,   46,   48,   48,   48,   48,
-   48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-   48,   48,   48,   48,   48,    0,    0,    0,   48,   48,
-   48,   48,   48,   48,   48,   48,    0,    0,    0,    0,
-   48,   48,   48,   48,    0,   48,   48,    0,   48,   49,
-   49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-   49,   49,   49,   49,   49,   49,   49,   49,    0,    0,
-   50,   49,   49,   49,   49,   49,   49,   49,   49,   50,
-    0,    0,    0,   49,   49,   49,   49,    0,   49,   49,
-    0,   49,   51,   51,   51,   51,   51,   51,   51,   51,
-   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
-   51,    0,    0,   52,   51,   51,   51,   51,   51,   51,
-   51,   51,   52,    0,    0,    0,   51,   51,   51,   51,
-    0,   51,   51,    0,   51,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   54,    0,    0,    0,
-    0,    0,    0,    0,   50,   54,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   50,    0,   50,   50,    0,    0,   19,
-    0,    0,    0,    0,    0,    0,    0,   52,   19,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   52,    0,   52,   52,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   54,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   54,
-    0,   54,   54,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   19,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   19,    0,   19,   19,    0,   50,   50,   50,
-   50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-   50,   50,   50,   50,   50,   50,    0,    0,    0,   50,
-   50,   50,   50,   50,   50,   50,   50,    0,    0,    0,
-    0,   50,   50,   50,   50,    0,   50,   50,    0,   50,
-   52,   52,   52,   52,   52,   52,   52,   52,   52,   52,
-   52,   52,   52,   52,   52,   52,   52,   52,   52,    0,
-   29,    0,   52,   52,   52,   52,   52,   52,   52,   52,
-    0,    0,    0,    0,   52,   52,   52,   52,    0,   52,
-   52,    0,   52,   54,   54,   54,   54,   54,   54,   54,
-   54,   54,   54,   54,   54,   54,   54,   54,   54,   54,
-   54,   54,   29,    0,    0,   54,   54,   54,   54,   54,
-   54,   54,   54,    0,    0,    0,    0,   54,   54,   54,
-   54,    0,   54,   54,    0,   54,   19,   19,   19,    0,
-    0,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-   19,   19,   19,   19,   19,   27,   29,    0,   19,   19,
-   19,   19,   19,   19,   19,   19,    0,    0,    0,    0,
-   19,   19,   19,   19,    0,   19,   19,    0,   19,    0,
-    0,    0,    0,    0,   30,    0,  102,   28,    0,    0,
-    0,    0,    0,    0,    0,   29,    0,   27,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   30,    0,    0,   28,
-    0,    0,    0,    0,   29,    0,    0,    0,    0,    0,
-    0,   27,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   30,    0,    0,   28,    0,    0,    0,    0,    0,    0,
-   27,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   30,
-    0,    0,   28,    0,    0,    0,    0,    0,    0,   27,
-    1,    0,    0,    2,    3,    4,    5,    6,    0,    0,
-    0,    7,    8,    9,   10,   11,   12,    0,    0,    0,
-    0,   13,   14,   15,   16,   17,   18,   19,   30,    0,
-    0,   28,   20,   21,   22,   23,    0,   24,   25,    0,
-   26,    0,    1,    0,    0,    2,    3,    4,    5,    6,
-  115,    0,    0,    7,    8,    9,   10,   11,   12,    0,
-    0,    0,    0,   13,   14,   15,   16,   17,   18,   19,
-    0,    0,    0,    0,   20,   21,   22,   23,    0,   24,
-   25,    0,   26,    0,    0,    0,    1,    0,    0,    2,
-    3,    4,    5,    6,    0,    0,    0,    7,    8,    9,
-   10,   11,   12,    0,    0,    0,    0,   13,   14,   15,
-   16,   17,   18,   19,    0,    0,    0,    0,   20,   21,
-   22,   23,    0,   24,   25,    1,   26,    0,    2,    3,
-    4,    5,    6,    0,    0,    0,    7,    8,    9,   10,
-   11,   12,    0,    0,    0,    0,   13,   14,   15,   16,
-   17,   18,   19,    0,    0,    0,    0,    0,    0,   22,
-   23,    0,   24,   25,    0,   26,    0,    2,    3,    4,
-    5,    6,    0,    0,    0,    7,    8,    9,   10,   11,
-   12,    0,    0,    0,    0,   13,   14,   15,   16,   17,
-   18,   19,    0,    0,    0,    0,    0,    0,   22,   23,
-    0,   24,   25,    0,   26,
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    66,    67,    67,    68,    68,    69,    69,    69,    70,
+      70,    70,    70,    70,    71,    71,    71,    71,    72,    72,
+      73,    73,    73,    74,    74,    74,    74,    74,    74,    74,
+      74,    74,    74,    74,    74,    74,    74,    74,    74,    74,
+      74,    74,    74,    74,    74,    74,    74,    74,    74,    74,
+      74,    74,    74,    74,    74,    74,    75,    76,    76,    77,
+      77,    78,    78,    79,    79,    80,    80,    81,    81,    81,
+      81,    82,    82,    83,    83,    83
 };
-static const short yycheck[] = {                        123,
-    0,  125,  123,    1,   74,  123,  125,  123,    0,    9,
-   77,  125,   20,   21,  287,  288,  289,  290,  125,  125,
-  125,  125,  125,  125,  281,  125,  260,  261,  280,   37,
-  280,  281,    6,    7,    8,  257,  258,  123,   30,  123,
-    0,    0,  276,  277,  278,    0,  268,  269,   22,   76,
-    9,  115,   26,   86,  124,  125,    3,    4,    5,  126,
-   52,  295,   98,   71,  298,   -1,   15,   16,   17,   18,
-  260,  261,  132,   -1,   72,   73,   84,   75,   -1,   87,
-  276,  277,  278,   -1,    0,   -1,  276,  277,  278,  257,
-  258,   -1,   -1,    9,   94,   -1,   95,   96,   97,  295,
-  268,  269,  298,   -1,   -1,  295,   -1,   -1,  298,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  127,
-  112,   -1,  130,  123,  116,  125,  126,    0,   -1,   -1,
-   -1,  139,   -1,   -1,   -1,   94,    9,   -1,   -1,   -1,
-  132,  115,   -1,   -1,  136,   94,   95,   96,   97,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  280,  281,   -1,  280,
-  281,   -1,  280,  281,  123,  279,  125,  126,  287,  288,
-  289,  290,  279,  279,  279,  279,  279,  279,   94,  279,
-   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,  125,
-  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  123,   -1,  125,  126,   -1,   -1,   -1,   -1,   -1,  259,
-  260,  261,  262,  263,  264,  265,  266,  267,   -1,   -1,
-  270,  271,  272,  273,  274,  275,  276,  277,  278,  279,
-  280,  281,  282,  283,  284,  285,  286,   -1,   -1,   -1,
-   -1,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  259,  260,  261,  262,  263,  264,  265,  266,  267,  125,
-   -1,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,  281,  282,  283,  284,  285,  286,   -1,   -1,
-   -1,   -1,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  257,  258,  259,  260,  261,  262,  263,  264,  265,
-  266,  267,  268,  269,  270,  271,  272,  273,  274,  275,
-   -1,   -1,    0,  279,  280,  281,  282,  283,  284,  285,
-  286,    9,   -1,   -1,   -1,  291,  292,  293,  294,   -1,
-  296,  297,   -1,  299,  257,  258,  259,  260,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,   -1,   -1,    0,  279,  280,  281,  282,
-  283,  284,  285,  286,    9,   -1,   -1,   -1,  291,  292,
-  293,  294,   -1,  296,  297,   -1,  299,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,   -1,  260,  261,   -1,   -1,    0,   -1,
-   -1,   -1,  268,  269,   -1,   -1,   94,    9,   -1,   -1,
-  276,  277,  278,  279,   -1,   -1,    9,   10,   11,   12,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  295,
-   23,   -1,  298,   -1,   -1,  123,   -1,  125,  126,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,
-    9,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   53,   54,   -1,   -1,   -1,   -1,   59,   60,   61,   62,
-   -1,   -1,   -1,   66,   -1,   -1,   -1,   70,  123,   -1,
-  125,  126,   -1,   76,   -1,   78,   -1,   -1,   -1,   82,
-   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  123,   -1,  125,  126,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   94,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  123,   -1,  125,  126,   -1,  257,
-  258,  259,  260,  261,  262,  263,  264,  265,  266,  267,
-  268,  269,  270,  271,  272,  273,  274,  275,   -1,   -1,
-   -1,  279,  280,  281,  282,  283,  284,  285,  286,   -1,
-   -1,   -1,   -1,  291,  292,  293,  294,   -1,  296,  297,
-   -1,  299,  257,  258,  259,  260,  261,  262,  263,  264,
-  265,  266,  267,  268,  269,  270,  271,  272,  273,  274,
-  275,   -1,   -1,   -1,  279,  280,  281,  282,  283,  284,
-  285,  286,   -1,   -1,   -1,   -1,  291,  292,  293,  294,
-   -1,  296,  297,   -1,  299,  257,  258,  259,  260,  261,
-  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
-  272,  273,  274,  275,   -1,   -1,    0,  279,  280,  281,
-  282,  283,  284,  285,  286,    9,   -1,   -1,   -1,  291,
-  292,  293,  294,   -1,  296,  297,   -1,  299,  257,  258,
-  259,  260,  261,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  274,  275,   -1,   -1,    0,
-  279,  280,  281,  282,  283,  284,  285,  286,    9,   -1,
-   -1,   -1,  291,  292,  293,  294,   -1,  296,  297,   -1,
-  299,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   94,    9,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,
-   -1,  125,  126,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   94,    9,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  123,   -1,  125,  126,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  123,   -1,  125,  126,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,
-  125,  126,   -1,  257,  258,  259,  260,  261,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,   -1,   -1,   -1,  279,  280,  281,  282,  283,
-  284,  285,  286,   -1,   -1,   -1,   -1,  291,  292,  293,
-  294,   -1,  296,  297,   -1,  299,  257,  258,  259,  260,
-  261,  262,  263,  264,  265,  266,  267,  268,  269,  270,
-  271,  272,  273,  274,  275,   -1,   -1,   -1,  279,  280,
-  281,  282,  283,  284,  285,  286,   -1,   -1,   -1,   -1,
-  291,  292,  293,  294,   -1,  296,  297,   -1,  299,  257,
-  258,  259,  260,  261,  262,  263,  264,  265,  266,  267,
-  268,  269,  270,  271,  272,  273,  274,  275,   -1,   -1,
-    0,  279,  280,  281,  282,  283,  284,  285,  286,    9,
-   -1,   -1,   -1,  291,  292,  293,  294,   -1,  296,  297,
-   -1,  299,  257,  258,  259,  260,  261,  262,  263,  264,
-  265,  266,  267,  268,  269,  270,  271,  272,  273,  274,
-  275,   -1,   -1,    0,  279,  280,  281,  282,  283,  284,
-  285,  286,    9,   -1,   -1,   -1,  291,  292,  293,  294,
-   -1,  296,  297,   -1,  299,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   94,    9,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  123,   -1,  125,  126,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,    9,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,  125,  126,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,
-   -1,  125,  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  123,   -1,  125,  126,   -1,  257,  258,  259,
-  260,  261,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  274,  275,   -1,   -1,   -1,  279,
-  280,  281,  282,  283,  284,  285,  286,   -1,   -1,   -1,
-   -1,  291,  292,  293,  294,   -1,  296,  297,   -1,  299,
-  257,  258,  259,  260,  261,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,  272,  273,  274,  275,   -1,
-    9,   -1,  279,  280,  281,  282,  283,  284,  285,  286,
-   -1,   -1,   -1,   -1,  291,  292,  293,  294,   -1,  296,
-  297,   -1,  299,  257,  258,  259,  260,  261,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,    9,   -1,   -1,  279,  280,  281,  282,  283,
-  284,  285,  286,   -1,   -1,   -1,   -1,  291,  292,  293,
-  294,   -1,  296,  297,   -1,  299,  257,  258,  259,   -1,
-   -1,  262,  263,  264,  265,  266,  267,  268,  269,  270,
-  271,  272,  273,  274,  275,   94,    9,   -1,  279,  280,
-  281,  282,  283,  284,  285,  286,   -1,   -1,   -1,   -1,
-  291,  292,  293,  294,   -1,  296,  297,   -1,  299,   -1,
-   -1,   -1,   -1,   -1,  123,   -1,  125,  126,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    9,   -1,   94,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,   -1,  126,
-   -1,   -1,   -1,   -1,    9,   -1,   -1,   -1,   -1,   -1,
-   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  123,   -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,
-   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,
-   -1,   -1,  126,   -1,   -1,   -1,   -1,   -1,   -1,   94,
-  259,   -1,   -1,  262,  263,  264,  265,  266,   -1,   -1,
-   -1,  270,  271,  272,  273,  274,  275,   -1,   -1,   -1,
-   -1,  280,  281,  282,  283,  284,  285,  286,  123,   -1,
-   -1,  126,  291,  292,  293,  294,   -1,  296,  297,   -1,
-  299,   -1,  259,   -1,   -1,  262,  263,  264,  265,  266,
-  267,   -1,   -1,  270,  271,  272,  273,  274,  275,   -1,
-   -1,   -1,   -1,  280,  281,  282,  283,  284,  285,  286,
-   -1,   -1,   -1,   -1,  291,  292,  293,  294,   -1,  296,
-  297,   -1,  299,   -1,   -1,   -1,  259,   -1,   -1,  262,
-  263,  264,  265,  266,   -1,   -1,   -1,  270,  271,  272,
-  273,  274,  275,   -1,   -1,   -1,   -1,  280,  281,  282,
-  283,  284,  285,  286,   -1,   -1,   -1,   -1,  291,  292,
-  293,  294,   -1,  296,  297,  259,  299,   -1,  262,  263,
-  264,  265,  266,   -1,   -1,   -1,  270,  271,  272,  273,
-  274,  275,   -1,   -1,   -1,   -1,  280,  281,  282,  283,
-  284,  285,  286,   -1,   -1,   -1,   -1,   -1,   -1,  293,
-  294,   -1,  296,  297,   -1,  299,   -1,  262,  263,  264,
-  265,  266,   -1,   -1,   -1,  270,  271,  272,  273,  274,
-  275,   -1,   -1,   -1,   -1,  280,  281,  282,  283,  284,
-  285,  286,   -1,   -1,   -1,   -1,   -1,   -1,  293,  294,
-   -1,  296,  297,   -1,  299,
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     1,     1,     2,     1,     2,     2,     1,
+       3,     3,     5,     5,     1,     2,     3,     3,     1,     3,
+       1,     3,     5,     1,     1,     2,     2,     1,     1,     1,
+       3,     2,     2,     2,     2,     4,     5,     3,     2,     2,
+       2,     3,     3,     2,     2,     2,     2,     3,     3,     3,
+       3,     3,     3,     3,     2,     3,     1,     1,     3,     3,
+       4,     1,     2,     1,     3,     3,     4,     2,     2,     2,
+       2,     1,     1,     1,     1,     1
 };
-#define YYFINAL 31
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 314
-#if YYDEBUG
-static const char *yyname[] = {
 
-"end-of-file",0,0,0,0,0,0,0,0,"'\\t'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'{'",0,"'}'","'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"OVER",
-"SMALLOVER","SQRT","SUB","SUP","LPILE","RPILE","CPILE","PILE","LEFT","RIGHT",
-"TO","FROM","SIZE","FONT","ROMAN","BOLD","ITALIC","FAT","ACCENT","BAR","UNDER",
-"ABOVE","TEXT","QUOTED_TEXT","FWD","BACK","DOWN","UP","MATRIX","COL","LCOL",
-"RCOL","CCOL","MARK","LINEUP","TYPE","VCENTER","PRIME","SPLIT","NOSPLIT",
-"UACCENT","SPECIAL","SPACE","GFONT","GSIZE","DEFINE","NDEFINE","TDEFINE",
-"SDEFINE","UNDEF","IFDEF","INCLUDE","DELIM","CHARTYPE","SET","GRFONT","GBFONT",
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    23,    24,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    27,    28,    29,
+       0,     0,     3,     4,     6,     9,    14,    18,    20,    15,
+      71,    72,     0,     0,    32,    56,    33,    34,    31,    74,
+      75,    73,     0,     0,     0,    43,    44,    45,    46,     0,
+       0,     0,     0,     0,     7,     8,     0,    54,    25,    26,
+       0,     0,     1,     5,     0,     0,     0,     0,     0,     0,
+       0,    38,    39,    40,     0,    57,     0,     0,    37,    48,
+      47,    49,    50,    52,    51,     0,     0,     0,     0,     0,
+      61,    53,    55,    30,    16,    17,    10,    11,    21,    20,
+      19,    41,    42,     0,    59,     0,     0,     0,     0,    67,
+      68,    69,    70,    35,    62,     0,     0,     0,    58,    60,
+      36,    63,     0,     0,    12,    13,    22,     0,    65,     0,
+      64,    66
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    31,    85,    33,    34,    35,    36,    37,    38,    43,
+      86,    44,    99,   132,   119,   100,    45,    52
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -76
+static const yytype_int16 yypact[] =
+{
+     230,   269,     6,     6,     6,     6,     2,    14,    14,   308,
+     308,   308,   308,   -76,   -76,    14,    14,    14,    14,   -50,
+     230,   230,    14,   308,     4,    23,    14,   -76,   -76,   -76,
+     230,    24,   230,   -76,   -76,    70,   -76,   -76,    20,   -76,
+     -76,   -76,   230,   -44,   -76,   -76,   -76,   -76,   -76,   -76,
+     -76,   -76,   230,   308,   308,    57,    57,    57,    57,   308,
+     308,   308,   308,     3,   -76,   -76,   308,    57,   -76,   -76,
+     308,   130,   -76,   -76,   269,   269,   269,   269,   308,   308,
+     308,   -76,   -76,   -76,   308,   230,   -12,   230,   191,    57,
+      57,    57,    57,    57,    57,     8,     8,     8,     8,    12,
+     -76,    57,    57,   -76,   -76,   -76,   -76,    79,   -76,   335,
+     -76,   -76,   -76,   230,   -76,    -6,     2,   230,    28,   -76,
+     -76,   -76,   -76,   -76,   -76,   269,   269,   308,   230,   -76,
+     -76,   230,    -3,   230,   -76,   -76,   -76,   230,   -76,    -2,
+     230,   -76
 };
-static const char *yyrule[] = {
-"$accept : top",
-"top :",
-"top : equation",
-"equation : mark",
-"equation : equation mark",
-"mark : from_to",
-"mark : MARK mark",
-"mark : LINEUP mark",
-"from_to : sqrt_over",
-"from_to : sqrt_over TO from_to",
-"from_to : sqrt_over FROM sqrt_over",
-"from_to : sqrt_over FROM sqrt_over TO from_to",
-"from_to : sqrt_over FROM sqrt_over FROM from_to",
-"sqrt_over : script",
-"sqrt_over : SQRT sqrt_over",
-"sqrt_over : sqrt_over OVER sqrt_over",
-"sqrt_over : sqrt_over SMALLOVER sqrt_over",
-"script : nonsup",
-"script : simple SUP script",
-"nonsup : simple",
-"nonsup : simple SUB nonsup",
-"nonsup : simple SUB simple SUP script",
-"simple : TEXT",
-"simple : QUOTED_TEXT",
-"simple : SPLIT QUOTED_TEXT",
-"simple : NOSPLIT TEXT",
-"simple : '^'",
-"simple : '~'",
-"simple : '\\t'",
-"simple : '{' equation '}'",
-"simple : PILE pile_arg",
-"simple : LPILE pile_arg",
-"simple : RPILE pile_arg",
-"simple : CPILE pile_arg",
-"simple : MATRIX '{' column_list '}'",
-"simple : LEFT delim equation RIGHT delim",
-"simple : LEFT delim equation",
-"simple : simple BAR",
-"simple : simple UNDER",
-"simple : simple PRIME",
-"simple : simple ACCENT simple",
-"simple : simple UACCENT simple",
-"simple : ROMAN simple",
-"simple : BOLD simple",
-"simple : ITALIC simple",
-"simple : FAT simple",
-"simple : FONT text simple",
-"simple : SIZE text simple",
-"simple : FWD number simple",
-"simple : BACK number simple",
-"simple : UP number simple",
-"simple : DOWN number simple",
-"simple : TYPE text simple",
-"simple : VCENTER simple",
-"simple : SPECIAL text simple",
-"number : text",
-"pile_element_list : equation",
-"pile_element_list : pile_element_list ABOVE equation",
-"pile_arg : '{' pile_element_list '}'",
-"pile_arg : number '{' pile_element_list '}'",
-"column_list : column",
-"column_list : column_list column",
-"column_element_list : equation",
-"column_element_list : column_element_list ABOVE equation",
-"column_arg : '{' column_element_list '}'",
-"column_arg : number '{' column_element_list '}'",
-"column : COL column_arg",
-"column : LCOL column_arg",
-"column : RCOL column_arg",
-"column : CCOL column_arg",
-"text : TEXT",
-"text : QUOTED_TEXT",
-"delim : text",
-"delim : '{'",
-"delim : '}'",
 
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -76,   -76,     0,   -17,   -75,     1,   -67,   -13,    46,    -7,
+       9,    13,   -76,   -47,    22,    -4,    -1,   -29
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] =
+{
+      32,   106,    39,    64,    65,    51,    53,    54,    59,    60,
+      61,    62,   110,   113,    63,    73,    46,    47,    48,   113,
+      87,    66,   137,   137,    72,    70,    78,    79,    40,    41,
+      71,    68,    40,    41,    40,    41,    95,    96,    97,    98,
+      40,    41,    80,    81,    82,    95,    96,    97,    98,    69,
+     134,   135,    88,   114,    73,    55,    56,    57,    58,   129,
+     136,    83,   138,   141,    84,   108,    49,    50,    73,    67,
+      42,    73,   117,    74,    75,   104,   105,   123,   107,    80,
+      81,    82,    74,    75,    76,    77,   139,   130,   118,   118,
+     118,   118,   133,   125,   126,   124,   115,     0,    83,    89,
+      90,    84,     0,     0,     0,    91,    92,    93,    94,     0,
+       0,    73,   101,   128,    73,    51,   102,   131,   120,   121,
+     122,     0,     0,    73,   109,     0,   111,     0,     0,     0,
+     112,     0,     0,   131,     0,     1,     0,   140,     2,     3,
+       4,     5,     6,     0,     0,     0,     7,     8,     9,    10,
+      11,    12,     0,     0,     0,     0,    13,    14,    15,    16,
+      17,    18,    19,     0,     0,     0,     0,    20,    21,    22,
+      23,     0,    24,    25,     0,    26,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    27,    28,    29,    30,   103,     1,     0,     0,     2,
+       3,     4,     5,     6,   116,     0,     0,     7,     8,     9,
+      10,    11,    12,     0,     0,     0,     0,    13,    14,    15,
+      16,    17,    18,    19,     0,     0,     0,     0,    20,    21,
+      22,    23,     0,    24,    25,     1,    26,     0,     2,     3,
+       4,     5,     6,     0,     0,     0,     7,     8,     9,    10,
+      11,    12,    27,    28,    29,    30,    13,    14,    15,    16,
+      17,    18,    19,     0,     0,     0,     0,    20,    21,    22,
+      23,     0,    24,    25,     1,    26,     0,     2,     3,     4,
+       5,     6,     0,     0,     0,     7,     8,     9,    10,    11,
+      12,    27,    28,    29,    30,    13,    14,    15,    16,    17,
+      18,    19,     0,     0,     0,     0,     0,     0,    22,    23,
+       0,    24,    25,     0,    26,     0,     2,     3,     4,     5,
+       6,     0,     0,     0,     7,     8,     9,    10,    11,    12,
+      27,    28,    29,    30,    13,    14,    15,    16,    17,    18,
+      19,    78,   127,     0,     0,     0,     0,    22,    23,     0,
+      24,    25,     0,    26,     0,     0,     0,    80,    81,    82,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    27,
+      28,    29,    30,     0,     0,     0,    83,     0,     0,    84
+};
+
+static const yytype_int16 yycheck[] =
+{
+       0,    76,     1,    20,    21,     6,     7,     8,    15,    16,
+      17,    18,    79,    25,    64,    32,     3,     4,     5,    25,
+      64,    22,    25,    25,     0,    26,     6,     7,    26,    27,
+      30,    27,    26,    27,    26,    27,    33,    34,    35,    36,
+      26,    27,    22,    23,    24,    33,    34,    35,    36,    26,
+     125,   126,    52,    65,    71,     9,    10,    11,    12,    65,
+     127,    41,    65,    65,    44,    78,    64,    65,    85,    23,
+      64,    88,    64,     3,     4,    74,    75,    65,    77,    22,
+      23,    24,     3,     4,    14,    15,   133,   116,    95,    96,
+      97,    98,    64,    14,    15,    99,    87,    -1,    41,    53,
+      54,    44,    -1,    -1,    -1,    59,    60,    61,    62,    -1,
+      -1,   128,    66,   113,   131,   116,    70,   117,    96,    97,
+      98,    -1,    -1,   140,    78,    -1,    80,    -1,    -1,    -1,
+      84,    -1,    -1,   133,    -1,     5,    -1,   137,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    16,    17,    18,    19,
+      20,    21,    -1,    -1,    -1,    -1,    26,    27,    28,    29,
+      30,    31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,
+      40,    -1,    42,    43,    -1,    45,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    61,    62,    63,    64,    65,     5,    -1,    -1,     8,
+       9,    10,    11,    12,    13,    -1,    -1,    16,    17,    18,
+      19,    20,    21,    -1,    -1,    -1,    -1,    26,    27,    28,
+      29,    30,    31,    32,    -1,    -1,    -1,    -1,    37,    38,
+      39,    40,    -1,    42,    43,     5,    45,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    16,    17,    18,    19,
+      20,    21,    61,    62,    63,    64,    26,    27,    28,    29,
+      30,    31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,
+      40,    -1,    42,    43,     5,    45,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    -1,    16,    17,    18,    19,    20,
+      21,    61,    62,    63,    64,    26,    27,    28,    29,    30,
+      31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    39,    40,
+      -1,    42,    43,    -1,    45,    -1,     8,     9,    10,    11,
+      12,    -1,    -1,    -1,    16,    17,    18,    19,    20,    21,
+      61,    62,    63,    64,    26,    27,    28,    29,    30,    31,
+      32,     6,     7,    -1,    -1,    -1,    -1,    39,    40,    -1,
+      42,    43,    -1,    45,    -1,    -1,    -1,    22,    23,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,
+      62,    63,    64,    -1,    -1,    -1,    41,    -1,    -1,    44
 };
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     5,     8,     9,    10,    11,    12,    16,    17,    18,
+      19,    20,    21,    26,    27,    28,    29,    30,    31,    32,
+      37,    38,    39,    40,    42,    43,    45,    61,    62,    63,
+      64,    67,    68,    69,    70,    71,    72,    73,    74,    71,
+      26,    27,    64,    75,    77,    82,    77,    77,    77,    64,
+      65,    82,    83,    82,    82,    74,    74,    74,    74,    75,
+      75,    75,    75,    64,    69,    69,    82,    74,    27,    26,
+      82,    68,     0,    69,     3,     4,    14,    15,     6,     7,
+      22,    23,    24,    41,    44,    68,    76,    64,    68,    74,
+      74,    74,    74,    74,    74,    33,    34,    35,    36,    78,
+      81,    74,    74,    65,    71,    71,    70,    71,    73,    74,
+      72,    74,    74,    25,    65,    76,    13,    64,    75,    80,
+      80,    80,    80,    65,    81,    14,    15,     7,    68,    65,
+      83,    68,    79,    64,    70,    70,    72,    25,    65,    79,
+      68,    65
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
 #if YYDEBUG
-#include <stdio.h>
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
 
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
 
-#define YYINITSTACKSIZE 500
-
-int      yydebug;
-int      yynerrs;
-int      yyerrflag;
-int      yychar;
-short   *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* variables for the parser stack */
-static short   *yyss;
-static short   *yysslim;
-static YYSTYPE *yyvs;
-static unsigned yystacksize;
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(void)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = yystacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = yyssp - yyss;
-    newss = (yyss != 0)
-          ? (short *)realloc(yyss, newsize * sizeof(*newss))
-          : (short *)malloc(newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    yyss  = newss;
-    yyssp = newss + i;
-    newvs = (yyvs != 0)
-          ? (YYSTYPE *)realloc(yyvs, newsize * sizeof(*newvs))
-          : (YYSTYPE *)malloc(newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    yyvs = newvs;
-    yyvsp = newvs + i;
-    yystacksize = newsize;
-    yysslim = yyss + newsize - 1;
-    return 0;
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      YYFPRINTF (stderr, "\n");
+    }
 }
 
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
 
-int
-YYPARSE_DECL()
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
 {
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
 
-    if ((yys = getenv("YYDEBUG")) != 0)
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
     {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
     }
-#endif
 
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-    if (yyss == NULL && yygrowstack()) goto yyoverflow;
-    yyssp = yyss;
-    yyvsp = yyvs;
-    yystate = 0;
-    *yyssp = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
     {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yysslim && yygrowstack())
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yyssp = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
+
+      default:
+	break;
     }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+}
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
     {
-        yyn = yytable[yyn];
-        goto yyreduce;
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
     }
-    if (yyerrflag) goto yyinrecovery;
 
-    yyerror("syntax error");
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-    goto yyerrlab;
+  if (yystate == YYFINAL)
+    YYACCEPT;
 
-yyerrlab:
-    ++yynerrs;
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
 
-yyinrecovery:
-    if (yyerrflag < 3)
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
     {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yysslim && yygrowstack())
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yyssp = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
     }
-    else
+
+  if (yychar <= YYEOF)
     {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
     }
 
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yyvsp[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-case 2:
+        case 3:
+
+/* Line 1455 of yacc.c  */
 #line 125 "eqn.y"
-	{ yyvsp[0].b->top_level(); non_empty_flag = 1; }
-break;
-case 3:
+    { (yyvsp[(1) - (1)].b)->top_level(); non_empty_flag = 1; }
+    break;
+
+  case 4:
+
+/* Line 1455 of yacc.c  */
 #line 130 "eqn.y"
-	{ yyval.b = yyvsp[0].b; }
-break;
-case 4:
+    { (yyval.b) = (yyvsp[(1) - (1)].b); }
+    break;
+
+  case 5:
+
+/* Line 1455 of yacc.c  */
 #line 132 "eqn.y"
-	{
-		  list_box *lb = yyvsp[-1].b->to_list_box();
+    {
+		  list_box *lb = (yyvsp[(1) - (2)].b)->to_list_box();
 		  if (!lb)
-		    lb = new list_box(yyvsp[-1].b);
-		  lb->append(yyvsp[0].b);
-		  yyval.b = lb;
+		    lb = new list_box((yyvsp[(1) - (2)].b));
+		  lb->append((yyvsp[(2) - (2)].b));
+		  (yyval.b) = lb;
 		}
-break;
-case 5:
+    break;
+
+  case 6:
+
+/* Line 1455 of yacc.c  */
 #line 143 "eqn.y"
-	{ yyval.b = yyvsp[0].b; }
-break;
-case 6:
+    { (yyval.b) = (yyvsp[(1) - (1)].b); }
+    break;
+
+  case 7:
+
+/* Line 1455 of yacc.c  */
 #line 145 "eqn.y"
-	{ yyval.b = make_mark_box(yyvsp[0].b); }
-break;
-case 7:
+    { (yyval.b) = make_mark_box((yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 8:
+
+/* Line 1455 of yacc.c  */
 #line 147 "eqn.y"
-	{ yyval.b = make_lineup_box(yyvsp[0].b); }
-break;
-case 8:
+    { (yyval.b) = make_lineup_box((yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 9:
+
+/* Line 1455 of yacc.c  */
 #line 152 "eqn.y"
-	{ yyval.b = yyvsp[0].b; }
-break;
-case 9:
+    { (yyval.b) = (yyvsp[(1) - (1)].b); }
+    break;
+
+  case 10:
+
+/* Line 1455 of yacc.c  */
 #line 154 "eqn.y"
-	{ yyval.b = make_limit_box(yyvsp[-2].b, 0, yyvsp[0].b); }
-break;
-case 10:
+    { (yyval.b) = make_limit_box((yyvsp[(1) - (3)].b), 0, (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 11:
+
+/* Line 1455 of yacc.c  */
 #line 156 "eqn.y"
-	{ yyval.b = make_limit_box(yyvsp[-2].b, yyvsp[0].b, 0); }
-break;
-case 11:
+    { (yyval.b) = make_limit_box((yyvsp[(1) - (3)].b), (yyvsp[(3) - (3)].b), 0); }
+    break;
+
+  case 12:
+
+/* Line 1455 of yacc.c  */
 #line 158 "eqn.y"
-	{ yyval.b = make_limit_box(yyvsp[-4].b, yyvsp[-2].b, yyvsp[0].b); }
-break;
-case 12:
+    { (yyval.b) = make_limit_box((yyvsp[(1) - (5)].b), (yyvsp[(3) - (5)].b), (yyvsp[(5) - (5)].b)); }
+    break;
+
+  case 13:
+
+/* Line 1455 of yacc.c  */
 #line 160 "eqn.y"
-	{ yyval.b = make_limit_box(yyvsp[-4].b, make_limit_box(yyvsp[-2].b, yyvsp[0].b, 0), 0); }
-break;
-case 13:
+    { (yyval.b) = make_limit_box((yyvsp[(1) - (5)].b), make_limit_box((yyvsp[(3) - (5)].b), (yyvsp[(5) - (5)].b), 0), 0); }
+    break;
+
+  case 14:
+
+/* Line 1455 of yacc.c  */
 #line 165 "eqn.y"
-	{ yyval.b = yyvsp[0].b; }
-break;
-case 14:
+    { (yyval.b) = (yyvsp[(1) - (1)].b); }
+    break;
+
+  case 15:
+
+/* Line 1455 of yacc.c  */
 #line 167 "eqn.y"
-	{ yyval.b = make_sqrt_box(yyvsp[0].b); }
-break;
-case 15:
+    { (yyval.b) = make_sqrt_box((yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 16:
+
+/* Line 1455 of yacc.c  */
 #line 169 "eqn.y"
-	{ yyval.b = make_over_box(yyvsp[-2].b, yyvsp[0].b); }
-break;
-case 16:
+    { (yyval.b) = make_over_box((yyvsp[(1) - (3)].b), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 17:
+
+/* Line 1455 of yacc.c  */
 #line 171 "eqn.y"
-	{ yyval.b = make_small_over_box(yyvsp[-2].b, yyvsp[0].b); }
-break;
-case 17:
+    { (yyval.b) = make_small_over_box((yyvsp[(1) - (3)].b), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 18:
+
+/* Line 1455 of yacc.c  */
 #line 176 "eqn.y"
-	{ yyval.b = yyvsp[0].b; }
-break;
-case 18:
+    { (yyval.b) = (yyvsp[(1) - (1)].b); }
+    break;
+
+  case 19:
+
+/* Line 1455 of yacc.c  */
 #line 178 "eqn.y"
-	{ yyval.b = make_script_box(yyvsp[-2].b, 0, yyvsp[0].b); }
-break;
-case 19:
+    { (yyval.b) = make_script_box((yyvsp[(1) - (3)].b), 0, (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 20:
+
+/* Line 1455 of yacc.c  */
 #line 183 "eqn.y"
-	{ yyval.b = yyvsp[0].b; }
-break;
-case 20:
+    { (yyval.b) = (yyvsp[(1) - (1)].b); }
+    break;
+
+  case 21:
+
+/* Line 1455 of yacc.c  */
 #line 185 "eqn.y"
-	{ yyval.b = make_script_box(yyvsp[-2].b, yyvsp[0].b, 0); }
-break;
-case 21:
+    { (yyval.b) = make_script_box((yyvsp[(1) - (3)].b), (yyvsp[(3) - (3)].b), 0); }
+    break;
+
+  case 22:
+
+/* Line 1455 of yacc.c  */
 #line 187 "eqn.y"
-	{ yyval.b = make_script_box(yyvsp[-4].b, yyvsp[-2].b, yyvsp[0].b); }
-break;
-case 22:
+    { (yyval.b) = make_script_box((yyvsp[(1) - (5)].b), (yyvsp[(3) - (5)].b), (yyvsp[(5) - (5)].b)); }
+    break;
+
+  case 23:
+
+/* Line 1455 of yacc.c  */
 #line 192 "eqn.y"
-	{ yyval.b = split_text(yyvsp[0].str); }
-break;
-case 23:
+    { (yyval.b) = split_text((yyvsp[(1) - (1)].str)); }
+    break;
+
+  case 24:
+
+/* Line 1455 of yacc.c  */
 #line 194 "eqn.y"
-	{ yyval.b = new quoted_text_box(yyvsp[0].str); }
-break;
-case 24:
+    { (yyval.b) = new quoted_text_box((yyvsp[(1) - (1)].str)); }
+    break;
+
+  case 25:
+
+/* Line 1455 of yacc.c  */
 #line 196 "eqn.y"
-	{ yyval.b = split_text(yyvsp[0].str); }
-break;
-case 25:
+    { (yyval.b) = split_text((yyvsp[(2) - (2)].str)); }
+    break;
+
+  case 26:
+
+/* Line 1455 of yacc.c  */
 #line 198 "eqn.y"
-	{ yyval.b = new quoted_text_box(yyvsp[0].str); }
-break;
-case 26:
+    { (yyval.b) = new quoted_text_box((yyvsp[(2) - (2)].str)); }
+    break;
+
+  case 27:
+
+/* Line 1455 of yacc.c  */
 #line 200 "eqn.y"
-	{ yyval.b = new half_space_box; }
-break;
-case 27:
+    { (yyval.b) = new half_space_box; }
+    break;
+
+  case 28:
+
+/* Line 1455 of yacc.c  */
 #line 202 "eqn.y"
-	{ yyval.b = new space_box; }
-break;
-case 28:
+    { (yyval.b) = new space_box; }
+    break;
+
+  case 29:
+
+/* Line 1455 of yacc.c  */
 #line 204 "eqn.y"
-	{ yyval.b = new tab_box; }
-break;
-case 29:
+    { (yyval.b) = new tab_box; }
+    break;
+
+  case 30:
+
+/* Line 1455 of yacc.c  */
 #line 206 "eqn.y"
-	{ yyval.b = yyvsp[-1].b; }
-break;
-case 30:
+    { (yyval.b) = (yyvsp[(2) - (3)].b); }
+    break;
+
+  case 31:
+
+/* Line 1455 of yacc.c  */
 #line 208 "eqn.y"
-	{ yyvsp[0].pb->set_alignment(CENTER_ALIGN); yyval.b = yyvsp[0].pb; }
-break;
-case 31:
+    { (yyvsp[(2) - (2)].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[(2) - (2)].pb); }
+    break;
+
+  case 32:
+
+/* Line 1455 of yacc.c  */
 #line 210 "eqn.y"
-	{ yyvsp[0].pb->set_alignment(LEFT_ALIGN); yyval.b = yyvsp[0].pb; }
-break;
-case 32:
+    { (yyvsp[(2) - (2)].pb)->set_alignment(LEFT_ALIGN); (yyval.b) = (yyvsp[(2) - (2)].pb); }
+    break;
+
+  case 33:
+
+/* Line 1455 of yacc.c  */
 #line 212 "eqn.y"
-	{ yyvsp[0].pb->set_alignment(RIGHT_ALIGN); yyval.b = yyvsp[0].pb; }
-break;
-case 33:
+    { (yyvsp[(2) - (2)].pb)->set_alignment(RIGHT_ALIGN); (yyval.b) = (yyvsp[(2) - (2)].pb); }
+    break;
+
+  case 34:
+
+/* Line 1455 of yacc.c  */
 #line 214 "eqn.y"
-	{ yyvsp[0].pb->set_alignment(CENTER_ALIGN); yyval.b = yyvsp[0].pb; }
-break;
-case 34:
+    { (yyvsp[(2) - (2)].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[(2) - (2)].pb); }
+    break;
+
+  case 35:
+
+/* Line 1455 of yacc.c  */
 #line 216 "eqn.y"
-	{ yyval.b = yyvsp[-1].mb; }
-break;
-case 35:
+    { (yyval.b) = (yyvsp[(3) - (4)].mb); }
+    break;
+
+  case 36:
+
+/* Line 1455 of yacc.c  */
 #line 218 "eqn.y"
-	{ yyval.b = make_delim_box(yyvsp[-3].str, yyvsp[-2].b, yyvsp[0].str); }
-break;
-case 36:
+    { (yyval.b) = make_delim_box((yyvsp[(2) - (5)].str), (yyvsp[(3) - (5)].b), (yyvsp[(5) - (5)].str)); }
+    break;
+
+  case 37:
+
+/* Line 1455 of yacc.c  */
 #line 220 "eqn.y"
-	{ yyval.b = make_delim_box(yyvsp[-1].str, yyvsp[0].b, 0); }
-break;
-case 37:
+    { (yyval.b) = make_delim_box((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].b), 0); }
+    break;
+
+  case 38:
+
+/* Line 1455 of yacc.c  */
 #line 222 "eqn.y"
-	{ yyval.b = make_overline_box(yyvsp[-1].b); }
-break;
-case 38:
+    { (yyval.b) = make_overline_box((yyvsp[(1) - (2)].b)); }
+    break;
+
+  case 39:
+
+/* Line 1455 of yacc.c  */
 #line 224 "eqn.y"
-	{ yyval.b = make_underline_box(yyvsp[-1].b); }
-break;
-case 39:
+    { (yyval.b) = make_underline_box((yyvsp[(1) - (2)].b)); }
+    break;
+
+  case 40:
+
+/* Line 1455 of yacc.c  */
 #line 226 "eqn.y"
-	{ yyval.b = make_prime_box(yyvsp[-1].b); }
-break;
-case 40:
+    { (yyval.b) = make_prime_box((yyvsp[(1) - (2)].b)); }
+    break;
+
+  case 41:
+
+/* Line 1455 of yacc.c  */
 #line 228 "eqn.y"
-	{ yyval.b = make_accent_box(yyvsp[-2].b, yyvsp[0].b); }
-break;
-case 41:
+    { (yyval.b) = make_accent_box((yyvsp[(1) - (3)].b), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 42:
+
+/* Line 1455 of yacc.c  */
 #line 230 "eqn.y"
-	{ yyval.b = make_uaccent_box(yyvsp[-2].b, yyvsp[0].b); }
-break;
-case 42:
+    { (yyval.b) = make_uaccent_box((yyvsp[(1) - (3)].b), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 43:
+
+/* Line 1455 of yacc.c  */
 #line 232 "eqn.y"
-	{ yyval.b = new font_box(strsave(get_grfont()), yyvsp[0].b); }
-break;
-case 43:
+    { (yyval.b) = new font_box(strsave(get_grfont()), (yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 44:
+
+/* Line 1455 of yacc.c  */
 #line 234 "eqn.y"
-	{ yyval.b = new font_box(strsave(get_gbfont()), yyvsp[0].b); }
-break;
-case 44:
+    { (yyval.b) = new font_box(strsave(get_gbfont()), (yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 45:
+
+/* Line 1455 of yacc.c  */
 #line 236 "eqn.y"
-	{ yyval.b = new font_box(strsave(get_gfont()), yyvsp[0].b); }
-break;
-case 45:
+    { (yyval.b) = new font_box(strsave(get_gfont()), (yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 46:
+
+/* Line 1455 of yacc.c  */
 #line 238 "eqn.y"
-	{ yyval.b = new fat_box(yyvsp[0].b); }
-break;
-case 46:
+    { (yyval.b) = new fat_box((yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 47:
+
+/* Line 1455 of yacc.c  */
 #line 240 "eqn.y"
-	{ yyval.b = new font_box(yyvsp[-1].str, yyvsp[0].b); }
-break;
-case 47:
+    { (yyval.b) = new font_box((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 48:
+
+/* Line 1455 of yacc.c  */
 #line 242 "eqn.y"
-	{ yyval.b = new size_box(yyvsp[-1].str, yyvsp[0].b); }
-break;
-case 48:
+    { (yyval.b) = new size_box((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 49:
+
+/* Line 1455 of yacc.c  */
 #line 244 "eqn.y"
-	{ yyval.b = new hmotion_box(yyvsp[-1].n, yyvsp[0].b); }
-break;
-case 49:
+    { (yyval.b) = new hmotion_box((yyvsp[(2) - (3)].n), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 50:
+
+/* Line 1455 of yacc.c  */
 #line 246 "eqn.y"
-	{ yyval.b = new hmotion_box(-yyvsp[-1].n, yyvsp[0].b); }
-break;
-case 50:
+    { (yyval.b) = new hmotion_box(-(yyvsp[(2) - (3)].n), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 51:
+
+/* Line 1455 of yacc.c  */
 #line 248 "eqn.y"
-	{ yyval.b = new vmotion_box(yyvsp[-1].n, yyvsp[0].b); }
-break;
-case 51:
+    { (yyval.b) = new vmotion_box((yyvsp[(2) - (3)].n), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 52:
+
+/* Line 1455 of yacc.c  */
 #line 250 "eqn.y"
-	{ yyval.b = new vmotion_box(-yyvsp[-1].n, yyvsp[0].b); }
-break;
-case 52:
+    { (yyval.b) = new vmotion_box(-(yyvsp[(2) - (3)].n), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 53:
+
+/* Line 1455 of yacc.c  */
 #line 252 "eqn.y"
-	{ yyvsp[0].b->set_spacing_type(yyvsp[-1].str); yyval.b = yyvsp[0].b; }
-break;
-case 53:
+    { (yyvsp[(3) - (3)].b)->set_spacing_type((yyvsp[(2) - (3)].str)); (yyval.b) = (yyvsp[(3) - (3)].b); }
+    break;
+
+  case 54:
+
+/* Line 1455 of yacc.c  */
 #line 254 "eqn.y"
-	{ yyval.b = new vcenter_box(yyvsp[0].b); }
-break;
-case 54:
+    { (yyval.b) = new vcenter_box((yyvsp[(2) - (2)].b)); }
+    break;
+
+  case 55:
+
+/* Line 1455 of yacc.c  */
 #line 256 "eqn.y"
-	{ yyval.b = make_special_box(yyvsp[-1].str, yyvsp[0].b); }
-break;
-case 55:
+    { (yyval.b) = make_special_box((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].b)); }
+    break;
+
+  case 56:
+
+/* Line 1455 of yacc.c  */
 #line 261 "eqn.y"
-	{
+    {
 		  int n;
-		  if (sscanf(yyvsp[0].str, "%d", &n) == 1)
-		    yyval.n = n;
-		  a_delete yyvsp[0].str;
+		  if (sscanf((yyvsp[(1) - (1)].str), "%d", &n) == 1)
+		    (yyval.n) = n;
+		  a_delete (yyvsp[(1) - (1)].str);
 		}
-break;
-case 56:
+    break;
+
+  case 57:
+
+/* Line 1455 of yacc.c  */
 #line 271 "eqn.y"
-	{ yyval.pb = new pile_box(yyvsp[0].b); }
-break;
-case 57:
+    { (yyval.pb) = new pile_box((yyvsp[(1) - (1)].b)); }
+    break;
+
+  case 58:
+
+/* Line 1455 of yacc.c  */
 #line 273 "eqn.y"
-	{ yyvsp[-2].pb->append(yyvsp[0].b); yyval.pb = yyvsp[-2].pb; }
-break;
-case 58:
+    { (yyvsp[(1) - (3)].pb)->append((yyvsp[(3) - (3)].b)); (yyval.pb) = (yyvsp[(1) - (3)].pb); }
+    break;
+
+  case 59:
+
+/* Line 1455 of yacc.c  */
 #line 278 "eqn.y"
-	{ yyval.pb = yyvsp[-1].pb; }
-break;
-case 59:
+    { (yyval.pb) = (yyvsp[(2) - (3)].pb); }
+    break;
+
+  case 60:
+
+/* Line 1455 of yacc.c  */
 #line 280 "eqn.y"
-	{ yyvsp[-1].pb->set_space(yyvsp[-3].n); yyval.pb = yyvsp[-1].pb; }
-break;
-case 60:
+    { (yyvsp[(3) - (4)].pb)->set_space((yyvsp[(1) - (4)].n)); (yyval.pb) = (yyvsp[(3) - (4)].pb); }
+    break;
+
+  case 61:
+
+/* Line 1455 of yacc.c  */
 #line 285 "eqn.y"
-	{ yyval.mb = new matrix_box(yyvsp[0].col); }
-break;
-case 61:
+    { (yyval.mb) = new matrix_box((yyvsp[(1) - (1)].col)); }
+    break;
+
+  case 62:
+
+/* Line 1455 of yacc.c  */
 #line 287 "eqn.y"
-	{ yyvsp[-1].mb->append(yyvsp[0].col); yyval.mb = yyvsp[-1].mb; }
-break;
-case 62:
+    { (yyvsp[(1) - (2)].mb)->append((yyvsp[(2) - (2)].col)); (yyval.mb) = (yyvsp[(1) - (2)].mb); }
+    break;
+
+  case 63:
+
+/* Line 1455 of yacc.c  */
 #line 292 "eqn.y"
-	{ yyval.col = new column(yyvsp[0].b); }
-break;
-case 63:
+    { (yyval.col) = new column((yyvsp[(1) - (1)].b)); }
+    break;
+
+  case 64:
+
+/* Line 1455 of yacc.c  */
 #line 294 "eqn.y"
-	{ yyvsp[-2].col->append(yyvsp[0].b); yyval.col = yyvsp[-2].col; }
-break;
-case 64:
+    { (yyvsp[(1) - (3)].col)->append((yyvsp[(3) - (3)].b)); (yyval.col) = (yyvsp[(1) - (3)].col); }
+    break;
+
+  case 65:
+
+/* Line 1455 of yacc.c  */
 #line 299 "eqn.y"
-	{ yyval.col = yyvsp[-1].col; }
-break;
-case 65:
+    { (yyval.col) = (yyvsp[(2) - (3)].col); }
+    break;
+
+  case 66:
+
+/* Line 1455 of yacc.c  */
 #line 301 "eqn.y"
-	{ yyvsp[-1].col->set_space(yyvsp[-3].n); yyval.col = yyvsp[-1].col; }
-break;
-case 66:
+    { (yyvsp[(3) - (4)].col)->set_space((yyvsp[(1) - (4)].n)); (yyval.col) = (yyvsp[(3) - (4)].col); }
+    break;
+
+  case 67:
+
+/* Line 1455 of yacc.c  */
 #line 306 "eqn.y"
-	{ yyvsp[0].col->set_alignment(CENTER_ALIGN); yyval.col = yyvsp[0].col; }
-break;
-case 67:
+    { (yyvsp[(2) - (2)].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[(2) - (2)].col); }
+    break;
+
+  case 68:
+
+/* Line 1455 of yacc.c  */
 #line 308 "eqn.y"
-	{ yyvsp[0].col->set_alignment(LEFT_ALIGN); yyval.col = yyvsp[0].col; }
-break;
-case 68:
+    { (yyvsp[(2) - (2)].col)->set_alignment(LEFT_ALIGN); (yyval.col) = (yyvsp[(2) - (2)].col); }
+    break;
+
+  case 69:
+
+/* Line 1455 of yacc.c  */
 #line 310 "eqn.y"
-	{ yyvsp[0].col->set_alignment(RIGHT_ALIGN); yyval.col = yyvsp[0].col; }
-break;
-case 69:
+    { (yyvsp[(2) - (2)].col)->set_alignment(RIGHT_ALIGN); (yyval.col) = (yyvsp[(2) - (2)].col); }
+    break;
+
+  case 70:
+
+/* Line 1455 of yacc.c  */
 #line 312 "eqn.y"
-	{ yyvsp[0].col->set_alignment(CENTER_ALIGN); yyval.col = yyvsp[0].col; }
-break;
-case 70:
+    { (yyvsp[(2) - (2)].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[(2) - (2)].col); }
+    break;
+
+  case 71:
+
+/* Line 1455 of yacc.c  */
 #line 316 "eqn.y"
-	{ yyval.str = yyvsp[0].str; }
-break;
-case 71:
+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
+    break;
+
+  case 72:
+
+/* Line 1455 of yacc.c  */
 #line 318 "eqn.y"
-	{ yyval.str = yyvsp[0].str; }
-break;
-case 72:
+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
+    break;
+
+  case 73:
+
+/* Line 1455 of yacc.c  */
 #line 323 "eqn.y"
-	{ yyval.str = yyvsp[0].str; }
-break;
-case 73:
+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
+    break;
+
+  case 74:
+
+/* Line 1455 of yacc.c  */
 #line 325 "eqn.y"
-	{ yyval.str = strsave("{"); }
-break;
-case 74:
+    { (yyval.str) = strsave("{"); }
+    break;
+
+  case 75:
+
+/* Line 1455 of yacc.c  */
 #line 327 "eqn.y"
-	{ yyval.str = strsave("}"); }
-break;
-#line 1189 "eqn.cpp"
+    { (yyval.str) = strsave("}"); }
+    break;
+
+
+
+/* Line 1455 of yacc.c  */
+#line 2156 "eqn.cpp"
+      default: break;
     }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
 #endif
-    if (yyssp >= yysslim && yygrowstack())
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
     {
-        goto yyoverflow;
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-    *++yyssp = (short) yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
 
-yyoverflow:
-    yyerror("yacc stack overflow");
+  *++yyvsp = yylval;
 
-yyabort:
-    return (1);
 
-yyaccept:
-    return (0);
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
+
+
+
+/* Line 1675 of yacc.c  */
+#line 330 "eqn.y"
+
+
diff -ruN groff-1.20.1/src/preproc/eqn/eqn.man groff-1.21/src/preproc/eqn/eqn.man
--- groff-1.20.1/src/preproc/eqn/eqn.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/eqn/eqn.man	2010-12-31 08:33:08.000000000 +0100
@@ -113,7 +113,6 @@
 .
 .
 .SH OPTIONS
-.
 .TP
 .BI \-d xy
 Specify delimiters
@@ -1168,11 +1167,23 @@
 causes a character to be set in roman type.
 .
 .
+.SH "INTERACTION WITH @G@TBL"
+It is not advisable to use the hash character (#) as a delimiter for in-line
+equations in
+.B eqn
+since
+.BR @g@tbl (@MAN1EXT@)
+uses a macro called
+.BR .T# ,
+causing a clash.
+.
+.
 .SH FILES
 .Tp \w'\fB@MACRODIR@/eqnrc'u+2n
 .B @MACRODIR@/eqnrc
 Initialization file.
 .
+.
 .SH MATHML MODE LIMITATIONS
 MathML is designed on the assumption that it cannot know the exact
 physical characteristics of the media and devices on which it will
diff -ruN groff-1.20.1/src/preproc/eqn/eqn_tab.h groff-1.21/src/preproc/eqn/eqn_tab.h
--- groff-1.20.1/src/preproc/eqn/eqn_tab.h	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/src/preproc/eqn/eqn_tab.h	2010-12-31 08:33:10.000000000 +0100
@@ -1,67 +1,191 @@
-#define OVER 257
-#define SMALLOVER 258
-#define SQRT 259
-#define SUB 260
-#define SUP 261
-#define LPILE 262
-#define RPILE 263
-#define CPILE 264
-#define PILE 265
-#define LEFT 266
-#define RIGHT 267
-#define TO 268
-#define FROM 269
-#define SIZE 270
-#define FONT 271
-#define ROMAN 272
-#define BOLD 273
-#define ITALIC 274
-#define FAT 275
-#define ACCENT 276
-#define BAR 277
-#define UNDER 278
-#define ABOVE 279
-#define TEXT 280
-#define QUOTED_TEXT 281
-#define FWD 282
-#define BACK 283
-#define DOWN 284
-#define UP 285
-#define MATRIX 286
-#define COL 287
-#define LCOL 288
-#define RCOL 289
-#define CCOL 290
-#define MARK 291
-#define LINEUP 292
-#define TYPE 293
-#define VCENTER 294
-#define PRIME 295
-#define SPLIT 296
-#define NOSPLIT 297
-#define UACCENT 298
-#define SPECIAL 299
-#define SPACE 300
-#define GFONT 301
-#define GSIZE 302
-#define DEFINE 303
-#define NDEFINE 304
-#define TDEFINE 305
-#define SDEFINE 306
-#define UNDEF 307
-#define IFDEF 308
-#define INCLUDE 309
-#define DELIM 310
-#define CHARTYPE 311
-#define SET 312
-#define GRFONT 313
-#define GBFONT 314
-typedef union {
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     OVER = 258,
+     SMALLOVER = 259,
+     SQRT = 260,
+     SUB = 261,
+     SUP = 262,
+     LPILE = 263,
+     RPILE = 264,
+     CPILE = 265,
+     PILE = 266,
+     LEFT = 267,
+     RIGHT = 268,
+     TO = 269,
+     FROM = 270,
+     SIZE = 271,
+     FONT = 272,
+     ROMAN = 273,
+     BOLD = 274,
+     ITALIC = 275,
+     FAT = 276,
+     ACCENT = 277,
+     BAR = 278,
+     UNDER = 279,
+     ABOVE = 280,
+     TEXT = 281,
+     QUOTED_TEXT = 282,
+     FWD = 283,
+     BACK = 284,
+     DOWN = 285,
+     UP = 286,
+     MATRIX = 287,
+     COL = 288,
+     LCOL = 289,
+     RCOL = 290,
+     CCOL = 291,
+     MARK = 292,
+     LINEUP = 293,
+     TYPE = 294,
+     VCENTER = 295,
+     PRIME = 296,
+     SPLIT = 297,
+     NOSPLIT = 298,
+     UACCENT = 299,
+     SPECIAL = 300,
+     SPACE = 301,
+     GFONT = 302,
+     GSIZE = 303,
+     DEFINE = 304,
+     NDEFINE = 305,
+     TDEFINE = 306,
+     SDEFINE = 307,
+     UNDEF = 308,
+     IFDEF = 309,
+     INCLUDE = 310,
+     DELIM = 311,
+     CHARTYPE = 312,
+     SET = 313,
+     GRFONT = 314,
+     GBFONT = 315
+   };
+#endif
+/* Tokens.  */
+#define OVER 258
+#define SMALLOVER 259
+#define SQRT 260
+#define SUB 261
+#define SUP 262
+#define LPILE 263
+#define RPILE 264
+#define CPILE 265
+#define PILE 266
+#define LEFT 267
+#define RIGHT 268
+#define TO 269
+#define FROM 270
+#define SIZE 271
+#define FONT 272
+#define ROMAN 273
+#define BOLD 274
+#define ITALIC 275
+#define FAT 276
+#define ACCENT 277
+#define BAR 278
+#define UNDER 279
+#define ABOVE 280
+#define TEXT 281
+#define QUOTED_TEXT 282
+#define FWD 283
+#define BACK 284
+#define DOWN 285
+#define UP 286
+#define MATRIX 287
+#define COL 288
+#define LCOL 289
+#define RCOL 290
+#define CCOL 291
+#define MARK 292
+#define LINEUP 293
+#define TYPE 294
+#define VCENTER 295
+#define PRIME 296
+#define SPLIT 297
+#define NOSPLIT 298
+#define UACCENT 299
+#define SPECIAL 300
+#define SPACE 301
+#define GFONT 302
+#define GSIZE 303
+#define DEFINE 304
+#define NDEFINE 305
+#define TDEFINE 306
+#define SDEFINE 307
+#define UNDEF 308
+#define IFDEF 309
+#define INCLUDE 310
+#define DELIM 311
+#define CHARTYPE 312
+#define SET 313
+#define GRFONT 314
+#define GBFONT 315
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1676 of yacc.c  */
+#line 31 "eqn.y"
+
 	char *str;
 	box *b;
 	pile_box *pb;
 	matrix_box *mb;
 	int n;
 	column *col;
+
+
+
+/* Line 1676 of yacc.c  */
+#line 183 "y.tab.h"
 } YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
 extern YYSTYPE yylval;
+
+
diff -ruN groff-1.20.1/src/preproc/pic/object.cpp groff-1.21/src/preproc/pic/object.cpp
--- groff-1.20.1/src/preproc/pic/object.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/pic/object.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1830,8 +1830,8 @@
     if (radius <= 0)
       radius = .25;
     // make the radius big enough
-    while (radius < d)
-      radius *= 2.0;
+    if (radius < d)
+      radius = d;
     double alpha = acos(d/radius);
     double theta = atan2(h.y, h.x);
     if (cw)
diff -ruN groff-1.20.1/src/preproc/pic/pic.cpp groff-1.21/src/preproc/pic/pic.cpp
--- groff-1.20.1/src/preproc/pic/pic.cpp	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/src/preproc/pic/pic.cpp	2010-12-31 08:33:10.000000000 +0100
@@ -1,37 +1,75 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
 
-#include <stdlib.h>
-#include <string.h>
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20081224
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.4.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
 
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-#ifdef YYPARSE_PARAM_TYPE
-#define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-#else
-#define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-#endif
-#else
-#define YYPARSE_DECL() yyparse(void)
-#endif /* YYPARSE_PARAM */
 
-extern int YYPARSE_DECL();
 
-static int yygrowstack(void);
-#define YYPREFIX "yy"
+/* Copy the first part of user declarations.  */
+
+/* Line 189 of yacc.c  */
 #line 21 "pic.y"
+
 #include "pic.h"
 #include "ptable.h"
 #include "object.h"
@@ -73,8 +111,294 @@
 char *format_number(const char *form, double n);
 char *do_sprintf(const char *form, const double *v, int nv);
 
-#line 65 "pic.y"
-typedef union {
+
+
+/* Line 189 of yacc.c  */
+#line 118 "pic.cpp"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     LABEL = 258,
+     VARIABLE = 259,
+     NUMBER = 260,
+     TEXT = 261,
+     COMMAND_LINE = 262,
+     DELIMITED = 263,
+     ORDINAL = 264,
+     TH = 265,
+     LEFT_ARROW_HEAD = 266,
+     RIGHT_ARROW_HEAD = 267,
+     DOUBLE_ARROW_HEAD = 268,
+     LAST = 269,
+     BOX = 270,
+     CIRCLE = 271,
+     ELLIPSE = 272,
+     ARC = 273,
+     LINE = 274,
+     ARROW = 275,
+     MOVE = 276,
+     SPLINE = 277,
+     HEIGHT = 278,
+     RADIUS = 279,
+     FIGNAME = 280,
+     WIDTH = 281,
+     DIAMETER = 282,
+     UP = 283,
+     DOWN = 284,
+     RIGHT = 285,
+     LEFT = 286,
+     FROM = 287,
+     TO = 288,
+     AT = 289,
+     WITH = 290,
+     BY = 291,
+     THEN = 292,
+     SOLID = 293,
+     DOTTED = 294,
+     DASHED = 295,
+     CHOP = 296,
+     SAME = 297,
+     INVISIBLE = 298,
+     LJUST = 299,
+     RJUST = 300,
+     ABOVE = 301,
+     BELOW = 302,
+     OF = 303,
+     THE = 304,
+     WAY = 305,
+     BETWEEN = 306,
+     AND = 307,
+     HERE = 308,
+     DOT_N = 309,
+     DOT_E = 310,
+     DOT_W = 311,
+     DOT_S = 312,
+     DOT_NE = 313,
+     DOT_SE = 314,
+     DOT_NW = 315,
+     DOT_SW = 316,
+     DOT_C = 317,
+     DOT_START = 318,
+     DOT_END = 319,
+     DOT_X = 320,
+     DOT_Y = 321,
+     DOT_HT = 322,
+     DOT_WID = 323,
+     DOT_RAD = 324,
+     SIN = 325,
+     COS = 326,
+     ATAN2 = 327,
+     LOG = 328,
+     EXP = 329,
+     SQRT = 330,
+     K_MAX = 331,
+     K_MIN = 332,
+     INT = 333,
+     RAND = 334,
+     SRAND = 335,
+     COPY = 336,
+     THRU = 337,
+     TOP = 338,
+     BOTTOM = 339,
+     UPPER = 340,
+     LOWER = 341,
+     SH = 342,
+     PRINT = 343,
+     CW = 344,
+     CCW = 345,
+     FOR = 346,
+     DO = 347,
+     IF = 348,
+     ELSE = 349,
+     ANDAND = 350,
+     OROR = 351,
+     NOTEQUAL = 352,
+     EQUALEQUAL = 353,
+     LESSEQUAL = 354,
+     GREATEREQUAL = 355,
+     LEFT_CORNER = 356,
+     RIGHT_CORNER = 357,
+     NORTH = 358,
+     SOUTH = 359,
+     EAST = 360,
+     WEST = 361,
+     CENTER = 362,
+     END = 363,
+     START = 364,
+     RESET = 365,
+     UNTIL = 366,
+     PLOT = 367,
+     THICKNESS = 368,
+     FILL = 369,
+     COLORED = 370,
+     OUTLINED = 371,
+     SHADED = 372,
+     XSLANTED = 373,
+     YSLANTED = 374,
+     ALIGNED = 375,
+     SPRINTF = 376,
+     COMMAND = 377,
+     DEFINE = 378,
+     UNDEF = 379
+   };
+#endif
+/* Tokens.  */
+#define LABEL 258
+#define VARIABLE 259
+#define NUMBER 260
+#define TEXT 261
+#define COMMAND_LINE 262
+#define DELIMITED 263
+#define ORDINAL 264
+#define TH 265
+#define LEFT_ARROW_HEAD 266
+#define RIGHT_ARROW_HEAD 267
+#define DOUBLE_ARROW_HEAD 268
+#define LAST 269
+#define BOX 270
+#define CIRCLE 271
+#define ELLIPSE 272
+#define ARC 273
+#define LINE 274
+#define ARROW 275
+#define MOVE 276
+#define SPLINE 277
+#define HEIGHT 278
+#define RADIUS 279
+#define FIGNAME 280
+#define WIDTH 281
+#define DIAMETER 282
+#define UP 283
+#define DOWN 284
+#define RIGHT 285
+#define LEFT 286
+#define FROM 287
+#define TO 288
+#define AT 289
+#define WITH 290
+#define BY 291
+#define THEN 292
+#define SOLID 293
+#define DOTTED 294
+#define DASHED 295
+#define CHOP 296
+#define SAME 297
+#define INVISIBLE 298
+#define LJUST 299
+#define RJUST 300
+#define ABOVE 301
+#define BELOW 302
+#define OF 303
+#define THE 304
+#define WAY 305
+#define BETWEEN 306
+#define AND 307
+#define HERE 308
+#define DOT_N 309
+#define DOT_E 310
+#define DOT_W 311
+#define DOT_S 312
+#define DOT_NE 313
+#define DOT_SE 314
+#define DOT_NW 315
+#define DOT_SW 316
+#define DOT_C 317
+#define DOT_START 318
+#define DOT_END 319
+#define DOT_X 320
+#define DOT_Y 321
+#define DOT_HT 322
+#define DOT_WID 323
+#define DOT_RAD 324
+#define SIN 325
+#define COS 326
+#define ATAN2 327
+#define LOG 328
+#define EXP 329
+#define SQRT 330
+#define K_MAX 331
+#define K_MIN 332
+#define INT 333
+#define RAND 334
+#define SRAND 335
+#define COPY 336
+#define THRU 337
+#define TOP 338
+#define BOTTOM 339
+#define UPPER 340
+#define LOWER 341
+#define SH 342
+#define PRINT 343
+#define CW 344
+#define CCW 345
+#define FOR 346
+#define DO 347
+#define IF 348
+#define ELSE 349
+#define ANDAND 350
+#define OROR 351
+#define NOTEQUAL 352
+#define EQUALEQUAL 353
+#define LESSEQUAL 354
+#define GREATEREQUAL 355
+#define LEFT_CORNER 356
+#define RIGHT_CORNER 357
+#define NORTH 358
+#define SOUTH 359
+#define EAST 360
+#define WEST 361
+#define CENTER 362
+#define END 363
+#define START 364
+#define RESET 365
+#define UNTIL 366
+#define PLOT 367
+#define THICKNESS 368
+#define FILL 369
+#define COLORED 370
+#define OUTLINED 371
+#define SHADED 372
+#define XSLANTED 373
+#define YSLANTED 374
+#define ALIGNED 375
+#define SPRINTF 376
+#define COMMAND 377
+#define DEFINE 378
+#define UNDEF 379
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 214 of yacc.c  */
+#line 67 "pic.y"
+
 	char *str;
 	int n;
 	double x;
@@ -91,4528 +415,2809 @@
 	saved_state *pstate;
 	graphics_state state;
 	object_type obtype;
+
+
+
+/* Line 214 of yacc.c  */
+#line 423 "pic.cpp"
 } YYSTYPE;
-#line 95 "pic.cpp"
-#define LABEL 257
-#define VARIABLE 258
-#define NUMBER 259
-#define TEXT 260
-#define COMMAND_LINE 261
-#define DELIMITED 262
-#define ORDINAL 263
-#define TH 264
-#define LEFT_ARROW_HEAD 265
-#define RIGHT_ARROW_HEAD 266
-#define DOUBLE_ARROW_HEAD 267
-#define LAST 268
-#define BOX 269
-#define CIRCLE 270
-#define ELLIPSE 271
-#define ARC 272
-#define LINE 273
-#define ARROW 274
-#define MOVE 275
-#define SPLINE 276
-#define HEIGHT 277
-#define RADIUS 278
-#define FIGNAME 279
-#define WIDTH 280
-#define DIAMETER 281
-#define UP 282
-#define DOWN 283
-#define RIGHT 284
-#define LEFT 285
-#define FROM 286
-#define TO 287
-#define AT 288
-#define WITH 289
-#define BY 290
-#define THEN 291
-#define SOLID 292
-#define DOTTED 293
-#define DASHED 294
-#define CHOP 295
-#define SAME 296
-#define INVISIBLE 297
-#define LJUST 298
-#define RJUST 299
-#define ABOVE 300
-#define BELOW 301
-#define OF 302
-#define THE 303
-#define WAY 304
-#define BETWEEN 305
-#define AND 306
-#define HERE 307
-#define DOT_N 308
-#define DOT_E 309
-#define DOT_W 310
-#define DOT_S 311
-#define DOT_NE 312
-#define DOT_SE 313
-#define DOT_NW 314
-#define DOT_SW 315
-#define DOT_C 316
-#define DOT_START 317
-#define DOT_END 318
-#define DOT_X 319
-#define DOT_Y 320
-#define DOT_HT 321
-#define DOT_WID 322
-#define DOT_RAD 323
-#define SIN 324
-#define COS 325
-#define ATAN2 326
-#define LOG 327
-#define EXP 328
-#define SQRT 329
-#define K_MAX 330
-#define K_MIN 331
-#define INT 332
-#define RAND 333
-#define SRAND 334
-#define COPY 335
-#define THRU 336
-#define TOP 337
-#define BOTTOM 338
-#define UPPER 339
-#define LOWER 340
-#define SH 341
-#define PRINT 342
-#define CW 343
-#define CCW 344
-#define FOR 345
-#define DO 346
-#define IF 347
-#define ELSE 348
-#define ANDAND 349
-#define OROR 350
-#define NOTEQUAL 351
-#define EQUALEQUAL 352
-#define LESSEQUAL 353
-#define GREATEREQUAL 354
-#define LEFT_CORNER 355
-#define RIGHT_CORNER 356
-#define NORTH 357
-#define SOUTH 358
-#define EAST 359
-#define WEST 360
-#define CENTER 361
-#define END 362
-#define START 363
-#define RESET 364
-#define UNTIL 365
-#define PLOT 366
-#define THICKNESS 367
-#define FILL 368
-#define COLORED 369
-#define OUTLINED 370
-#define SHADED 371
-#define XSLANTED 372
-#define YSLANTED 373
-#define ALIGNED 374
-#define SPRINTF 375
-#define COMMAND 376
-#define DEFINE 377
-#define UNDEF 378
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,   16,   17,   17,   29,   29,   30,   30,   31,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   32,
-   31,   31,   33,   34,   31,   35,   36,   31,   37,   31,
-   31,   38,   31,   31,   31,   23,   23,   39,   39,   39,
-   27,   27,   28,   28,   28,   40,    7,   24,   24,    2,
-    2,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-    4,    4,    4,   15,   15,   15,   15,   41,   43,   15,
-   15,   42,   42,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   44,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   26,   26,   25,   25,   19,   19,
-   19,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,   45,   45,    5,    5,   13,   13,   13,   13,   13,
-   14,   14,   14,   22,   22,   21,   21,    8,    8,   20,
-   20,   20,   20,   20,   20,   20,   20,   20,   11,   11,
-   12,   12,   12,   10,   10,   10,   10,   10,   10,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 264 of yacc.c  */
+#line 435 "pic.cpp"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
+{
+  return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  6
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   2438
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  146
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  49
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  260
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  454
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   379
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   137,     2,     2,     2,   136,     2,     2,
+     126,   145,   134,   132,   129,   133,   125,   135,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   141,   139,
+     130,   140,   131,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   128,     2,   144,   138,     2,   127,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   142,     2,   143,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124
 };
-static const short yylen[] = {                            2,
-    1,    1,    3,    1,    3,    0,    1,    1,    2,    3,
-    3,    4,    1,    1,    1,    1,    1,    2,    2,    0,
-    3,    2,    0,    0,    7,    0,    0,    6,    0,   10,
-    1,    0,    4,    1,    1,    1,    1,    2,    2,    3,
-    1,    2,    1,    1,    1,    0,    5,    0,    2,    1,
-    1,    3,    3,    3,    3,    3,    3,    3,    3,    2,
-    0,    2,    3,    1,    4,    4,    4,    0,    0,    6,
-    1,    0,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    2,    3,    0,    4,    3,    3,    3,    3,
-    2,    2,    3,    2,    3,    2,    3,    2,    3,    3,
-    3,    3,    3,    3,    3,    2,    2,    2,    3,    2,
-    3,    2,    3,    3,    3,    3,    3,    3,    2,    3,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    3,    2,    1,    5,    0,    3,    1,    1,
-    3,    1,    3,    5,    3,    5,    5,    5,    7,    6,
-    8,    1,    4,    3,    3,    1,    2,    2,    3,    1,
-    1,    1,    3,    1,    3,    1,    2,    2,    2,    1,
-    1,    1,    1,    1,    1,    1,    2,    1,    2,    3,
-    1,    1,    2,    1,    5,    4,    3,    3,    2,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    2,    2,    2,    2,    1,    1,
-    2,    2,    2,    2,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    2,    2,    2,    2,    2,    3,    3,
-    3,    3,    3,    3,    2,    3,    4,    4,    6,    4,
-    4,    4,    6,    6,    4,    4,    3,    4,    3,    3,
-    3,    3,    3,    3,    3,    3,    2,
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     7,    11,    13,    17,    18,    20,
+      22,    25,    29,    33,    38,    40,    42,    44,    46,    48,
+      51,    54,    55,    59,    62,    63,    64,    72,    73,    74,
+      81,    82,    93,    95,    96,   101,   103,   105,   107,   109,
+     112,   115,   119,   121,   124,   126,   128,   130,   131,   137,
+     138,   141,   143,   145,   149,   153,   157,   161,   165,   169,
+     173,   177,   180,   181,   184,   188,   190,   195,   200,   205,
+     206,   207,   214,   216,   217,   219,   221,   223,   225,   227,
+     229,   231,   233,   235,   237,   240,   244,   245,   250,   254,
+     258,   262,   266,   269,   272,   276,   279,   283,   286,   290,
+     293,   297,   301,   305,   309,   313,   317,   321,   324,   327,
+     330,   334,   337,   341,   344,   348,   352,   356,   360,   364,
+     368,   371,   375,   378,   381,   384,   387,   390,   393,   396,
+     399,   402,   405,   408,   411,   415,   418,   420,   426,   427,
+     431,   433,   435,   439,   441,   445,   451,   455,   461,   467,
+     473,   481,   488,   497,   499,   504,   508,   512,   514,   517,
+     520,   524,   526,   528,   530,   534,   536,   540,   542,   545,
+     548,   551,   553,   555,   557,   559,   561,   563,   565,   568,
+     570,   573,   577,   579,   581,   584,   586,   592,   597,   601,
+     605,   608,   610,   612,   614,   616,   618,   620,   622,   624,
+     626,   628,   630,   632,   634,   636,   638,   641,   644,   647,
+     650,   652,   654,   657,   660,   663,   666,   668,   670,   672,
+     674,   676,   678,   680,   682,   684,   688,   690,   692,   695,
+     698,   701,   704,   707,   711,   715,   719,   723,   727,   731,
+     734,   738,   743,   748,   755,   760,   765,   770,   777,   784,
+     789,   794,   798,   803,   807,   811,   815,   819,   823,   827,
+     831
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     147,     0,    -1,   150,    -1,   148,    -1,   150,   149,   150,
+      -1,   170,    -1,   149,   151,   170,    -1,    -1,   151,    -1,
+     139,    -1,   151,   139,    -1,    25,   140,   160,    -1,     4,
+     140,   167,    -1,     4,   141,   140,   167,    -1,    28,    -1,
+      29,    -1,    31,    -1,    30,    -1,     7,    -1,   122,   162,
+      -1,    88,   162,    -1,    -1,    87,   153,     8,    -1,    81,
+       6,    -1,    -1,    -1,    81,     6,    82,   154,     8,   155,
+     166,    -1,    -1,    -1,    81,    82,   156,     8,   157,   166,
+      -1,    -1,    91,     4,   140,   192,    33,   192,   169,    92,
+     158,     8,    -1,   164,    -1,    -1,   164,    94,   159,     8,
+      -1,   161,    -1,   110,    -1,     4,    -1,     3,    -1,   110,
+       4,    -1,   161,     4,    -1,   161,   129,     4,    -1,   163,
+      -1,   162,   163,    -1,   192,    -1,   176,    -1,   178,    -1,
+      -1,    93,   167,    37,   165,     8,    -1,    -1,   111,     6,
+      -1,   192,    -1,   168,    -1,   176,    98,   176,    -1,   176,
+      97,   176,    -1,   168,    95,   168,    -1,   168,    95,   192,
+      -1,   192,    95,   168,    -1,   168,    96,   168,    -1,   168,
+      96,   192,    -1,   192,    96,   168,    -1,   137,   168,    -1,
+      -1,    36,   192,    -1,    36,   134,   192,    -1,   174,    -1,
+       3,   141,   150,   170,    -1,     3,   141,   150,   179,    -1,
+       3,   141,   150,   182,    -1,    -1,    -1,   142,   171,   148,
+     143,   172,   173,    -1,   152,    -1,    -1,   170,    -1,    15,
+      -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,    20,
+      -1,    21,    -1,    22,    -1,   176,    -1,   112,   192,    -1,
+     112,   192,   176,    -1,    -1,   128,   175,   148,   144,    -1,
+     174,    23,   192,    -1,   174,    24,   192,    -1,   174,    26,
+     192,    -1,   174,    27,   192,    -1,   174,   192,    -1,   174,
+      28,    -1,   174,    28,   192,    -1,   174,    29,    -1,   174,
+      29,   192,    -1,   174,    30,    -1,   174,    30,   192,    -1,
+     174,    31,    -1,   174,    31,   192,    -1,   174,    32,   178,
+      -1,   174,    33,   178,    -1,   174,    34,   178,    -1,   174,
+      35,   190,    -1,   174,    35,   178,    -1,   174,    36,   181,
+      -1,   174,    37,    -1,   174,    38,    -1,   174,    39,    -1,
+     174,    39,   192,    -1,   174,    40,    -1,   174,    40,   192,
+      -1,   174,   114,    -1,   174,   114,   192,    -1,   174,   118,
+     192,    -1,   174,   119,   192,    -1,   174,   117,   176,    -1,
+     174,   115,   176,    -1,   174,   116,   176,    -1,   174,    41,
+      -1,   174,    41,   192,    -1,   174,    42,    -1,   174,    43,
+      -1,   174,    11,    -1,   174,    12,    -1,   174,    13,    -1,
+     174,    89,    -1,   174,    90,    -1,   174,   176,    -1,   174,
+      44,    -1,   174,    45,    -1,   174,    46,    -1,   174,    47,
+      -1,   174,   113,   192,    -1,   174,   120,    -1,     6,    -1,
+     121,   126,     6,   177,   145,    -1,    -1,   177,   129,   192,
+      -1,   179,    -1,   182,    -1,   126,   182,   145,    -1,   181,
+      -1,   178,   132,   181,    -1,   126,   178,   132,   181,   145,
+      -1,   178,   133,   181,    -1,   126,   178,   133,   181,   145,
+      -1,   126,   178,   129,   178,   145,    -1,   192,   180,   178,
+      52,   178,    -1,   126,   192,   180,   178,    52,   178,   145,
+      -1,   194,   130,   178,   129,   178,   131,    -1,   126,   194,
+     130,   178,   129,   178,   131,   145,    -1,    51,    -1,    48,
+      49,    50,    51,    -1,   192,   129,   192,    -1,   126,   181,
+     145,    -1,   183,    -1,   183,   191,    -1,   191,   183,    -1,
+     191,    48,   183,    -1,    53,    -1,     3,    -1,   186,    -1,
+     183,   125,     3,    -1,     9,    -1,   127,   167,    10,    -1,
+      14,    -1,   184,    14,    -1,   184,   187,    -1,   185,   187,
+      -1,    15,    -1,    16,    -1,    17,    -1,    18,    -1,    19,
+      -1,    20,    -1,    22,    -1,   128,   144,    -1,     6,    -1,
+     125,     3,    -1,   188,   125,     3,    -1,   191,    -1,   188,
+      -1,   188,   191,    -1,   189,    -1,   126,   189,   129,   189,
+     145,    -1,     9,    14,   187,   189,    -1,    14,   187,   189,
+      -1,     9,   187,   189,    -1,     3,   189,    -1,    54,    -1,
+      55,    -1,    56,    -1,    57,    -1,    58,    -1,    59,    -1,
+      60,    -1,    61,    -1,    62,    -1,    63,    -1,    64,    -1,
+      83,    -1,    84,    -1,    31,    -1,    30,    -1,    85,    31,
+      -1,    86,    31,    -1,    85,    30,    -1,    86,    30,    -1,
+     101,    -1,   102,    -1,    85,   101,    -1,    86,   101,    -1,
+      85,   102,    -1,    86,   102,    -1,   103,    -1,   104,    -1,
+     105,    -1,   106,    -1,   107,    -1,   109,    -1,   108,    -1,
+     193,    -1,   194,    -1,   192,   130,   192,    -1,     4,    -1,
+       5,    -1,   182,    65,    -1,   182,    66,    -1,   182,    67,
+      -1,   182,    68,    -1,   182,    69,    -1,   192,   132,   192,
+      -1,   192,   133,   192,    -1,   192,   134,   192,    -1,   192,
+     135,   192,    -1,   192,   136,   192,    -1,   192,   138,   192,
+      -1,   133,   192,    -1,   126,   167,   145,    -1,    70,   126,
+     167,   145,    -1,    71,   126,   167,   145,    -1,    72,   126,
+     167,   129,   167,   145,    -1,    73,   126,   167,   145,    -1,
+      74,   126,   167,   145,    -1,    75,   126,   167,   145,    -1,
+      76,   126,   167,   129,   167,   145,    -1,    77,   126,   167,
+     129,   167,   145,    -1,    78,   126,   167,   145,    -1,    79,
+     126,   167,   145,    -1,    79,   126,   145,    -1,    80,   126,
+     167,   145,    -1,   192,    99,   192,    -1,   192,   131,   192,
+      -1,   192,   100,   192,    -1,   192,    98,   192,    -1,   192,
+      97,   192,    -1,   192,    95,   192,    -1,   192,    96,   192,
+      -1,   137,   192,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   277,   277,   278,   287,   292,   294,   298,   300,   304,
+     305,   309,   317,   322,   334,   336,   338,   340,   342,   347,
+     352,   359,   358,   369,   377,   379,   376,   390,   392,   389,
+     402,   401,   410,   419,   418,   432,   433,   438,   439,   443,
+     448,   453,   461,   463,   482,   489,   491,   502,   501,   513,
+     514,   519,   521,   526,   532,   538,   540,   542,   544,   546,
+     548,   550,   557,   561,   566,   574,   588,   594,   602,   609,
+     615,   608,   624,   634,   635,   640,   642,   644,   646,   651,
+     658,   665,   672,   679,   684,   689,   697,   696,   723,   729,
+     735,   741,   747,   766,   773,   780,   787,   794,   801,   808,
+     815,   822,   829,   844,   856,   862,   871,   878,   903,   907,
+     913,   919,   925,   931,   936,   942,   948,   954,   961,   970,
+     977,   993,  1010,  1015,  1020,  1025,  1030,  1035,  1040,  1045,
+    1053,  1063,  1073,  1083,  1093,  1099,  1107,  1109,  1121,  1126,
+    1156,  1158,  1164,  1173,  1175,  1180,  1185,  1190,  1195,  1200,
+    1205,  1211,  1216,  1224,  1225,  1229,  1234,  1240,  1242,  1248,
+    1254,  1260,  1269,  1279,  1281,  1290,  1292,  1300,  1302,  1307,
+    1322,  1340,  1342,  1344,  1346,  1348,  1350,  1352,  1354,  1356,
+    1361,  1363,  1371,  1375,  1377,  1385,  1387,  1393,  1399,  1405,
+    1411,  1420,  1422,  1424,  1426,  1428,  1430,  1432,  1434,  1436,
+    1438,  1440,  1442,  1444,  1446,  1448,  1450,  1452,  1454,  1456,
+    1458,  1460,  1462,  1464,  1466,  1468,  1470,  1472,  1474,  1476,
+    1478,  1480,  1482,  1487,  1489,  1494,  1499,  1507,  1509,  1516,
+    1523,  1530,  1537,  1544,  1546,  1548,  1550,  1558,  1566,  1579,
+    1581,  1583,  1592,  1601,  1614,  1623,  1632,  1641,  1643,  1645,
+    1647,  1649,  1655,  1660,  1662,  1664,  1666,  1668,  1670,  1672,
+    1674
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "LABEL", "VARIABLE", "NUMBER", "TEXT",
+  "COMMAND_LINE", "DELIMITED", "ORDINAL", "TH", "LEFT_ARROW_HEAD",
+  "RIGHT_ARROW_HEAD", "DOUBLE_ARROW_HEAD", "LAST", "BOX", "CIRCLE",
+  "ELLIPSE", "ARC", "LINE", "ARROW", "MOVE", "SPLINE", "HEIGHT", "RADIUS",
+  "FIGNAME", "WIDTH", "DIAMETER", "UP", "DOWN", "RIGHT", "LEFT", "FROM",
+  "TO", "AT", "WITH", "BY", "THEN", "SOLID", "DOTTED", "DASHED", "CHOP",
+  "SAME", "INVISIBLE", "LJUST", "RJUST", "ABOVE", "BELOW", "OF", "THE",
+  "WAY", "BETWEEN", "AND", "HERE", "DOT_N", "DOT_E", "DOT_W", "DOT_S",
+  "DOT_NE", "DOT_SE", "DOT_NW", "DOT_SW", "DOT_C", "DOT_START", "DOT_END",
+  "DOT_X", "DOT_Y", "DOT_HT", "DOT_WID", "DOT_RAD", "SIN", "COS", "ATAN2",
+  "LOG", "EXP", "SQRT", "K_MAX", "K_MIN", "INT", "RAND", "SRAND", "COPY",
+  "THRU", "TOP", "BOTTOM", "UPPER", "LOWER", "SH", "PRINT", "CW", "CCW",
+  "FOR", "DO", "IF", "ELSE", "ANDAND", "OROR", "NOTEQUAL", "EQUALEQUAL",
+  "LESSEQUAL", "GREATEREQUAL", "LEFT_CORNER", "RIGHT_CORNER", "NORTH",
+  "SOUTH", "EAST", "WEST", "CENTER", "END", "START", "RESET", "UNTIL",
+  "PLOT", "THICKNESS", "FILL", "COLORED", "OUTLINED", "SHADED", "XSLANTED",
+  "YSLANTED", "ALIGNED", "SPRINTF", "COMMAND", "DEFINE", "UNDEF", "'.'",
+  "'('", "'`'", "'['", "','", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'",
+  "'%'", "'!'", "'^'", "';'", "'='", "':'", "'{'", "'}'", "']'", "')'",
+  "$accept", "top", "element_list", "middle_element_list",
+  "optional_separator", "separator", "placeless_element", "$@1", "$@2",
+  "$@3", "$@4", "$@5", "$@6", "$@7", "macro_name", "reset_variables",
+  "print_args", "print_arg", "simple_if", "$@8", "until", "any_expr",
+  "text_expr", "optional_by", "element", "@9", "$@10", "optional_element",
+  "object_spec", "@11", "text", "sprintf_args", "position",
+  "position_not_place", "between", "expr_pair", "place", "label",
+  "ordinal", "optional_ordinal_last", "nth_primitive", "object_type",
+  "label_path", "relative_path", "path", "corner", "expr",
+  "expr_lower_than", "expr_not_lower_than", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,    46,    40,    96,    91,    44,
+      60,    62,    43,    45,    42,    47,    37,    33,    94,    59,
+      61,    58,   123,   125,    93,    41
 };
-static const short yydefred[] = {                         0,
-    8,    0,    2,    0,    0,    0,    0,  135,   17,   74,
-   75,   76,   77,   78,   79,   80,   81,    0,   13,   14,
-   16,   15,    0,   20,    0,    0,    0,    0,    0,    0,
-    0,   85,   68,    0,    4,    0,    0,   82,   71,    0,
-    9,    0,    0,    0,    0,    0,   26,    0,  161,  222,
-  223,  164,  166,  204,  203,  160,  190,  191,  192,  193,
-  194,  195,  196,  197,  198,  199,  200,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  201,  202,
-    0,    0,  209,  210,  215,  216,  217,  218,  219,  221,
-  220,    0,    0,    0,    0,    0,  142,  139,  162,    0,
-    0,    0,    0,    0,    0,   44,    0,   41,    0,    0,
-    0,    0,    0,    0,    0,    0,   38,    0,    0,    0,
-    0,    0,   32,    3,    0,  123,  124,  125,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  106,  107,    0,    0,    0,  121,  122,  129,  130,
-  131,  132,  126,  127,    0,    0,    0,    0,    0,    0,
-    0,  134,    0,  128,   39,    0,    0,   11,    0,   37,
-   36,   10,   23,    0,   21,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  207,  205,  211,  213,
-  208,  206,  212,  214,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  152,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  224,  225,  226,  227,  228,    0,  157,    0,
-    0,  178,  170,  171,  172,  173,  174,  175,  176,    0,
-  169,  167,  168,   42,    0,    0,   60,    0,    0,    0,
-   46,    0,    0,    0,    0,   84,  137,    0,    0,    0,
-    0,    5,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  103,    0,  184,    0,    0,    0,  105,    0,    0,    0,
-    0,    0,  117,  118,  116,    0,    0,   40,    0,    0,
-    0,    0,    0,    0,   65,    0,   12,    0,   27,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  247,    0,
-    0,    0,    0,  236,  155,  141,    0,    0,    0,  165,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  163,
-  143,  145,  177,    0,    0,   56,    0,    0,    0,    0,
-    0,   54,    0,    0,   53,   52,    0,   86,   69,   33,
-  181,  189,    0,    0,    0,  179,    0,    0,  183,    0,
-    0,   24,    0,  237,  238,    0,  240,  241,  242,    0,
-    0,  245,  246,  248,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   47,    0,  136,    0,    0,  188,  187,
-    0,  180,    0,    0,   28,    0,    0,    0,    0,    0,
-  147,  144,  146,  153,    0,    0,    0,    0,   73,   70,
-  186,    0,   25,   49,  239,  243,  244,    0,    0,  150,
-    0,    0,  185,    0,  149,    0,    0,   29,  151,    0,
-    0,   30,
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   146,   147,   147,   148,   149,   149,   150,   150,   151,
+     151,   152,   152,   152,   152,   152,   152,   152,   152,   152,
+     152,   153,   152,   152,   154,   155,   152,   156,   157,   152,
+     158,   152,   152,   159,   152,   152,   152,   160,   160,   161,
+     161,   161,   162,   162,   163,   163,   163,   165,   164,   166,
+     166,   167,   167,   168,   168,   168,   168,   168,   168,   168,
+     168,   168,   169,   169,   169,   170,   170,   170,   170,   171,
+     172,   170,   170,   173,   173,   174,   174,   174,   174,   174,
+     174,   174,   174,   174,   174,   174,   175,   174,   174,   174,
+     174,   174,   174,   174,   174,   174,   174,   174,   174,   174,
+     174,   174,   174,   174,   174,   174,   174,   174,   174,   174,
+     174,   174,   174,   174,   174,   174,   174,   174,   174,   174,
+     174,   174,   174,   174,   174,   174,   174,   174,   174,   174,
+     174,   174,   174,   174,   174,   174,   176,   176,   177,   177,
+     178,   178,   178,   179,   179,   179,   179,   179,   179,   179,
+     179,   179,   179,   180,   180,   181,   181,   182,   182,   182,
+     182,   182,   183,   183,   183,   184,   184,   185,   185,   186,
+     186,   187,   187,   187,   187,   187,   187,   187,   187,   187,
+     188,   188,   189,   189,   189,   190,   190,   190,   190,   190,
+     190,   191,   191,   191,   191,   191,   191,   191,   191,   191,
+     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
+     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
+     191,   191,   191,   192,   192,   193,   194,   194,   194,   194,
+     194,   194,   194,   194,   194,   194,   194,   194,   194,   194,
+     194,   194,   194,   194,   194,   194,   194,   194,   194,   194,
+     194,   194,   194,   194,   194,   194,   194,   194,   194,   194,
+     194
 };
-static const short yydgoto[] = {                          2,
-  112,  196,  114,  442,   97,   98,   34,   99,  100,  281,
-  282,  283,  115,  102,   35,    3,   36,   37,  103,  241,
-  104,  105,  172,  415,  367,  116,  107,  108,  259,    5,
-   39,   48,  308,  413,  174,  383,  451,  261,   40,  360,
-  122,  430,  407,  121,  220,
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     3,     1,     3,     0,     1,     1,
+       2,     3,     3,     4,     1,     1,     1,     1,     1,     2,
+       2,     0,     3,     2,     0,     0,     7,     0,     0,     6,
+       0,    10,     1,     0,     4,     1,     1,     1,     1,     2,
+       2,     3,     1,     2,     1,     1,     1,     0,     5,     0,
+       2,     1,     1,     3,     3,     3,     3,     3,     3,     3,
+       3,     2,     0,     2,     3,     1,     4,     4,     4,     0,
+       0,     6,     1,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     3,     0,     4,     3,     3,
+       3,     3,     2,     2,     3,     2,     3,     2,     3,     2,
+       3,     3,     3,     3,     3,     3,     3,     2,     2,     2,
+       3,     2,     3,     2,     3,     3,     3,     3,     3,     3,
+       2,     3,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     3,     2,     1,     5,     0,     3,
+       1,     1,     3,     1,     3,     5,     3,     5,     5,     5,
+       7,     6,     8,     1,     4,     3,     3,     1,     2,     2,
+       3,     1,     1,     1,     3,     1,     3,     1,     2,     2,
+       2,     1,     1,     1,     1,     1,     1,     1,     2,     1,
+       2,     3,     1,     1,     2,     1,     5,     4,     3,     3,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       1,     1,     2,     2,     2,     2,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     1,     1,     2,     2,
+       2,     2,     2,     3,     3,     3,     3,     3,     3,     2,
+       3,     4,     4,     6,     4,     4,     4,     6,     6,     4,
+       4,     3,     4,     3,     3,     3,     3,     3,     3,     3,
+       2
 };
-static const short yysindex[] = {                       -49,
-    0,    0,    0, 5473,  -26,  -10,  -15,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    5,    0,    0,
-    0,    0, -238,    0,13272, -185,13356, -178,13858,   45,
-13272,    0,    0, -255,    0,  -49,12851,    0,    0,  -36,
-    0,  -49,13356,   72, -231, -198,    0, -107,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  119,  123,  128,
-  139,  162,  164,  174,  175,  178,  179,  181,    0,    0,
- -266, -233,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,13521,13356,13858,13858, 1079,    0,    0,    0,  -17,
-  186,  454,   98,  997,  874,    0,13272,    0,  183,13356,
-13356, 1218,  -56, -288,  186, -234,    0,  -22,  -18,13272,
-  -49,  -49,    0,    0, 5011,    0,    0,    0,13858,13858,
-13858,13858,14111,14111,14111,14111,13942,13942,13942,13689,
-14027,    0,    0,14111,14111,14111,    0,    0,    0,    0,
-    0,    0,    0,    0,13858,14111, -243, -243, -243,13858,
-13858,    0, 1664,    0,    0,   -6,12604,    0,13356,    0,
-    0,    0,    0,  -14,    0,13356,13356,13356,13356,13356,
-13356,13356,13356,13356,12970,13356,    0,    0,    0,    0,
-    0,    0,    0,    0, 1543,  217,  228,  -39,   84,    6,
-  192,  192,  -16,    0,13858,13858,13858,13858,13858,13858,
-13858,13942,13858,13858,13858,13858,13858,13858,13858,13942,
-    4,  245,    0,    0,    0,    0,    0,   48,    0,14027,
-14027,    0,    0,    0,    0,    0,    0,    0,    0,  214,
-    0,    0,    0,    0,13858,  192,    0,13356,13356,13858,
-    0,13356,13356, -243, -243,    0,    0,  226, 5473,  185,
-   63,    0, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664,
- 1079,   98,   98,   98, 2203,  820,  820,   69,13153,  -17,
-    0,  465,    0,   98,13605,  -13,    0, 1664, 1664, 1664,
- 1664, 1664,    0,    0,    0, 1664, 1664,    0,  -10,  -15,
-    0,    0,    0,  186,    0,   98,    0,   73,    0,  293,
-  302,  300,  305,  306,  313,  317,  319,  316,    0,  323,
-  330,13942,13942,    0,    0,    0,13942,14027,14027,    0,
-   70, 2125, 1688,  107,  107,   54,   54, 1664,  194,  234,
-   54,  109,  109,  192,  192,  192,  192,  -38,  245,    0,
-    0,    0,    0,  394, 2125,    0, 2114,   26,   54,  126,
- 2125,    0, 2114,   26,    0,    0,   34,    0,    0,    0,
-    0,    0,  997,  870,  870,    0,  337,  129,    0,  325,
-  228,    0,   27,    0,    0,13356,    0,    0,    0,13356,
-13356,    0,    0,    0,  272,  -32,  121,  350,  368,  108,
-13942,13942,13858,    0,13858,    0, 5473,  870,    0,    0,
-  870,    0,   27,  152,    0,  374,  377,  381,13942,13942,
-    0,    0,    0,    0,   -8,   98, 1652, 1664,    0,    0,
-    0,  388,    0,    0,    0,    0,    0,   14,  221,    0,
-13774,   87,    0,  389,    0,13858, 1664,    0,    0, 1664,
-  188,    0,
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint16 yydefact[] =
+{
+       7,     9,     0,     3,     2,     8,     1,     0,     0,   136,
+      18,    75,    76,    77,    78,    79,    80,    81,    82,     0,
+      14,    15,    17,    16,     0,    21,     0,     0,     0,    36,
+       0,     0,     0,    86,    69,     7,    72,    35,    32,     5,
+      65,    83,    10,     7,     0,     0,     0,    23,    27,     0,
+     162,   226,   227,   165,   167,   205,   204,   161,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     202,   203,     0,     0,   210,   211,   216,   217,   218,   219,
+     220,   222,   221,     0,     0,     0,     0,    20,    42,    45,
+      46,   140,   143,   141,   157,     0,     0,   163,     0,    44,
+     223,   224,     0,     0,     0,     0,    52,     0,     0,    51,
+     224,    39,    84,     0,    19,     7,     7,     4,     8,    40,
+       0,    33,   124,   125,   126,     0,     0,     0,     0,    93,
+      95,    97,    99,     0,     0,     0,     0,     0,   107,   108,
+     109,   111,   120,   122,   123,   130,   131,   132,   133,   127,
+     128,     0,   113,     0,     0,     0,     0,     0,   135,   129,
+      92,     0,    12,     0,    38,    37,    11,    24,     0,    22,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   208,   206,   212,   214,   209,   207,   213,   215,     0,
+       0,   143,   141,    51,   224,     0,   239,   260,    43,     0,
+       0,   228,   229,   230,   231,   232,     0,   158,   179,   168,
+     171,   172,   173,   174,   175,   176,   177,     0,   169,   170,
+       0,   159,     0,   153,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    61,   260,    47,     0,     0,     0,     0,     0,
+       0,    85,   138,     0,     0,     0,     6,    41,     0,    88,
+      89,    90,    91,    94,    96,    98,   100,   101,     0,   102,
+     103,   162,   165,   167,     0,     0,   105,   183,   185,   104,
+     182,     0,   106,     0,   110,   112,   121,   134,   114,   118,
+     119,   117,   115,   116,   162,   226,   205,   204,    66,     0,
+      67,    68,    13,     0,    28,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   251,     0,     0,   240,     0,     0,
+       0,   156,   142,     0,     0,   166,   144,   146,   164,   178,
+     160,     0,   258,   259,   257,   256,   253,   255,   155,   225,
+     254,   233,   234,   235,   236,   237,   238,     0,     0,     0,
+       0,    55,    56,    58,    59,    54,    53,    57,   258,    60,
+     259,     0,    87,    70,    34,   190,   182,     0,     0,   180,
+       0,     0,   184,     0,    51,    25,    49,   241,   242,     0,
+     244,   245,   246,     0,     0,   249,   250,   252,     0,   144,
+     146,     0,     0,     0,     0,     0,     0,    48,     0,   137,
+      73,   189,   188,     0,   181,    49,     0,    29,     0,     0,
+       0,   148,   145,   147,     0,     0,   154,   149,     0,    62,
+     139,    74,    71,     0,    26,    50,   243,   247,   248,   149,
+       0,   151,     0,     0,   186,   150,   151,     0,    63,    30,
+     152,    64,     0,    31
 };
-static const short yyrindex[] = {                       320,
-    0,    0,    0,  440,  210,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  259,    0,    0,
-    0,    0,    0,  289,    0,   83,  324,    0,    0,  365,
-    0,12714,    0,    0,    0,  373,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,10957,    0,    0,    0,    0,
- 4751,10318,11167,    0,    0,    0,  597,    0,    0,    0,
-    0,  587,    0, 1560,    0,    0,    0,12201,    0,  626,
- 5937, 5937,    0,    0,  124,    0,    0,    0,    0,    0,
-    0,    0,11428,11546,11096,11278,    0,    0,    0,    0,
-    0,    0,    0,11680,11804,11932,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,12056,    0,    0,    0,    0,
-    0,    0, 5334,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  407,    0,  278,  383,    0,    0,
-  575,  694,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 3359,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,12555,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, 5679, 5798, 6143, 6262, 6607, 6726, 7071, 7190,
-    0, 7535, 7654, 7999,10437, -205,  191,    0,    0, 9973,
-    0,10742,    0, 8118,    0,    0,    0, 8463, 8582, 8927,
- 9046, 9391,    0,    0,    0, 9510, 9855,    0,12268, 2007,
- 2510, 2872,  659,  664,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, 4287, 4406, 3478, 3823, 2431, 2550, 5215,10820,    0,
- 2895, 1967, 2086, 1039, 1158, 1503, 1622,    0, 3942,    0,
-    0,    0,    0,    0,    9,    0,  349,  366, 3014,    0,
-    1,    0,  379, 3448,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  407,
-    0,    0,  633,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  401,  419,    0,
-    0,    0,    0,    0,    0,    0, 1015,    0,    0,    0,
-    0,    0,  633,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0, 4870,  111,   43,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  411,    0,
-    0,    0,    0,  432,    0,    0,  141,    0,    0,  151,
-    0,    0,
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     2,     3,    35,   264,     5,    36,    49,   313,   415,
+     178,   386,   452,   268,   176,    37,    97,    98,    38,   360,
+     417,   199,   116,   443,    39,   126,   410,   432,    40,   125,
+     117,   371,   100,   101,   249,   102,   118,   104,   105,   106,
+     107,   228,   287,   288,   289,   108,   119,   110,   120
 };
-static const short yygindex[] = {                         0,
-  -25,  220,  -19,    0,  -53,  298,    0,    0,  -66,    0,
-    0, -118,   33,  -84, -111,   90,    0,    0,10234, -102,
-    0,    0,    0,   88,    0,   40,  471,  -79,  103,  467,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  315,
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -240
+static const yytype_int16 yypact[] =
+{
+    -114,  -240,    20,  -240,   757,  -107,  -240,   -98,  -123,  -240,
+    -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -106,
+    -240,  -240,  -240,  -240,     9,  -240,  1087,    46,  1172,    49,
+    1597,   -70,  1087,  -240,  -240,  -114,  -240,     3,   -33,  -240,
+     877,  -240,  -240,  -114,  1172,   -60,    36,   -14,  -240,    74,
+    -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,
+    -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,   -34,
+     -18,     8,    38,    47,    51,    65,   101,   102,   112,   122,
+    -240,  -240,    21,   150,  -240,  -240,  -240,  -240,  -240,  -240,
+    -240,  -240,  -240,  1257,  1172,  1597,  1597,  1087,  -240,  -240,
+     -43,  -240,  -240,   357,  2242,    59,   258,  -240,    10,  2147,
+    -240,     1,     6,  1172,  1172,   145,    -1,     2,   357,  2273,
+    -240,  -240,   220,   249,  1087,  -114,  -114,  -240,   721,  -240,
+     252,  -240,  -240,  -240,  -240,  1597,  1597,  1597,  1597,  2024,
+    2024,  1853,  1939,  1682,  1682,  1682,  1427,  1767,  -240,  -240,
+    2024,  2024,  2024,  -240,  -240,  -240,  -240,  -240,  -240,  -240,
+    -240,  1597,  2024,    23,    23,    23,  1597,  1597,  -240,  -240,
+    2282,   593,  -240,  1172,  -240,  -240,  -240,  -240,   250,  -240,
+    1172,  1172,  1172,  1172,  1172,  1172,  1172,  1172,  1172,   458,
+    1172,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,   121,
+     107,   123,   256,  2157,   137,   261,   134,   134,  -240,  1767,
+    1767,  -240,  -240,  -240,  -240,  -240,   276,  -240,  -240,  -240,
+    -240,  -240,  -240,  -240,  -240,  -240,  -240,   138,  -240,  -240,
+      24,   156,   235,  -240,  1597,  1597,  1597,  1597,  1597,  1597,
+    1597,  1597,  1597,  1597,  1597,  1597,  1597,  1597,  1597,  1682,
+    1682,  1597,  -240,   134,  -240,  1172,  1172,    23,    23,  1172,
+    1172,  -240,  -240,   143,   757,   153,  -240,  -240,   280,  2282,
+    2282,  2282,  2282,  2282,  2282,  2282,  2282,   -43,  2147,   -43,
+     -43,  2253,   275,   275,   295,  1002,   -43,  2081,  -240,  -240,
+      10,  1342,  -240,   694,  2282,  2282,  2282,  2282,  2282,  -240,
+    -240,  -240,  2282,  2282,   -98,  -123,    16,    28,  -240,   -43,
+      56,   302,  -240,   291,  -240,   155,   160,   172,   161,   164,
+     167,   184,   185,   181,  -240,   186,   188,  -240,  1682,  1767,
+    1767,  -240,  -240,  1682,  1682,  -240,  -240,  -240,  -240,  -240,
+     156,   279,   314,  2291,   440,   440,   413,   413,  2282,   413,
+     413,   -72,   -72,   134,   134,   134,   134,   -49,   117,   343,
+     322,  -240,   314,   239,  2300,  -240,  -240,  -240,   314,   239,
+    2300,  -119,  -240,  -240,  -240,  -240,  -240,  2116,  2116,  -240,
+     206,   333,  -240,   123,  2131,  -240,   228,  -240,  -240,  1172,
+    -240,  -240,  -240,  1172,  1172,  -240,  -240,  -240,  -110,   195,
+     197,   -47,   128,   292,  1682,  1682,  1597,  -240,  1597,  -240,
+     757,  -240,  -240,  2116,  -240,   228,   338,  -240,   200,   202,
+     212,  -240,  -240,  -240,  1682,  1682,  -240,   -43,   -27,   360,
+    2282,  -240,  -240,   214,  -240,  -240,  -240,  -240,  -240,   -73,
+      30,  -240,  1512,   268,  -240,  -240,   216,  1597,  2282,  -240,
+    -240,  2282,   354,  -240
 };
-#define YYTABLESIZE 14474
-static const short yytable[] = {                         96,
-   55,  326,  243,  118,  230,   96,  231,  166,  255,    1,
-  230,  163,  231,  262,  218,  222,    8,  187,  188,  216,
-  214,   46,  215,  218,  217,  170,  171,  244,  216,  214,
-  211,  215,   41,  217,  230,  229,  231,  250,  197,  213,
-  244,   55,   44,   38,   55,   43,  250,   42,  213,  255,
-  191,  192,  255,  440,  164,  305,  230,  101,  231,   55,
-  252,  253,  164,  101,  106,   45,  195,  255,  201,  202,
-  106,  219,  109,  280,  406,  444,  164,  405,   93,  117,
-  219,   96,    6,  138,  119,  246,  138,  287,  189,  190,
-  218,  247,  123,   55,   96,  216,  214,   47,  215,   93,
-  217,  255,    4,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  271,  271,  271,  286,  254,  255,  288,  289,
-  290,  193,  194,    7,  198,   55,  328,  327,  329,  291,
-  292,   30,  169,  255,  296,  297,  349,  173,  124,  101,
-  230,  271,  231,  218,  167,  218,  106,  219,  216,  214,
-  216,  215,  101,  217,  175,  217,  372,  256,  176,  106,
-  377,  421,  177,  230,   38,  231,  250,  178,  213,  101,
-  101,  101,  101,  374,  375,    6,  351,  352,  179,  332,
-  333,  334,  335,  336,  337,  338,  339,  341,  342,  343,
-  344,  345,  346,  347,  271,  222,  293,  294,  295,  304,
-  219,  180,  219,  181,  286,  286,   38,    6,  371,    7,
-  258,  260,  280,  182,  183,  379,    7,  184,  185,  354,
-  186,  165,  355,  357,  359,  197,  361,  363,  356,  358,
-  218,  381,  362,  364,  251,  216,  214,    8,  215,   49,
-  217,  257,    7,  245,  101,   52,  113,  309,    7,    7,
-   53,  298,  101,  195,    7,  409,  410,  324,   35,  380,
-   49,  445,  168,  230,   55,  231,   52,  402,  325,  330,
-  408,   53,  255,  420,  398,  399,  230,  401,  231,  223,
-  224,  225,  226,  227,  221,  219,  331,  219,   31,  431,
-  228,   55,  432,  365,  366,  429,  339,  271,   38,  255,
-    7,  271,  286,  286,  350,    7,  353,  371,  371,  369,
-  255,  198,  200,  255,  230,  419,  231,   35,  368,    6,
-  142,  142,  142,   64,  370,  376,  205,  206,  207,  208,
-  209,  210,    7,  384,  382,  205,  206,  207,  208,  209,
-  210,  371,  385,  386,  371,  387,  388,   31,  256,   55,
-   55,   35,   30,  389,  101,  101,  392,  255,  255,  101,
-  390,  218,  391,  393,   34,   59,  216,  214,  211,  215,
-  394,  217,   22,  400,  252,  271,  271,  427,   58,  428,
-  411,   31,   64,   35,  250,  412,  213,  404,  307,  256,
-  422,  414,  256,  271,  271,  310,  311,  312,  313,  314,
-  315,  316,  317,  318,  320,  321,   59,  256,  423,   59,
-    6,  434,  424,   31,  435,  447,   64,  436,  219,   58,
-  450,  437,   58,   34,   59,  140,  140,  140,  443,  449,
-  218,   22,  448,  101,  101,  216,  214,   58,  215,    1,
-  217,  256,    6,  143,  143,  143,   38,   50,   64,  452,
-  166,  101,  101,  250,  148,  213,   61,   34,   59,  209,
-  210,  145,  145,  145,  303,   22,    7,    7,    7,    7,
-    7,   58,    7,  256,  150,  150,  150,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,   62,  219,    7,   34,
-   59,    7,    7,    7,    7,  203,   63,   22,  204,  228,
-  433,  120,  125,   58,  223,  224,  225,  226,  227,  323,
-  378,    0,    0,    0,    0,    0,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    7,    7,    0,    0,
-    0,    0,    0,    7,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    0,    7,    7,    7,    7,
-    7,    7,    0,    0,    7,    0,    7,    0,    0,    0,
-    0,    0,    0,    0,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,  235,    7,    6,    6,    0,    6,
-    6,    0,    0,    0,    7,    7,   50,    0,    6,    6,
-    6,    6,    6,    6,    6,    6,   19,    0,    6,    0,
-    0,    6,    6,    6,    6,  416,    0,  235,    0,  417,
-  418,  235,  256,    0,  235,  235,  235,  235,  235,  235,
-    0,  235,    0,    0,    0,   18,    0,   50,    0,   59,
-   50,    0,   48,  235,  235,    0,  235,    0,    0,  256,
-    0,    0,   58,    0,    0,   50,    0,    0,    0,    0,
-  256,    0,    0,  256,    6,   19,   59,    0,   66,    0,
-    6,    6,    0,   67,    6,    0,    6,  235,    0,   58,
-  235,    0,    0,  248,  249,  207,  208,  209,  210,   50,
-  403,    0,    0,    6,   18,    6,    0,    0,    0,   19,
-    0,   48,    0,  257,    6,    6,    0,    0,  256,  235,
-    0,  139,    0,  139,    0,    0,  140,    0,  140,    0,
-    0,   50,    0,    0,    0,   59,    0,   66,   18,    0,
-    0,   19,   67,    0,    0,   48,  257,    0,   58,    0,
-  257,    0,    0,  257,  257,  257,  257,  257,  257,    0,
-  257,    0,  205,  206,  207,  208,  209,  210,   54,   55,
-   18,   66,  257,  257,    0,  257,   67,   48,    0,    0,
-    0,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-   66,   67,   57,   58,   59,   60,   61,   62,   63,   64,
-   65,   66,   67,   66,    0,    0,  257,    0,   67,  257,
-   79,   80,   81,   82,    0,    0,    0,    0,    0,    0,
-    0,   79,   80,   81,   82,    0,    0,    0,   83,   84,
-   85,   86,   87,   88,   89,   90,   91,    0,  257,   83,
-   84,   85,   86,   87,   88,   89,   90,   91,    0,    0,
-    0,  235,  235,  235,  235,    0,    0,  235,  235,  235,
-  235,  235,  235,    0,    0,    0,    0,    0,    0,    0,
-   50,  235,  235,    0,  235,  235,  235,  235,  235,  235,
-  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  235,  235,  235,  235,  235,  235,  235,   50,    0,  235,
-  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  235,  235,  235,    0,    0,    0,    0,    0,  235,  235,
-  235,  235,  235,  235,  235,  235,  235,  235,  235,    0,
-  240,  235,  235,  235,  235,  278,    0,  235,  235,    0,
-  235,    0,    0,  235,  235,  235,  235,  235,  235,  235,
-  235,  235,  235,  235,  235,  235,  235,  235,    0,    0,
-    0,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  257,  257,  257,  257,    0,    0,  257,  257,  257,  257,
-  257,  257,    0,    0,  240,    0,    0,    0,    0,    0,
-  257,  257,    0,  257,  257,  257,  257,  257,  257,  257,
-  257,  257,  257,  257,  257,  257,  257,  257,  257,  257,
-  257,  257,  257,  257,  257,  257,    0,    0,  257,  257,
-  257,  257,  257,  257,  257,  257,  257,  257,  257,  257,
-  257,  257,    0,    0,   72,    0,    0,  257,  257,  257,
-  257,  257,  257,  257,  257,  257,  257,  257,    0,    0,
-  257,  257,  257,  257,    0,    0,  257,  257,  231,  257,
-    0,    0,  257,  257,  257,  257,  257,  257,  257,  257,
-  257,  257,  257,  257,  257,  257,  257,    0,    0,    0,
-  257,  257,  257,  257,  257,  257,  257,  257,  257,    0,
-    0,  231,    0,   72,    0,  231,    0,    0,  231,  231,
-  231,  231,  231,  231,    0,  231,    0,  240,  233,  234,
-  235,  236,  237,  238,    0,  239,    0,  231,  231,    0,
-  231,    0,    0,    0,    0,    0,    0,   72,    0,    0,
-    0,    0,    0,    0,    0,  218,    0,    0,    0,    0,
-  216,  214,  211,  215,    0,  217,    0,    0,    0,    0,
-    0,  231,    0,  232,  231,    0,    0,    0,  212,   72,
-  213,  242,  233,  234,  235,  236,  237,  238,    0,  239,
-    0,    0,    0,   54,   55,    0,    0,  232,    0,    0,
-    0,    0,    0,  231,    0,    0,    0,    0,    0,    0,
-    0,    0,  219,    0,    0,    0,    0,   57,   58,   59,
-   60,   61,   62,   63,   64,   65,   66,   67,    0,    0,
-  232,    0,    0,    0,  232,    0,    0,  232,  232,  232,
-  232,  232,  232,    0,  232,    0,   79,   80,   81,   82,
-    0,    0,    0,    0,    0,    0,  232,  232,    0,  232,
-    0,    0,    0,    0,   83,   84,   85,   86,   87,   88,
-   89,   90,   91,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  232,    0,    0,  232,  218,    0,  232,    0,    0,  216,
-  214,    0,  215,    0,  217,  233,  234,  235,  236,  237,
-  238,    0,  239,    0,    0,    0,    0,  250,    0,  213,
-    0,    0,  232,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  231,  231,  231,  231,    0,
-    0,  231,  231,  231,  231,  231,  231,    0,    0,    0,
-    0,  219,    0,    0,    0,  231,  231,    0,  231,  231,
-  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,    0,    0,  231,  231,  231,  231,  231,  231,  231,
-  231,  231,  231,  231,  231,  231,  231,    0,    0,    0,
-    0,    0,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,  231,  231,    0,    0,  231,  231,  231,  231,    0,
-  203,  231,  231,  204,  231,    0,    0,  231,  231,  231,
-  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,  231,    0,    0,    0,  231,  231,  231,  231,  231,
-  231,  231,  231,  231,  232,  232,  232,  232,    0,    0,
-  232,  232,  232,  232,  232,  232,    0,  205,  206,  207,
-  208,  209,  210,    0,  232,  232,    0,  232,  232,  232,
-  232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-  232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-    0,    0,  232,  232,  232,  232,  232,  232,  232,  232,
-  232,  232,  232,  232,  232,  232,    0,    0,    0,    0,
-    0,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-  232,  232,    0,    0,  232,  232,  232,  232,    0,    0,
-  232,  232,  233,  232,    0,    0,  232,  232,  232,  232,
-  232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-  232,    0,    0,    0,  232,  232,  232,  232,  232,  232,
-  232,  232,  232,    0,    0,  233,    0,    0,    0,  233,
-    0,    0,  233,  233,  233,  233,  233,  233,    0,  233,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   51,
-    0,  233,  233,    0,  233,    0,  248,  249,  207,  208,
-  209,  210,    0,    0,    0,    0,    0,    0,    0,  218,
-    0,    0,    0,    0,  216,  214,  211,  215,    0,  217,
-    0,    0,    0,    0,    0,  233,    0,    0,  233,    0,
-   51,    0,  322,   51,  213,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   51,    0,
-    0,  234,    0,    0,    0,    0,    0,  233,    0,    0,
-    0,    0,    0,    0,    0,    0,  219,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   51,    0,  234,    0,    0,    0,  234,    0,
-    0,  234,  234,  234,  234,  234,  234,    0,  234,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  234,  234,    0,  234,   51,    0,    0,    0,  218,    0,
-    0,    0,    0,  216,  214,    0,  215,    0,  217,    0,
-  218,    0,    0,    0,    0,  216,  214,    0,  215,    0,
-  217,  250,    0,  213,  234,    0,    0,  234,    0,    0,
-    0,    0,    0,  250,  218,  213,    0,    0,    0,  216,
-  214,    0,  215,    0,  217,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  219,  234,  250,    0,  213,
-    0,    0,    0,    0,    0,    0,    0,  219,    0,  233,
-  233,  233,  233,    0,    0,  233,  233,  233,  233,  233,
-  233,    0,    0,    0,    0,    0,    0,    0,    0,  233,
-  233,  219,  233,  233,  233,  233,  233,  233,  233,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  233,  233,
-  233,  233,  233,  233,  233,    0,    0,  233,  233,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  233,  233,
-  233,    0,    0,   51,    0,    0,  233,  233,  233,  233,
-  233,  233,  233,  233,  233,  233,  233,    0,    0,  233,
-  233,  233,  233,    0,  203,  233,  233,  204,  233,    0,
-   51,  233,  233,  233,  233,  233,  233,  233,  233,  233,
-  233,  233,  233,  233,  233,  233,    0,    0,    0,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  234,  234,
-  234,  234,    0,    0,  234,  234,  234,  234,  234,  234,
-    0,  248,  249,  207,  208,  209,  210,    0,  234,  234,
-    0,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,    0,    0,  234,  234,  234,  234,
-  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-    0,  441,    0,    0,    0,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,  234,  234,    0,    0,  234,  234,
-  234,  234,    0,    0,  234,  234,  229,  234,    0,    0,
-  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,  234,    0,    0,    0,  234,  234,
-  234,  234,  234,  234,  234,  234,  234,    0,    0,  229,
-  205,  206,  207,  208,  209,  210,  229,  229,    0,  229,
-  229,  229,  205,  206,  207,  208,  209,  210,    0,    0,
-    0,    0,    0,    0,    0,  229,  229,    0,  229,    0,
-    0,    0,    0,    0,    0,    0,  205,    0,  207,  208,
-  209,  210,    0,  222,    0,    0,    0,    0,  222,  222,
-  222,  222,    0,  222,    0,    0,    0,    0,    0,  229,
-    0,    0,  229,    0,    0,    0,  222,    0,  222,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  230,    0,    0,    0,    0,
-    0,  229,    0,    0,    0,    0,    0,    0,    0,    0,
-  222,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  230,    0,
-    0,    0,    0,    0,    0,  230,  230,    0,  230,  230,
-  230,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  230,  230,    0,  230,    0,    0,
-  218,    0,    0,    0,    0,  216,  214,    0,  215,    0,
-  217,  218,    0,    0,    0,    0,  216,  214,    0,  215,
-    0,  217,    0,  250,    0,  213,    0,    0,  230,    0,
-    0,  230,    0,    0,  250,    0,  213,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  219,    0,    0,
-  230,    0,    0,    0,    0,    0,    0,    0,  219,    0,
-    0,    0,    0,  229,  229,  229,  229,    0,    0,  229,
-  229,  229,  229,  229,  229,    0,    0,    0,    0,    0,
-    0,    0,    0,  229,  229,    0,  229,  229,  229,  229,
-  229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-  229,  229,  229,  229,  229,  229,  229,  229,  229,    0,
-    0,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-  229,  229,  229,  229,  229,    0,    0,    0,    0,    0,
-  229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-  229,    0,    0,  229,  229,  229,  229,    0,  222,  229,
-  229,  222,  229,    0,    0,  229,  229,  229,  229,  229,
-  229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-    0,    0,    0,  229,  229,  229,  229,  229,  229,  229,
-  229,  229,  230,  230,  230,  230,    0,    0,  230,  230,
-  230,  230,  230,  230,    0,  222,  222,  222,  222,  222,
-  222,    0,  230,  230,    0,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,    0,    0,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,    0,    0,    0,    0,    0,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-    0,    0,  230,  230,  230,  230,    0,    0,  230,  230,
-  250,  230,    0,    0,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,    0,
-    0,    0,  230,  230,  230,  230,  230,  230,  230,  230,
-  230,    0,  248,  250,  207,  208,  209,  210,    0,    0,
-  250,  250,    0,    0,  250,  207,  208,  209,  210,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  250,
-  250,    0,  250,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   16,
-   57,   58,   59,   60,   61,   62,   63,   64,   65,   66,
-   67,    0,    0,  250,    0,    0,  250,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   79,
-   80,   81,   82,    0,    0,    0,    0,    0,    0,  252,
-    0,    0,    0,    0,    0,  250,    0,   83,   84,   85,
-   86,   87,   88,   89,   90,   91,    0,    0,   16,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  252,    0,    0,    0,    0,    0,    0,  252,
-  252,    0,    0,  252,    0,    0,    0,    0,    0,    0,
-    0,    0,   16,    0,    0,  204,    0,    0,  252,  252,
-    0,  252,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   16,    0,    0,    0,    0,    0,
-    0,    0,  252,    0,    0,  252,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  252,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  250,  250,  250,
-  250,    0,    0,  250,  250,  250,  250,  250,  250,    0,
-    0,    0,    0,    0,    0,    0,    0,  250,  250,    0,
-  250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
-  250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
-  250,  250,  250,    0,    0,  250,  250,  250,  250,  250,
-  250,  250,  250,  250,  250,  250,  250,  250,  250,    0,
-    0,    0,    0,    0,  250,  250,  250,  250,  250,  250,
-  250,  250,  250,  250,  250,    0,  204,  250,  250,  250,
-  250,    0,  204,  250,  250,    0,  250,  204,    0,  250,
-  250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
-  250,  250,  250,  250,    0,    0,    0,  250,  250,  250,
-  250,  250,  250,  250,  250,  250,  252,  252,  252,  252,
-    0,  204,  252,  252,  252,  252,  252,  252,    0,    0,
-    0,    0,    0,    0,    0,    0,  252,  252,    0,  252,
-  252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-  252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-  252,  252,    0,    0,  252,  252,  252,  252,  252,  252,
-  252,  252,  252,  252,  252,  252,  252,  252,    0,    0,
-    0,   15,    0,  252,  252,  252,  252,  252,  252,  252,
-  252,  252,  252,  252,    0,    0,  252,  252,  252,  252,
-    0,    0,  252,  252,  251,  252,    0,    0,  252,  252,
-  252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-  252,  252,  252,    0,    0,    0,  252,  252,  252,  252,
-  252,  252,  252,  252,  252,    0,    0,  251,    0,    0,
-   15,    0,    0,    0,  251,  251,    0,    0,  251,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  251,  251,    0,  251,    0,    0,    0,
-    0,    0,    0,    0,   15,    0,    0,  203,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  251,    0,    0,
-  251,    0,    0,    0,    0,    0,   15,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  249,    0,    0,    0,    0,    0,  251,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  249,    0,    0,    0,
-    0,    0,    0,  249,  249,    0,    0,  249,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  249,  249,    0,  249,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  249,    0,    0,  249,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  203,    0,
-    0,    0,    0,    0,  203,    0,    0,    0,  249,  203,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  251,  251,  251,  251,    0,    0,  251,  251,  251,
-  251,  251,  251,    0,    0,    0,    0,    0,    0,    0,
-    0,  251,  251,  203,  251,  251,  251,  251,  251,  251,
-  251,  251,  251,  251,  251,  251,  251,  251,  251,  251,
-  251,  251,  251,  251,  251,  251,  251,    0,    0,  251,
-  251,  251,  251,  251,  251,  251,  251,  251,  251,  251,
-  251,  251,  251,    0,    0,    0,    0,    0,  251,  251,
-  251,  251,  251,  251,  251,  251,  251,  251,  251,    0,
-    0,  251,  251,  251,  251,    0,    0,  251,  251,    0,
-  251,    0,    0,  251,  251,  251,  251,  251,  251,  251,
-  251,  251,  251,  251,  251,  251,  251,  251,    0,    0,
-    0,  251,  251,  251,  251,  251,  251,  251,  251,  251,
-  249,  249,  249,  249,    0,    0,  249,  249,  249,  249,
-  249,  249,    0,    0,    0,    0,    0,    0,    0,    0,
-  249,  249,    0,  249,  249,  249,  249,  249,  249,  249,
-  249,  249,  249,  249,  249,  249,  249,  249,  249,  249,
-  249,  249,  249,  249,  249,  249,    0,    0,  249,  249,
-  249,  249,  249,  249,  249,  249,  249,  249,  249,  249,
-  249,  249,    0,    0,    0,    0,    0,  249,  249,  249,
-  249,  249,  249,  249,  249,  249,  249,  249,    0,    0,
-  249,  249,  249,  249,    0,    0,  249,  249,  158,  249,
-    0,    0,  249,  249,  249,  249,  249,  249,  249,  249,
-  249,  249,  249,  249,  249,  249,  249,    0,    0,    0,
-  249,  249,  249,  249,  249,  249,  249,  249,  249,    0,
-    0,  158,    0,    0,    0,    0,    0,    0,  158,  158,
-    0,  158,  158,  158,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  158,    0,    0,
-  158,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   57,    0,    0,
-    0,  158,    0,    0,  158,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  254,    0,    0,
-    0,    0,    0,  158,    0,    0,    0,    0,   57,    0,
-    0,   57,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   57,    0,    0,    0,
-  254,    0,    0,    0,    0,    0,    0,  254,  254,    0,
-    0,  254,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  254,    0,    0,    0,
-   57,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  254,    0,   57,  254,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  254,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  158,  158,  158,  158,    0,
-    0,  158,    0,  158,  158,  158,  158,    0,    0,    0,
-    0,    0,    0,    0,    0,  158,  158,    0,  158,  158,
-  158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-  158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-    0,    0,    0,    0,  158,  158,  158,  158,  158,  158,
-  158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-  158,  158,  158,  158,  158,  158,  158,  158,  158,  158,
-  158,  158,  158,    0,    0,  158,  158,  158,  158,    0,
-    0,  158,  158,    0,    0,    0,    0,    0,    0,    0,
-    0,   57,    0,  158,  158,  158,  158,  158,  158,  158,
-  158,  158,    0,    0,    0,  158,  158,  158,  158,  158,
-  158,  158,  158,  158,  254,  254,  254,  254,   57,    0,
-  254,  254,  254,  254,  254,  254,    0,    0,    0,    0,
-    0,    0,    0,    0,  254,  254,    0,  254,  254,  254,
-  254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
-  254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
-    0,    0,  254,  254,  254,  254,  254,  254,  254,  254,
-  254,  254,  254,  254,  254,  254,    0,   57,    0,    0,
-    0,  254,  254,  254,  254,  254,  254,  254,  254,  254,
-  254,  254,    0,    0,  254,  254,  254,  254,    0,    0,
-  254,  254,  253,  254,    0,    0,  254,  254,  254,  254,
-    0,    0,  254,  254,  254,  254,  254,  254,  254,  254,
-  254,    0,    0,    0,  254,  254,  254,  254,  254,  254,
-  254,  254,  254,    0,    0,  253,    0,    0,    0,    0,
-    0,    0,  253,  253,    0,    0,  253,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  253,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  253,    0,    0,  253,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  159,    0,    0,    0,    0,    0,  253,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  159,    0,    0,    0,    0,    0,
-    0,  159,  159,    0,  159,  159,  159,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  159,    0,    0,  159,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  159,    0,    0,  159,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  159,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  253,
-  253,  253,  253,    0,    0,  253,  253,  253,  253,  253,
-  253,    0,    0,    0,    0,    0,    0,    0,    0,  253,
-  253,    0,  253,  253,  253,  253,  253,  253,  253,  253,
-  253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
-  253,  253,  253,  253,  253,    0,    0,  253,  253,  253,
-  253,  253,  253,  253,  253,  253,  253,  253,  253,  253,
-  253,    0,    0,    0,    0,    0,  253,  253,  253,  253,
-  253,  253,  253,  253,  253,  253,  253,    0,    0,  253,
-  253,  253,  253,    0,    0,  253,  253,    0,  253,    0,
-    0,  253,  253,  253,  253,    0,    0,  253,  253,  253,
-  253,  253,  253,  253,  253,  253,    0,    0,    0,  253,
-  253,  253,  253,  253,  253,  253,  253,  253,  159,  159,
-  159,  159,    0,    0,  159,    0,  159,  159,  159,  159,
-    0,    0,    0,    0,    0,    0,    0,    0,  159,  159,
-    0,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-  159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-  159,  159,  159,    0,    0,    0,    0,  159,  159,  159,
-  159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-  159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-  159,  159,  159,  159,  159,  159,    0,    0,  159,  159,
-  159,  159,    0,    0,  159,  159,  255,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  159,  159,  159,  159,
-  159,  159,  159,  159,  159,    0,    0,    0,  159,  159,
-  159,  159,  159,  159,  159,  159,  159,    0,    0,  255,
-    0,    0,    0,    0,    0,    0,  255,  255,    0,    0,
-  255,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  255,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  255,
-    0,    0,  255,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  256,    0,    0,    0,    0,
-    0,  255,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  256,    0,
-    0,    0,    0,    0,    0,  256,  256,    0,    0,  256,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  256,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  256,    0,
-    0,  256,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  256,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  255,  255,  255,  255,    0,    0,  255,
-  255,  255,  255,  255,  255,    0,    0,    0,    0,    0,
-    0,    0,    0,  255,  255,    0,  255,  255,  255,  255,
-  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-  255,  255,  255,  255,  255,  255,  255,  255,  255,    0,
-    0,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-  255,  255,  255,  255,  255,    0,    0,    0,    0,    0,
-  255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-  255,    0,    0,  255,  255,  255,  255,    0,    0,  255,
-  255,    0,  255,    0,    0,  255,  255,    0,    0,    0,
-    0,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-    0,    0,    0,  255,  255,  255,  255,  255,  255,  255,
-  255,  255,  256,  256,  256,  256,    0,    0,  256,  256,
-  256,  256,  256,  256,    0,    0,    0,    0,    0,    0,
-    0,    0,  256,  256,    0,  256,  256,  256,  256,  256,
-  256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
-  256,  256,  256,  256,  256,  256,  256,  256,    0,    0,
-  256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
-  256,  256,  256,  256,    0,    0,    0,    0,    0,  256,
-  256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
-    0,    0,  256,  256,  256,  256,    0,    0,  256,  256,
-  140,  256,    0,    0,    0,  256,    0,    0,    0,    0,
-  256,  256,  256,  256,  256,  256,  256,  256,  256,    0,
-    0,    0,  256,  256,  256,  256,  256,  256,  256,  256,
-  256,    0,    0,  140,    0,    0,    0,    0,    0,    0,
-  140,  140,    0,  140,  140,  140,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  140,
-    0,    0,  140,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  140,    0,    0,  140,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  148,
-    0,    0,    0,    0,    0,  140,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  148,    0,    0,    0,    0,    0,    0,  148,
-  148,    0,    0,  148,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  148,    0,
-    0,  148,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  148,    0,    0,  148,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  148,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  140,  140,  140,
-  140,    0,    0,  140,    0,  140,  140,  140,  140,    0,
-    0,    0,    0,    0,    0,    0,    0,  140,  140,    0,
-  140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
-  140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
-  140,  140,    0,    0,    0,    0,  140,  140,  140,  140,
-  140,  140,  140,  140,  140,  140,  140,  140,  140,   41,
-    0,    0,    0,    0,  140,  140,  140,  140,  140,  140,
-  140,  140,  140,  140,  140,    0,    0,  140,  140,  140,
-  140,    0,    0,  140,  140,    0,    0,    0,    0,    0,
-    0,   32,    0,    0,    0,  140,  140,  140,  140,  140,
-  140,  140,  140,  140,    0,    0,    0,  140,  140,  140,
-  140,  140,  140,  140,  140,  140,  148,  148,  148,  148,
-    0,    0,  148,   33,  148,  148,  148,  148,    0,    0,
-    0,    0,    0,    0,    0,    0,  148,  148,    0,  148,
-  148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
-  148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
-  148,    0,    0,    0,    0,  148,  148,  148,  148,  148,
-  148,  148,  148,  148,  148,  148,  148,  148,    0,    0,
-    0,    0,    0,  148,  148,  148,  148,  148,  148,  148,
-  148,  148,  148,  148,    0,    0,  148,  148,  148,  148,
-    0,    0,  148,  148,  154,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  148,  148,  148,  148,  148,  148,
-  148,  148,  148,    0,    0,    0,  148,  148,  148,  148,
-  148,  148,  148,  148,  148,    0,    0,  154,    0,    0,
-    0,    0,    0,    0,  154,  154,    0,    0,  154,    0,
-    0,    0,    0,    0,    0,    0,    0,    6,    7,    0,
-    8,    9,    0,  154,    0,    0,    0,    0,    0,   10,
-   11,   12,   13,   14,   15,   16,   17,    0,    0,   18,
-    0,    0,   19,   20,   21,   22,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  154,    0,    0,
-  154,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   91,    0,    0,    0,    0,    0,  154,
-    0,    0,    0,    0,    0,   23,    0,    0,    0,    0,
-    0,   24,   25,    0,    0,   26,    0,   27,    0,    0,
-    0,    0,    0,    0,    0,    0,   91,    0,    0,    0,
-    0,    0,    0,   91,   28,    0,   29,    0,    0,    0,
-    0,    0,    0,    0,    0,   30,   31,    0,    0,    0,
-    0,    0,   91,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   91,    0,    0,   91,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   91,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  154,  154,  154,  154,    0,    0,  154,    0,  154,
-  154,  154,  154,    0,    0,    0,    0,    0,    0,    0,
-    0,  154,  154,    0,  154,  154,  154,  154,  154,  154,
-  154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-  154,  154,  154,  154,  154,  154,    0,    0,    0,    0,
-  154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-  154,  154,  154,    0,    0,    0,    0,    0,  154,  154,
-  154,  154,  154,  154,  154,  154,  154,  154,  154,    0,
-    0,  154,  154,  154,  154,    0,    0,  154,  154,    0,
-    0,    0,    0,   32,    0,    0,    0,    0,    0,  154,
-  154,  154,  154,  154,  154,  154,  154,  154,    0,    0,
-    0,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-   91,   91,   91,   91,    0,   33,   91,    0,   91,   91,
-   91,   91,    0,    0,    0,    0,    0,    0,    0,    0,
-   91,   91,    0,   91,   91,   91,   91,   91,   91,   91,
-   91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-   91,   91,   91,   91,   91,    0,    0,    0,    0,    0,
-   91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-   91,   91,    0,    0,    0,    0,    0,   91,   91,   91,
-   91,   91,   91,   91,   91,   91,   91,   91,    0,    0,
-   91,   91,   91,   91,    0,    0,   91,   91,   87,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   91,   91,
-   91,   91,   91,   91,   91,   91,   91,    0,    0,    0,
-   91,   91,   91,   91,   91,   91,   91,   91,   91,    0,
-    0,   87,    0,    0,    0,    0,    0,    0,   87,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    6,
-    7,    0,    8,    9,    0,    0,    0,   87,    0,    0,
-    0,   10,   11,   12,   13,   14,   15,   16,   17,    0,
-    0,   18,    0,    0,   19,   20,   21,   22,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   87,    0,    0,   87,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   88,    0,    0,
-    0,    0,    0,   87,    0,    0,    0,   23,    0,    0,
-    0,    0,    0,   24,   25,    0,    0,   26,    0,   27,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   88,    0,    0,    0,    0,    0,   28,   88,   29,    0,
-    0,    0,    0,    0,    0,    0,    0,   30,   31,    0,
-    0,    0,    0,    0,    0,    0,   88,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   88,    0,    0,   88,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   88,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   87,   87,   87,   87,    0,
-    0,   87,    0,   87,   87,   87,   87,    0,    0,    0,
-    0,    0,    0,    0,    0,   87,   87,    0,   87,   87,
-   87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-   87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-    0,    0,    0,    0,    0,   87,   87,   87,   87,   87,
-   87,   87,   87,   87,   87,   87,   87,    0,    0,    0,
-    0,    0,   87,   87,   87,   87,   87,   87,   87,   87,
-   87,   87,   87,    0,    0,   87,   87,   87,   87,    0,
-    0,   87,   87,    0,    0,    0,    0,    6,    0,    0,
-    0,    0,    0,   87,   87,   87,   87,   87,   87,   87,
-   87,   87,    0,    0,    0,   87,   87,   87,   87,   87,
-   87,   87,   87,   87,   88,   88,   88,   88,    0,    6,
-   88,    0,   88,   88,   88,   88,    0,    0,    0,    0,
-    0,    0,    0,    0,   88,   88,    0,   88,   88,   88,
-   88,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-   88,   88,   88,   88,   88,   88,   88,   88,   88,    0,
-    0,    0,    0,    0,   88,   88,   88,   88,   88,   88,
-   88,   88,   88,   88,   88,   88,    0,    0,    0,    0,
-    0,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-   88,   88,    0,    0,   88,   88,   88,   88,    0,    0,
-   88,   88,   89,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   88,   88,   88,   88,   88,   88,   88,   88,
-   88,    0,    0,    0,   88,   88,   88,   88,   88,   88,
-   88,   88,   88,    0,    0,   89,    0,    0,    0,    0,
-    0,    0,   89,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    6,    6,    0,    6,    6,    0,    0,
-    0,   89,    0,    0,    0,    6,    6,    6,    6,    6,
-    6,    6,    6,    0,    0,    6,    0,    0,    6,    6,
-    6,    6,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   89,    0,    0,   89,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   90,    0,    0,    0,    0,    0,   89,    0,    0,
-    0,    6,    0,    0,    0,    0,    0,    6,    6,    0,
-    0,    6,    0,    6,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   90,    0,    0,    0,    0,    0,
-    6,   90,    6,    0,    0,    0,    0,    0,    0,    0,
-    0,    6,    6,    0,    0,    0,    0,    0,    0,    0,
-   90,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   90,    0,    0,   90,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   90,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   89,
-   89,   89,   89,    0,    0,   89,    0,   89,   89,   89,
-   89,    0,    0,    0,    0,    0,    0,    0,    0,   89,
-   89,    0,   89,   89,   89,   89,   89,   89,   89,   89,
-   89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-   89,   89,   89,   89,    0,    0,    0,    0,    0,   89,
-   89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-   89,    0,    0,    0,    0,    0,   89,   89,   89,   89,
-   89,   89,   89,   89,   89,   89,   89,    0,    0,   89,
-   89,   89,   89,    0,    0,   89,   89,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   89,   89,   89,
-   89,   89,   89,   89,   89,   89,    0,    0,    0,   89,
-   89,   89,   89,   89,   89,   89,   89,   89,   90,   90,
-   90,   90,    0,    0,   90,    0,   90,   90,   90,   90,
-    0,    0,    0,    0,    0,    0,    0,    0,   90,   90,
-    0,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-   90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-   90,   90,   90,    0,    0,    0,    0,    0,   90,   90,
-   90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-    0,    0,    0,    0,    0,   90,   90,   90,   90,   90,
-   90,   90,   90,   90,   90,   90,    0,    0,   90,   90,
-   90,   90,    0,    0,   90,   90,   93,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   90,   90,   90,   90,
-   90,   90,   90,   90,   90,    0,    0,    0,   90,   90,
-   90,   90,   90,   90,   90,   90,   90,    0,    0,   93,
-    0,    0,    0,    0,    0,    0,   93,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   93,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   93,
-    0,    0,   93,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
-    0,   93,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   95,    0,
-    0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   95,    0,
-    0,   95,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   95,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   93,   93,   93,   93,    0,    0,   93,
-    0,   93,   93,   93,   93,    0,    0,    0,    0,    0,
-    0,    0,    0,   93,   93,    0,   93,   93,   93,   93,
-   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-   93,   93,   93,   93,   93,   93,   93,   93,    0,    0,
-    0,    0,    0,   93,   93,   93,   93,   93,   93,   93,
-   93,   93,   93,   93,   93,    0,    0,    0,    0,    0,
-   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-   93,    0,    0,   93,   93,   93,   93,    0,    0,   93,
-   93,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-    0,    0,    0,   93,   93,   93,   93,   93,   93,   93,
-   93,   93,   95,   95,   95,   95,    0,    0,   95,    0,
-   95,   95,   95,   95,    0,    0,    0,    0,    0,    0,
-    0,    0,   95,   95,    0,   95,   95,   95,   95,   95,
-   95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-   95,   95,   95,   95,   95,   95,   95,    0,    0,    0,
-    0,    0,   95,   95,   95,   95,   95,   95,   95,   95,
-   95,   95,   95,   95,    0,    0,    0,    0,    0,   95,
-   95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-    0,    0,   95,   95,   95,   95,    0,    0,   95,   95,
-   97,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   95,   95,   95,   95,   95,   95,   95,   95,   95,    0,
-    0,    0,   95,   95,   95,   95,   95,   95,   95,   95,
-   95,    0,    0,   97,    0,    0,    0,    0,    0,    0,
-   97,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   97,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   97,    0,    0,   97,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   99,
-    0,    0,    0,    0,    0,   97,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   99,    0,    0,    0,    0,    0,    0,   99,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   99,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   99,    0,    0,   99,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   99,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   97,   97,   97,
-   97,    0,    0,   97,    0,   97,   97,   97,   97,    0,
-    0,    0,    0,    0,    0,    0,    0,   97,   97,    0,
-   97,   97,   97,   97,   97,   97,   97,   97,   97,   97,
-   97,   97,   97,   97,   97,   97,   97,   97,   97,   97,
-   97,   97,    0,    0,    0,    0,    0,   97,   97,   97,
-   97,   97,   97,   97,   97,   97,   97,   97,   97,    0,
-    0,    0,    0,    0,   97,   97,   97,   97,   97,   97,
-   97,   97,   97,   97,   97,    0,    0,   97,   97,   97,
-   97,    0,    0,   97,   97,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   97,   97,   97,   97,   97,
-   97,   97,   97,   97,    0,    0,    0,   97,   97,   97,
-   97,   97,   97,   97,   97,   97,   99,   99,   99,   99,
-    0,    0,   99,    0,   99,   99,   99,   99,    0,    0,
-    0,    0,    0,    0,    0,    0,   99,   99,    0,   99,
-   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-   99,    0,    0,    0,    0,    0,   99,   99,   99,   99,
-   99,   99,   99,   99,   99,   99,   99,   99,    0,    0,
-    0,    0,    0,   99,   99,   99,   99,   99,   99,   99,
-   99,   99,   99,   99,    0,    0,   99,   99,   99,   99,
-    0,    0,   99,   99,  100,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   99,   99,   99,   99,   99,   99,
-   99,   99,   99,    0,    0,    0,   99,   99,   99,   99,
-   99,   99,   99,   99,   99,    0,    0,  100,    0,    0,
-    0,    0,    0,    0,  100,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  100,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  100,    0,    0,
-  100,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  101,    0,    0,    0,    0,    0,  100,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  101,    0,    0,    0,
-    0,    0,    0,  101,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  101,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  101,    0,    0,  101,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  101,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  100,  100,  100,  100,    0,    0,  100,    0,  100,
-  100,  100,  100,    0,    0,    0,    0,    0,    0,    0,
-    0,  100,  100,    0,  100,  100,  100,  100,  100,  100,
-  100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-  100,  100,  100,  100,  100,  100,    0,    0,    0,    0,
-    0,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-  100,  100,  100,    0,    0,    0,    0,    0,  100,  100,
-  100,  100,  100,  100,  100,  100,  100,  100,  100,    0,
-    0,  100,  100,  100,  100,    0,    0,  100,  100,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  100,
-  100,  100,  100,  100,  100,  100,  100,  100,    0,    0,
-    0,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-  101,  101,  101,  101,    0,    0,  101,    0,  101,  101,
-  101,  101,    0,    0,    0,    0,    0,    0,    0,    0,
-  101,  101,    0,  101,  101,  101,  101,  101,  101,  101,
-  101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-  101,  101,  101,  101,  101,    0,    0,    0,    0,    0,
-  101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-  101,  101,    0,    0,    0,    0,    0,  101,  101,  101,
-  101,  101,  101,  101,  101,  101,  101,  101,    0,    0,
-  101,  101,  101,  101,    0,    0,  101,  101,  102,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  101,  101,
-  101,  101,  101,  101,  101,  101,  101,    0,    0,    0,
-  101,  101,  101,  101,  101,  101,  101,  101,  101,    0,
-    0,  102,    0,    0,    0,    0,    0,    0,  102,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  102,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  102,    0,    0,  102,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  104,    0,    0,
-    0,    0,    0,  102,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  104,    0,    0,    0,    0,    0,    0,  104,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  104,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  104,    0,    0,  104,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  104,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  102,  102,  102,  102,    0,
-    0,  102,    0,  102,  102,  102,  102,    0,    0,    0,
-    0,    0,    0,    0,    0,  102,  102,    0,  102,  102,
-  102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-  102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-    0,    0,    0,    0,    0,  102,  102,  102,  102,  102,
-  102,  102,  102,  102,  102,  102,  102,    0,    0,    0,
-    0,    0,  102,  102,  102,  102,  102,  102,  102,  102,
-  102,  102,  102,    0,    0,  102,  102,  102,  102,    0,
-    0,  102,  102,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  102,  102,  102,  102,  102,  102,  102,
-  102,  102,    0,    0,    0,  102,  102,  102,  102,  102,
-  102,  102,  102,  102,  104,  104,  104,  104,    0,    0,
-  104,    0,  104,  104,  104,  104,    0,    0,    0,    0,
-    0,    0,    0,    0,  104,  104,    0,  104,  104,  104,
-  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-  104,  104,  104,  104,  104,  104,  104,  104,  104,    0,
-    0,    0,    0,    0,  104,  104,  104,  104,  104,  104,
-  104,  104,  104,  104,  104,  104,    0,    0,    0,    0,
-    0,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-  104,  104,    0,    0,  104,  104,  104,  104,    0,    0,
-  104,  104,  109,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  104,  104,  104,  104,  104,  104,  104,  104,
-  104,    0,    0,    0,  104,  104,  104,  104,  104,  104,
-  104,  104,  104,    0,    0,  109,    0,    0,    0,    0,
-    0,    0,  109,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  109,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  109,    0,    0,  109,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  111,    0,    0,    0,    0,    0,  109,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  111,    0,    0,    0,    0,    0,
-    0,  111,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  111,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  111,    0,    0,  111,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  111,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  109,
-  109,  109,  109,    0,    0,  109,    0,  109,  109,  109,
-  109,    0,    0,    0,    0,    0,    0,    0,    0,  109,
-  109,    0,  109,  109,  109,  109,  109,  109,  109,  109,
-  109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
-  109,  109,  109,  109,    0,    0,    0,    0,    0,  109,
-  109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
-  109,    0,    0,    0,    0,    0,  109,  109,  109,  109,
-  109,  109,  109,  109,  109,  109,  109,    0,    0,  109,
-  109,  109,  109,    0,    0,  109,  109,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  109,  109,  109,
-  109,  109,  109,  109,  109,  109,    0,    0,    0,  109,
-  109,  109,  109,  109,  109,  109,  109,  109,  111,  111,
-  111,  111,    0,    0,  111,    0,  111,  111,  111,  111,
-    0,    0,    0,    0,    0,    0,    0,    0,  111,  111,
-    0,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-  111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-  111,  111,  111,    0,    0,    0,    0,    0,  111,  111,
-  111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-    0,    0,    0,    0,    0,  111,  111,  111,  111,  111,
-  111,  111,  111,  111,  111,  111,    0,    0,  111,  111,
-  111,  111,    0,    0,  111,  111,  120,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  111,  111,  111,  111,
-  111,  111,  111,  111,  111,    0,    0,    0,  111,  111,
-  111,  111,  111,  111,  111,  111,  111,    0,    0,  120,
-    0,    0,    0,    0,    0,    0,  120,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  120,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  120,
-    0,    0,  120,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  133,    0,    0,    0,    0,
-    0,  120,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  133,    0,
-    0,    0,    0,    0,    0,  133,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  133,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  133,    0,
-    0,  133,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  133,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  120,  120,  120,  120,    0,    0,  120,
-    0,  120,  120,  120,  120,    0,    0,    0,    0,    0,
-    0,    0,    0,  120,  120,    0,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,  120,  120,  120,    0,    0,
-    0,    0,    0,  120,  120,  120,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,    0,    0,    0,    0,    0,
-  120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-  120,    0,    0,  120,  120,  120,  120,    0,    0,  120,
-  120,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-    0,    0,    0,  120,  120,  120,  120,  120,  120,  120,
-  120,  120,  133,  133,  133,  133,    0,    0,  133,    0,
-  133,  133,  133,  133,    0,    0,    0,    0,    0,    0,
-    0,    0,  133,  133,    0,  133,  133,  133,  133,  133,
-  133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
-  133,  133,  133,  133,  133,  133,  133,    0,    0,    0,
-    0,    0,  133,  133,  133,  133,  133,  133,  133,  133,
-  133,  133,  133,  133,    0,    0,    0,    0,    0,  133,
-  133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
-    0,    0,  133,  133,  133,  133,    0,    0,  133,  133,
-  113,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  133,  133,  133,  133,  133,  133,  133,  133,  133,    0,
-    0,    0,  133,  133,  133,  133,  133,  133,  133,  133,
-  133,    0,    0,  113,    0,    0,    0,    0,    0,    0,
-  113,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  113,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  113,    0,    0,  113,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  114,
-    0,    0,    0,    0,    0,  113,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  114,    0,    0,    0,    0,    0,    0,  114,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  114,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  114,    0,    0,  114,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  114,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  113,  113,  113,
-  113,    0,    0,  113,    0,  113,  113,  113,  113,    0,
-    0,    0,    0,    0,    0,    0,    0,  113,  113,    0,
-  113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
-  113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
-  113,  113,    0,    0,    0,    0,    0,  113,  113,  113,
-  113,  113,  113,  113,  113,  113,  113,  113,  113,    0,
-    0,    0,    0,    0,  113,  113,  113,  113,  113,  113,
-  113,  113,  113,  113,  113,    0,    0,  113,  113,  113,
-  113,    0,    0,  113,  113,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  113,  113,  113,  113,  113,
-  113,  113,  113,  113,    0,    0,    0,  113,  113,  113,
-  113,  113,  113,  113,  113,  113,  114,  114,  114,  114,
-    0,    0,  114,    0,  114,  114,  114,  114,    0,    0,
-    0,    0,    0,    0,    0,    0,  114,  114,    0,  114,
-  114,  114,  114,  114,  114,  114,  114,  114,  114,  114,
-  114,  114,  114,  114,  114,  114,  114,  114,  114,  114,
-  114,    0,    0,    0,    0,    0,  114,  114,  114,  114,
-  114,  114,  114,  114,  114,  114,  114,  114,    0,    0,
-    0,    0,    0,  114,  114,  114,  114,  114,  114,  114,
-  114,  114,  114,  114,    0,    0,  114,  114,  114,  114,
-    0,    0,  114,  114,  115,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  114,  114,  114,  114,  114,  114,
-  114,  114,  114,    0,    0,    0,  114,  114,  114,  114,
-  114,  114,  114,  114,  114,    0,    0,  115,    0,    0,
-    0,    0,    0,    0,  115,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  115,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  115,    0,    0,
-  115,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  181,    0,    0,    0,    0,    0,    0,  115,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  181,    0,    0,    0,    0,
-    0,    0,  181,    0,    0,    0,  181,  181,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  181,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  181,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  181,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  115,  115,  115,  115,    0,    0,  115,    0,  115,
-  115,  115,  115,    0,    0,    0,    0,    0,    0,    0,
-    0,  115,  115,    0,  115,  115,  115,  115,  115,  115,
-  115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
-  115,  115,  115,  115,  115,  115,    0,    0,    0,    0,
-    0,  115,  115,  115,  115,  115,  115,  115,  115,  115,
-  115,  115,  115,    0,    0,    0,    0,    0,  115,  115,
-  115,  115,  115,  115,  115,  115,  115,  115,  115,    0,
-    0,  115,  115,  115,  115,    0,    0,  115,  115,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  115,
-  115,  115,  115,  115,  115,  115,  115,  115,    0,    0,
-    0,  115,  115,  115,  115,  115,  115,  115,  115,  115,
-  181,  181,  181,    0,    0,    0,    0,  181,  181,  181,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  181,
-  181,    0,  181,  181,  181,  181,  181,  181,  181,  181,
-  181,  181,  181,  181,  181,  181,  181,  181,  181,  181,
-  181,  181,  181,  181,    0,    0,    0,    0,    0,  181,
-  181,  181,  181,  181,  181,  181,  181,  181,  181,  181,
-  181,    0,    0,    0,    0,    0,  181,  181,  181,  181,
-  181,  181,  181,  181,  181,  181,  181,    0,    0,  181,
-  181,  181,  181,    0,    0,  181,  181,  156,    0,    0,
-    0,    0,    0,    0,    0,  199,    0,  181,  181,  181,
-  181,  181,  181,  181,  181,  181,    0,    0,    0,  181,
-  181,  181,  181,  181,  181,  181,  181,  181,    0,    0,
-  156,    0,    0,    0,    0,    0,    0,  156,  156,    0,
-  156,  156,  156,    0,    0,    0,    0,    0,    0,    0,
-  272,  273,  274,  284,    0,    0,  156,    0,    0,  156,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  306,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  156,    0,    0,  156,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  161,    0,    0,    0,
-    0,    0,  156,    0,    0,  340,    0,    0,    0,    0,
-    0,    0,    0,  348,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  161,
-    0,    0,    0,    0,    0,    0,  161,    0,    0,  161,
-    0,  161,  161,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  161,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  199,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  161,
-    0,    0,  161,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  395,  396,    0,    0,    0,
-  397,  161,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  156,  156,  156,  156,    0,    0,
-  156,    0,  156,  156,  156,  156,    0,    0,    0,    0,
-    0,    0,    0,    0,  156,  156,    0,  156,  156,  156,
-  156,  156,  156,  156,  156,  156,  156,  156,  156,  156,
-  156,  156,  156,  156,  156,  156,  156,  156,  156,    0,
-    0,    0,    0,  156,  156,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  425,  426,  156,  156,  156,  156,
-  156,  156,  156,  156,  156,  156,  156,  156,  156,  156,
-  156,  156,  438,  439,    0,    0,    0,    0,    0,    0,
-  156,  156,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  156,  156,  156,  156,  156,  156,
-  156,  156,  156,  161,  161,  161,  161,    0,    0,  161,
-    0,  161,  161,  161,  161,    0,    0,    0,    0,    0,
-    0,    0,    0,  161,  161,    0,  161,  161,  161,  161,
-  161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
-  161,  161,  161,  161,  161,  161,  161,  161,    0,    0,
-    0,  182,    0,  161,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  161,  161,  161,  161,  161,
-  161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
-  161,    0,    0,    0,  182,    0,    0,    0,    0,  161,
-  161,  182,  182,    0,    0,  182,  182,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  182,    0,    0,  161,  161,  161,  161,  161,  161,  161,
-  161,  161,    0,    0,    0,    0,    0,    0,    0,  249,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  182,    0,    0,  182,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  249,    0,    0,    0,    0,    0,    0,  249,
-  249,    0,    0,  249,    0,    0,  182,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  249,  249,
-    0,  249,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  249,    0,    0,  249,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  249,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   43,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   43,
-    0,    0,    0,    0,    0,    0,   43,    0,  182,  182,
-  182,  182,    0,    0,  182,    0,  182,  182,  182,  182,
-    0,    0,    0,    0,    0,   43,    0,    0,  182,  182,
-    0,  182,  182,  182,  182,    0,    0,  182,  182,  182,
-  182,  182,  182,  182,  182,  182,  182,  182,  182,  182,
-  182,  182,  182,    0,    0,    0,    0,    0,  182,   43,
-    0,    0,   43,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  182,  182,  182,  182,  182,
-  182,  182,  182,  182,  182,  182,  249,  249,  249,  249,
-    0,   43,  249,    0,  182,  182,    0,  249,    0,    0,
-    0,    0,    0,    0,    0,   96,    0,    0,    0,    0,
-    0,    0,    0,  249,  249,    0,    0,    0,  182,  182,
-  182,  182,  182,  182,  182,  182,  182,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  249,  249,  249,  249,
-  249,  249,  249,  249,  249,  249,  249,  249,    0,    0,
-    0,    0,    0,  249,  249,  249,  249,  249,  249,  249,
-  249,  249,  249,  249,   96,    0,  249,  249,  249,  249,
-    0,    0,    0,    0,    0,    0,   45,    0,  249,  249,
-  249,  249,  249,  249,  249,  249,  249,  249,  249,  249,
-  249,  249,  249,    0,    0,    0,    0,    0,   96,    0,
-    0,    0,    0,    0,  249,    0,    0,    0,    0,   45,
-    0,    0,    0,    0,    0,    0,   45,    0,    0,    0,
-    0,    0,    0,   43,   43,   43,   43,    0,    0,   43,
-   96,    0,    0,    0,   43,   45,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   43,   43,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   45,
-    0,    0,   45,   43,   43,   43,   43,   43,   43,   43,
-   43,   43,   43,   43,   43,    0,    0,   98,    0,    0,
-   43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
-   43,   45,    0,   43,   43,   43,   43,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   43,   43,   43,   43,   43,   43,   43,   43,   43,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   43,    0,    0,    0,    0,   98,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   96,    0,    0,    0,    0,
-   96,   96,   96,    0,    0,    0,    0,    0,    0,    0,
-   98,    0,   96,   96,    0,   96,   96,   96,   96,   96,
-   96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-   96,   96,   96,   96,   96,   96,   96,  204,    0,    0,
-    0,    0,   98,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   45,   45,   45,   45,   92,    0,   45,
-    0,    0,    0,    0,   45,    0,    0,    0,   96,   96,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   45,   45,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   96,   96,   96,   96,   96,   96,   96,   96,
-   96,    0,    0,   45,   45,   45,   45,   45,   45,   45,
-   45,   45,   45,   45,   45,    0,   92,    0,    0,    0,
-   45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-   45,    0,    0,   45,   45,   45,   45,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   92,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-    0,    0,    0,    0,    0,    0,    0,   98,    0,    0,
-    0,   45,   98,   98,   98,   94,    0,    0,    0,    0,
-    0,    0,   92,    0,   98,   98,    0,   98,   98,   98,
-   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,
-   98,   98,   98,   98,   98,   98,   98,   98,   98,  203,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   94,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   98,   98,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   94,    0,
-    0,    0,    0,    0,   98,   98,   98,   98,   98,   98,
-   98,   98,   98,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   94,    0,    0,    0,    0,    0,    0,    0,    0,  108,
-    0,    0,    0,    0,    0,    0,    0,   92,    0,    0,
-    0,    0,   92,   92,   92,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   92,   92,    0,   92,   92,   92,
-   92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-   92,   92,   92,   92,   92,   92,   92,   92,   92,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  108,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   92,   92,  108,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   92,   92,   92,   92,   92,   92,
-   92,   92,   92,  110,  108,   94,    0,    0,    0,    0,
-   94,   94,   94,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   94,   94,    0,   94,   94,   94,   94,   94,
-   94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
-   94,   94,   94,   94,   94,   94,   94,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  110,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   94,   94,
-    0,    0,    0,    0,    0,    0,  110,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   94,   94,   94,   94,   94,   94,   94,   94,
-   94,    0,    0,    0,    0,    0,    0,    0,  110,    0,
-    0,  119,    0,    0,    0,    0,    0,    0,    0,  108,
-    0,    0,    0,    0,  108,  108,  108,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  108,  108,    0,  108,
-  108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-  108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-  108,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  119,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  108,  108,  119,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  108,  108,  108,  108,
-  108,  108,  108,  108,  108,  112,  119,    0,    0,    0,
-    0,    0,    0,  110,    0,    0,    0,    0,  110,  110,
-  110,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  110,  110,    0,  110,  110,  110,  110,  110,  110,  110,
-  110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-  110,  110,  110,  110,  110,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  112,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  110,  110,  112,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  110,  110,  110,  110,  110,  110,  110,  110,  110,    0,
-  112,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  119,    0,    0,    0,    0,  119,  119,  119,    0,
-   83,    0,    0,    0,    0,    0,    0,    0,  119,  119,
-    0,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-  119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-  119,  119,  119,   83,    0,    0,    0,    0,    0,    0,
-   83,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   83,
-    0,    0,    0,    0,    0,    0,    0,  161,    0,    0,
-    0,    0,    0,    0,  119,  119,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   83,    0,    0,   83,    0,  119,  119,
-  119,  119,  119,  119,  119,  119,  119,    0,    0,    0,
-  161,    0,  161,  161,    0,  112,    0,    0,    0,    0,
-  112,  112,  112,    0,    0,   83,  161,    0,    0,    0,
-    0,    0,  112,  112,    0,  112,  112,  112,  112,  112,
-  112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-  112,  112,  112,  112,  112,  112,  112,    0,    0,    0,
-  161,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  161,    0,    0,    0,    0,    0,  112,  112,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  112,  112,  112,  112,  112,  112,  112,  112,
-  112,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   83,   83,   83,
-    0,    0,    0,   83,    0,   83,   83,   83,   83,    0,
-    0,    0,    0,    0,    0,    0,    0,   83,   83,    0,
-   83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-   83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-   83,   83,    0,    0,    0,    0,    0,   83,   83,   83,
-   83,   83,   83,   83,   83,   83,   83,   83,   83,    0,
-    0,    0,    0,    0,   83,   83,   83,   83,   83,   83,
-   83,   83,   83,   83,   83,    0,    0,   83,   83,   83,
-   83,    0,    0,   83,   83,    0,    0,    0,    0,    0,
-    0,  161,  161,    0,  257,   83,   83,   83,   83,   83,
-   83,   83,   83,   83,    0,    0,    0,   83,   83,   83,
-   83,   83,   83,   83,   83,  161,  161,  161,  161,  161,
-  161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
-  161,  257,    0,    0,    0,  257,  257,  257,  257,  257,
-    0,  257,    0,    0,  161,  161,  161,  161,    0,    0,
-    0,    0,    0,  257,  257,    0,  257,    0,    0,    0,
-    0,    0,  161,  161,  161,  161,  161,  161,  161,  161,
-  161,    0,    0,    0,    0,    0,   95,    0,    0,    0,
-    0,    0,    0,   92,    0,    0,    0,  257,   94,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  257,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   32,    0,    0,    0,    0,   93,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   33,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    6,    0,    0,    0,
-    0,    0,    0,    6,    0,    0,    0,    0,    6,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    6,    0,    0,    0,    0,    6,
-    0,    0,    0,    0,    0,    0,    0,    0,  257,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    6,    0,    0,    0,
-    0,    0,    0,    0,    0,  257,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  257,    0,    0,  257,
-  299,  300,   51,    8,    9,    0,   52,    0,    0,    0,
-    0,   53,   10,   11,   12,   13,   14,   15,   16,   17,
-    0,    0,   18,   95,    0,   19,   20,  301,  302,    0,
-  110,    0,    0,    0,    0,   94,    0,    0,    0,    0,
-    0,    0,    0,  257,  257,  257,  257,  257,  257,    0,
-   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-   66,   67,    0,    0,    0,    0,    0,   68,   69,   70,
-   71,   72,   73,   74,   75,   76,   77,   78,   23,    0,
-   79,   80,   81,   82,   24,   25,   93,    0,   26,    0,
-   27,    0,    0,    0,    0,    0,    0,    0,   83,   84,
-   85,   86,   87,   88,   89,   90,   91,   28,    0,   29,
-    6,    6,    6,    6,    6,    0,    6,    0,   30,   31,
-    0,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    0,    0,    6,    0,    0,    6,    6,    6,    6,    0,
-    0,    0,  111,    0,    0,    0,    0,    0,    0,  110,
-  319,    0,    0,    0,   94,    0,    0,    0,    0,    0,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    0,    0,    0,    0,    0,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    0,
-    6,    6,    6,    6,    6,    6,    0,    0,    6,    0,
-    6,    0,    0,    0,    0,   93,    0,    0,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    0,    6,
-    0,    0,    0,    0,    0,    0,    0,    0,    6,    6,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   49,   50,   51,
-    8,    0,    0,   52,    0,  126,  127,  128,   53,    0,
-    0,    0,    0,    0,    0,    0,    0,  129,  130,    0,
-  131,  132,  133,  134,  135,  136,  137,  138,  139,  140,
-  141,  142,  143,  144,  145,  146,  147,  148,  149,  150,
-  151,  152,    0,    0,    0,    0,    0,   56,   57,   58,
-   59,   60,   61,   62,   63,   64,   65,   66,   67,    0,
-    0,    0,    0,    0,   68,   69,   70,   71,   72,   73,
-   74,   75,   76,   77,   78,  111,    0,   79,   80,   81,
-   82,    0,   92,  153,  154,    0,    0,   94,  278,    0,
-    0,    0,    0,    0,    0,   83,   84,   85,   86,   87,
-   88,   89,   90,   91,    0,    0,    0,  155,  156,  157,
-  158,  159,  160,  161,  162,   30,   49,   50,   51,    8,
-    0,    0,   52,    0,    0,    0,    0,   53,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   93,    0,
-    0,    0,    0,   54,   55,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   56,   57,   58,   59,
-   60,   61,   62,   63,   64,   65,   66,   67,    0,    0,
-    0,    0,    0,   68,   69,   70,   71,   72,   73,   74,
-   75,   76,   77,   78,   95,    0,   79,   80,   81,   82,
-    0,   92,    0,    0,    0,    0,   94,    0,    0,    0,
-    0,    0,    0,    0,   83,   84,   85,   86,   87,   88,
-   89,   90,   91,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   30,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   93,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  111,    0,
-    0,    0,    0,    0,    0,  110,    0,    0,    0,    0,
-   94,    0,    0,    0,    0,    0,    0,    0,    0,   49,
-   50,   51,    8,    0,    0,   52,    0,    0,    0,    0,
-   53,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   54,   55,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   93,    0,    0,    0,    0,    0,    0,    0,   56,
-   57,   58,   59,   60,   61,   62,   63,   64,   65,   66,
-   67,    0,    0,    0,    0,    0,   68,   69,   70,   71,
-   72,   73,   74,   75,   76,   77,   78,    0,    0,   79,
-   80,   81,   82,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   83,   84,   85,
-   86,   87,   88,   89,   90,   91,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   30,   49,   50,
-   51,    8,    0,    0,   52,    0,    0,    0,    0,   53,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  111,    0,   54,   55,    0,    0,    0,
-   92,    0,    0,    0,    0,   94,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   56,   57,
-   58,   59,   60,   61,   62,   63,   64,   65,   66,   67,
-    0,    0,    0,    0,    0,   68,   69,   70,   71,   72,
-   73,   74,   75,   76,   77,   78,    0,    0,   79,   80,
-   81,   82,   49,   50,   51,    8,   93,    0,   52,    0,
-    0,    0,    0,   53,    0,    0,   83,   84,   85,   86,
-   87,   88,   89,   90,   91,    0,    0,  111,    0,   54,
-   55,    0,    0,    0,  285,    0,   30,    0,    0,   94,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   56,   57,   58,   59,   60,   61,   62,   63,
-   64,   65,   66,   67,    0,    0,    0,    0,    0,   68,
-   69,   70,   71,   72,   73,   74,   75,   76,   77,   78,
-    0,    0,   79,   80,   81,   82,    0,    0,    0,    0,
-   93,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   83,   84,   85,   86,   87,   88,   89,   90,   91,    0,
-    0,   95,    0,    0,    0,    0,    0,    0,  279,    0,
-   30,    0,    0,   94,  278,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   49,   50,   51,
-    8,    0,    0,   52,   93,    0,    0,    0,   53,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   54,   55,   95,    0,    0,    0,
-    0,    0,    0,  110,    0,  446,    0,    0,   94,    0,
-    0,    0,    0,    0,    0,    0,    0,   56,   57,   58,
-   59,   60,   61,   62,   63,   64,   65,   66,   67,    0,
-    0,    0,    0,    0,   68,   69,   70,   71,   72,   73,
-   74,   75,   76,   77,   78,    0,    0,   79,   80,   81,
-   82,   49,   50,   51,    8,    0,    0,   52,    0,   93,
-    0,    0,   53,    0,    0,   83,   84,   85,   86,   87,
-   88,   89,   90,   91,    0,    0,    0,    0,   54,   55,
-   95,    0,    0,    0,    0,   30,    0,  110,    0,    0,
-    0,    0,   94,    0,    0,    0,    0,    0,    0,    0,
-    0,   56,   57,   58,   59,   60,   61,   62,   63,   64,
-   65,   66,   67,    0,    0,    0,    0,    0,   68,   69,
-   70,   71,   72,   73,   74,   75,   76,   77,   78,    0,
-    0,   79,   80,   81,   82,  275,   50,   51,    0,    0,
-    0,  276,    0,   93,    0,    0,  277,    0,    0,   83,
-   84,   85,   86,   87,   88,   89,   90,   91,    0,    0,
-    0,    0,   54,   55,   95,    0,    0,    0,    0,   30,
-    0,   92,    0,    0,    0,    0,   94,    0,    0,    0,
-    0,    0,    0,    0,    0,   56,   57,   58,   59,   60,
-   61,   62,   63,   64,   65,   66,   67,    0,    0,    0,
-    0,    0,   68,   69,   70,   71,   72,   73,   74,   75,
-   76,   77,   78,    0,    0,   79,   80,   81,   82,    0,
-   49,   50,   51,    0,    0,    0,   52,   93,    0,    0,
-    0,   53,    0,   83,   84,   85,   86,   87,   88,   89,
-   90,   91,    0,    0,    0,    0,    0,   54,   55,   95,
-    0,    0,    0,    0,    0,    0,  285,    0,    0,    0,
-    0,   94,    0,    0,    0,    0,    0,    0,    0,    0,
-   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-   66,   67,    0,    0,    0,    0,    0,   68,   69,   70,
-   71,   72,   73,   74,   75,   76,   77,   78,    0,    0,
-   79,   80,   81,   82,   49,   50,   51,    0,    0,    0,
-   52,    0,   93,    0,    0,   53,    0,    0,   83,   84,
-   85,   86,   87,   88,   89,   90,   91,    0,    0,    0,
-    0,   54,   55,   95,    0,    0,    0,    0,    0,    0,
-  110,    0,    0,    0,    0,   94,    0,    0,    0,    0,
-    0,    0,    0,    0,   56,   57,   58,   59,   60,   61,
-   62,   63,   64,   65,   66,   67,    0,    0,    0,    0,
-    0,   68,   69,   70,   71,   72,   73,   74,   75,   76,
-   77,   78,    0,    0,   79,   80,   81,   82,   49,   50,
-   51,    0,    0,    0,   52,    0,   93,    0,    0,   53,
-    0,    0,   83,   84,   85,   86,   87,   88,   89,   90,
-   91,    0,    0,    0,    0,   54,   55,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   56,   57,
-   58,   59,   60,   61,   62,   63,   64,   65,   66,   67,
-    0,    0,    0,    0,    0,   68,   69,   70,   71,   72,
-   73,   74,   75,   76,   77,   78,    0,    0,   79,   80,
-   81,   82,    0,   49,   50,   51,    0,    0,    0,   52,
-    0,    0,    0,    0,   53,    0,   83,   84,   85,   86,
-   87,   88,   89,   90,   91,    0,    0,    0,    0,    0,
-   54,   55,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   56,   57,   58,   59,   60,   61,   62,
-   63,   64,   65,   66,   67,    0,    0,    0,    0,    0,
-   68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
-   78,    0,    0,   79,   80,   81,   82,   49,   50,   51,
-    0,    0,    0,   52,    0,    0,    0,    0,   53,    0,
-    0,   83,   84,   85,   86,   87,   88,   89,   90,   91,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   56,   57,   58,
-   59,   60,   61,   62,   63,   64,   65,   66,   67,    0,
-    0,    0,    0,    0,   68,   69,   70,   71,   72,   73,
-   74,   75,   76,   77,   78,    0,    0,   79,   80,   81,
-   82,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   83,   84,   85,   86,   87,
-   88,   89,   90,   91,
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -240,  -240,    17,  -240,    12,   329,  -240,  -240,  -240,  -240,
+    -240,  -240,  -240,  -240,  -240,  -240,   334,   -76,  -240,  -240,
+     -42,    13,  -103,  -240,  -127,  -240,  -240,  -240,  -240,  -240,
+       5,  -240,    99,   194,   169,   -44,     4,  -100,  -240,  -240,
+    -240,  -104,  -240,  -239,  -240,   -50,   -26,  -240,    61
 };
-static const short yycheck[] = {                         25,
-    0,   41,  105,   29,   43,   31,   45,   44,    0,   59,
-   43,   37,   45,  125,   37,  100,  260,  284,  285,   42,
-   43,  260,   45,   37,   47,  257,  258,  107,   42,   43,
-   44,   45,   59,   47,   43,  102,   45,   60,   92,   62,
-  120,   41,   58,    4,   44,   61,   60,   58,   62,   41,
-  284,  285,   44,   62,  260,  167,   43,   25,   45,   59,
-  349,  350,  268,   31,   25,   61,   92,   59,   94,   95,
-   31,   94,  258,  140,   41,   62,   37,   44,   96,  258,
-   94,  107,    0,   41,   40,  111,   44,  141,  355,  356,
-   37,  111,  348,   93,  120,   42,   43,  336,   45,   96,
-   47,   93,    0,  129,  130,  131,  132,  133,  134,  135,
-  136,  137,  138,  139,  140,  141,  351,  352,  144,  145,
-  146,  355,  356,    0,   92,  125,   43,   44,   45,  155,
-  156,  375,   61,  125,  160,  161,  221,  336,   36,  107,
-   43,  167,   45,   37,   42,   37,  107,   94,   42,   43,
-   42,   45,  120,   47,  262,   47,  275,  118,   40,  120,
-  279,   41,   40,   43,  125,   45,   60,   40,   62,  137,
-  138,  139,  140,  276,  277,   93,  230,  231,   40,  205,
-  206,  207,  208,  209,  210,  211,  212,  213,  214,  215,
-  216,  217,  218,  219,  220,  280,  157,  158,  159,  167,
-   94,   40,   94,   40,  230,  231,  167,  125,  275,    0,
-  121,  122,  279,   40,   40,  282,   93,   40,   40,  245,
-   40,  258,  248,  249,  250,  279,  252,  253,  248,  249,
-   37,  285,  252,  253,  291,   42,   43,  260,   45,  257,
-   47,  260,   33,   61,  212,  263,   27,  262,  125,   40,
-  268,  258,  220,  279,   45,  374,  375,   41,    0,  285,
-  257,   41,   43,   43,  264,   45,  263,  306,   41,  264,
-  373,  268,  264,  306,  328,  329,   43,   44,   45,  319,
-  320,  321,  322,  323,  302,   94,  303,   94,    0,  408,
-   46,  291,  411,  254,  255,  407,  322,  323,  259,  291,
-   91,  327,  328,  329,  257,   96,   93,  374,  375,  125,
-  302,  279,   93,  305,   43,   44,   45,   59,   93,    0,
-   43,   44,   45,    0,  262,  257,  349,  350,  351,  352,
-  353,  354,  123,   41,  262,  349,  350,  351,  352,  353,
-  354,  408,   41,   44,  411,   41,   41,   59,    0,  349,
-  350,   93,  375,   41,  322,  323,   41,  349,  350,  327,
-   44,   37,   44,   41,    0,    0,   42,   43,   44,   45,
-   41,   47,    0,  304,  349,  401,  402,  403,    0,  405,
-   44,   93,   59,  125,   60,  257,   62,  262,  169,   41,
-   41,  365,   44,  419,  420,  176,  177,  178,  179,  180,
-  181,  182,  183,  184,  185,  186,   41,   59,   41,   44,
-   91,  260,  305,  125,   41,  441,   93,   41,   94,   41,
-  446,   41,   44,   59,   59,   43,   44,   45,   41,   41,
-   37,   59,  346,  401,  402,   42,   43,   59,   45,    0,
-   47,   93,  123,   43,   44,   45,  407,   41,  125,  262,
-  260,  419,  420,   60,   44,   62,  346,   93,   93,  353,
-  354,   43,   44,   45,  167,   93,  257,  258,  259,  260,
-  261,   93,  263,  125,   43,   44,   45,  268,  269,  270,
-  271,  272,  273,  274,  275,  276,  346,   94,  279,  125,
-  125,  282,  283,  284,  285,  302,  346,  125,  305,   46,
-  413,   31,   36,  125,  319,  320,  321,  322,  323,  195,
-   46,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,  335,   -1,  337,  338,  339,  340,
-  341,  342,   -1,   -1,  345,   -1,  347,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,  364,    0,  366,  257,  258,   -1,  260,
-  261,   -1,   -1,   -1,  375,  376,    0,   -1,  269,  270,
-  271,  272,  273,  274,  275,  276,    0,   -1,  279,   -1,
-   -1,  282,  283,  284,  285,  386,   -1,   33,   -1,  390,
-  391,   37,  264,   -1,   40,   41,   42,   43,   44,   45,
-   -1,   47,   -1,   -1,   -1,    0,   -1,   41,   -1,  264,
-   44,   -1,    0,   59,   60,   -1,   62,   -1,   -1,  291,
-   -1,   -1,  264,   -1,   -1,   59,   -1,   -1,   -1,   -1,
-  302,   -1,   -1,  305,  335,   59,  291,   -1,    0,   -1,
-  341,  342,   -1,    0,  345,   -1,  347,   93,   -1,  291,
-   96,   -1,   -1,  349,  350,  351,  352,  353,  354,   93,
-  287,   -1,   -1,  364,   59,  366,   -1,   -1,   -1,   93,
-   -1,   59,   -1,    0,  375,  376,   -1,   -1,  350,  125,
-   -1,   43,   -1,   45,   -1,   -1,   43,   -1,   45,   -1,
-   -1,  125,   -1,   -1,   -1,  350,   -1,   59,   93,   -1,
-   -1,  125,   59,   -1,   -1,   93,   33,   -1,  350,   -1,
-   37,   -1,   -1,   40,   41,   42,   43,   44,   45,   -1,
-   47,   -1,  349,  350,  351,  352,  353,  354,  284,  285,
-  125,   93,   59,   60,   -1,   62,   93,  125,   -1,   -1,
-   -1,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,  125,   -1,   -1,   93,   -1,  125,   96,
-  337,  338,  339,  340,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  337,  338,  339,  340,   -1,   -1,   -1,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,   -1,  125,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,  264,  265,
-  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  264,  277,  278,   -1,  280,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  301,  302,  291,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
-   91,  337,  338,  339,  340,   46,   -1,  343,  344,   -1,
-  346,   -1,   -1,  349,  350,  351,  352,  353,  354,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,  368,  369,  370,  371,  372,  373,  374,  375,
-  257,  258,  259,  260,   -1,   -1,  263,  264,  265,  266,
-  267,  268,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1,
-  277,  278,   -1,  280,  281,  282,  283,  284,  285,  286,
-  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,  300,  301,  302,   -1,   -1,  305,  306,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,    0,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1,
-  337,  338,  339,  340,   -1,   -1,  343,  344,    0,  346,
-   -1,   -1,  349,  350,  351,  352,  353,  354,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,  368,  369,  370,  371,  372,  373,  374,  375,   -1,
-   -1,   33,   -1,   59,   -1,   37,   -1,   -1,   40,   41,
-   42,   43,   44,   45,   -1,   47,   -1,   91,  269,  270,
-  271,  272,  273,  274,   -1,  276,   -1,   59,   60,   -1,
-   62,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   37,   -1,   -1,   -1,   -1,
-   42,   43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,  260,   96,   -1,   -1,   -1,   60,  125,
-   62,  268,  269,  270,  271,  272,  273,  274,   -1,  276,
-   -1,   -1,   -1,  284,  285,   -1,   -1,    0,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   94,   -1,   -1,   -1,   -1,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   33,   -1,   -1,   -1,   37,   -1,   -1,   40,   41,   42,
-   43,   44,   45,   -1,   47,   -1,  337,  338,  339,  340,
-   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,
-   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,   -1,   -1,   96,   37,   -1,  260,   -1,   -1,   42,
-   43,   -1,   45,   -1,   47,  269,  270,  271,  272,  273,
-  274,   -1,  276,   -1,   -1,   -1,   -1,   60,   -1,   62,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,  264,  265,  266,  267,  268,   -1,   -1,   -1,
-   -1,   94,   -1,   -1,   -1,  277,  278,   -1,  280,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
-  302,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,
-   -1,   -1,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,
-  302,  343,  344,  305,  346,   -1,   -1,  349,  350,  351,
-  352,  353,  354,  355,  356,  357,  358,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,
-  372,  373,  374,  375,  257,  258,  259,  260,   -1,   -1,
-  263,  264,  265,  266,  267,  268,   -1,  349,  350,  351,
-  352,  353,  354,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,  302,
-   -1,   -1,  305,  306,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,
-   -1,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,
-  343,  344,    0,  346,   -1,   -1,  349,  350,  351,  352,
-  353,  354,  355,  356,  357,  358,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,   -1,   -1,   33,   -1,   -1,   -1,   37,
-   -1,   -1,   40,   41,   42,   43,   44,   45,   -1,   47,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   59,   60,   -1,   62,   -1,  349,  350,  351,  352,
-  353,  354,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   37,
-   -1,   -1,   -1,   -1,   42,   43,   44,   45,   -1,   47,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
-   41,   -1,   60,   44,   62,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   33,   -1,   -1,   -1,   37,   -1,
-   -1,   40,   41,   42,   43,   44,   45,   -1,   47,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   60,   -1,   62,  125,   -1,   -1,   -1,   37,   -1,
-   -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47,   -1,
-   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,
-   47,   60,   -1,   62,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   60,   37,   62,   -1,   -1,   -1,   42,
-   43,   -1,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   94,  125,   60,   -1,   62,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,  264,  265,  266,  267,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,
-  278,   94,  280,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,  301,  302,   -1,   -1,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,  264,   -1,   -1,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
-  338,  339,  340,   -1,  302,  343,  344,  305,  346,   -1,
-  291,  349,  350,  351,  352,  353,  354,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
-  368,  369,  370,  371,  372,  373,  374,  375,  257,  258,
-  259,  260,   -1,   -1,  263,  264,  265,  266,  267,  268,
-   -1,  349,  350,  351,  352,  353,  354,   -1,  277,  278,
-   -1,  280,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,  301,  302,   -1,   -1,  305,  306,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-   -1,  290,   -1,   -1,   -1,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338,
-  339,  340,   -1,   -1,  343,  344,    0,  346,   -1,   -1,
-  349,  350,  351,  352,  353,  354,  355,  356,  357,  358,
-  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,
-  369,  370,  371,  372,  373,  374,  375,   -1,   -1,   33,
-  349,  350,  351,  352,  353,  354,   40,   41,   -1,   43,
-   44,   45,  349,  350,  351,  352,  353,  354,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  349,   -1,  351,  352,
-  353,  354,   -1,   37,   -1,   -1,   -1,   -1,   42,   43,
-   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   60,   -1,   62,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,   43,   44,
-   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,
-   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,
-   47,   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,
-   -1,   47,   -1,   60,   -1,   62,   -1,   -1,   93,   -1,
-   -1,   96,   -1,   -1,   60,   -1,   62,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   94,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
-  264,  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,  301,  302,   -1,
-   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,  337,  338,  339,  340,   -1,  302,  343,
-  344,  305,  346,   -1,   -1,  349,  350,  351,  352,  353,
-  354,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,  257,  258,  259,  260,   -1,   -1,  263,  264,
-  265,  266,  267,  268,   -1,  349,  350,  351,  352,  353,
-  354,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,  302,   -1,   -1,
-  305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
-   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,
-    0,  346,   -1,   -1,  349,  350,  351,  352,  353,  354,
-  355,  356,  357,  358,  359,  360,  361,  362,  363,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,  349,   33,  351,  352,  353,  354,   -1,   -1,
-   40,   41,   -1,   -1,   44,  351,  352,  353,  354,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  337,
-  338,  339,  340,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   59,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   59,   60,
-   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,  264,  265,  266,  267,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,
-  280,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,  301,  302,   -1,   -1,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,  257,  337,  338,  339,
-  340,   -1,  263,  343,  344,   -1,  346,  268,   -1,  349,
-  350,  351,  352,  353,  354,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,
-  370,  371,  372,  373,  374,  375,  257,  258,  259,  260,
-   -1,  302,  263,  264,  265,  266,  267,  268,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  301,  302,   -1,   -1,  305,  306,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,    0,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,   -1,   -1,  337,  338,  339,  340,
-   -1,   -1,  343,  344,    0,  346,   -1,   -1,  349,  350,
-  351,  352,  353,  354,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,
-  371,  372,  373,  374,  375,   -1,   -1,   33,   -1,   -1,
-   59,   -1,   -1,   -1,   40,   41,   -1,   -1,   44,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,   41,   -1,   -1,   44,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,   -1,
-   -1,   -1,   -1,   -1,  263,   -1,   -1,   -1,  125,  268,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,  264,  265,
-  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  277,  278,  302,  280,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  301,  302,   -1,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
-   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,   -1,
-  346,   -1,   -1,  349,  350,  351,  352,  353,  354,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,  368,  369,  370,  371,  372,  373,  374,  375,
-  257,  258,  259,  260,   -1,   -1,  263,  264,  265,  266,
-  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  277,  278,   -1,  280,  281,  282,  283,  284,  285,  286,
-  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,  300,  301,  302,   -1,   -1,  305,  306,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1,
-  337,  338,  339,  340,   -1,   -1,  343,  344,    0,  346,
-   -1,   -1,  349,  350,  351,  352,  353,  354,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,  368,  369,  370,  371,  372,  373,  374,  375,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,
-   -1,   43,   44,   45,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
-   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   41,   -1,
-   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,
-   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,
-   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,
-   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,   -1,  125,   96,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
-   -1,   -1,   -1,   -1,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,  317,  318,  319,  320,  321,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,
-   -1,  343,  344,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  264,   -1,  355,  356,  357,  358,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,
-  372,  373,  374,  375,  257,  258,  259,  260,  291,   -1,
-  263,  264,  265,  266,  267,  268,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,  302,
-   -1,   -1,  305,  306,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,  317,  318,   -1,  350,   -1,   -1,
-   -1,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,
-  343,  344,    0,  346,   -1,   -1,  349,  350,  351,  352,
-   -1,   -1,  355,  356,  357,  358,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,   -1,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   41,   -1,   -1,   44,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,
-   -1,   40,   41,   -1,   43,   44,   45,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,  264,  265,  266,  267,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,
-  278,   -1,  280,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,  301,  302,   -1,   -1,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
-  338,  339,  340,   -1,   -1,  343,  344,   -1,  346,   -1,
-   -1,  349,  350,  351,  352,   -1,   -1,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
-  368,  369,  370,  371,  372,  373,  374,  375,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,
-   -1,  280,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,  301,   -1,   -1,   -1,   -1,  306,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-  319,  320,  321,  322,  323,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338,
-  339,  340,   -1,   -1,  343,  344,    0,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,
-  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,
-  369,  370,  371,  372,  373,  374,  375,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,   -1,
-   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,   -1,   44,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
-  264,  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,  301,  302,   -1,
-   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,
-  344,   -1,  346,   -1,   -1,  349,  350,   -1,   -1,   -1,
-   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,  257,  258,  259,  260,   -1,   -1,  263,  264,
-  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,  302,   -1,   -1,
-  305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
-   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,
-    0,  346,   -1,   -1,   -1,  350,   -1,   -1,   -1,   -1,
-  355,  356,  357,  358,  359,  360,  361,  362,  363,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   41,   -1,   43,   44,   45,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,
-  280,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,  301,   -1,   -1,   -1,   -1,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   59,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
-  340,   -1,   -1,  343,  344,   -1,   -1,   -1,   -1,   -1,
-   -1,   91,   -1,   -1,   -1,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,
-  370,  371,  372,  373,  374,  375,  257,  258,  259,  260,
-   -1,   -1,  263,  123,  265,  266,  267,  268,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  301,   -1,   -1,   -1,   -1,  306,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,   -1,   -1,  337,  338,  339,  340,
-   -1,   -1,  343,  344,    0,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,
-  371,  372,  373,  374,  375,   -1,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   41,   -1,   -1,   44,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,   -1,
-  260,  261,   -1,   59,   -1,   -1,   -1,   -1,   -1,  269,
-  270,  271,  272,  273,  274,  275,  276,   -1,   -1,  279,
-   -1,   -1,  282,  283,  284,  285,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,  335,   -1,   -1,   -1,   -1,
-   -1,  341,  342,   -1,   -1,  345,   -1,  347,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,  364,   -1,  366,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  375,  376,   -1,   -1,   -1,
-   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  277,  278,   -1,  280,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
-   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,   -1,
-   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,  368,  369,  370,  371,  372,  373,  374,  375,
-  257,  258,  259,  260,   -1,  123,  263,   -1,  265,  266,
-  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  277,  278,   -1,  280,  281,  282,  283,  284,  285,  286,
-  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,   -1,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1,
-  337,  338,  339,  340,   -1,   -1,  343,  344,    0,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,  368,  369,  370,  371,  372,  373,  374,  375,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,   -1,  260,  261,   -1,   -1,   -1,   59,   -1,   -1,
-   -1,  269,  270,  271,  272,  273,  274,  275,  276,   -1,
-   -1,  279,   -1,   -1,  282,  283,  284,  285,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,  335,   -1,   -1,
-   -1,   -1,   -1,  341,  342,   -1,   -1,  345,   -1,  347,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   33,   -1,   -1,   -1,   -1,   -1,  364,   40,  366,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  375,  376,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
-   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,
-   -1,   -1,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,
-   -1,  343,  344,   -1,   -1,   -1,   -1,   91,   -1,   -1,
-   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,
-  372,  373,  374,  375,  257,  258,  259,  260,   -1,  123,
-  263,   -1,  265,  266,  267,  268,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,   -1,
-   -1,   -1,   -1,   -1,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,
-   -1,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,
-  343,  344,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  355,  356,  357,  358,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,   -1,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,   -1,  260,  261,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,  269,  270,  271,  272,  273,
-  274,  275,  276,   -1,   -1,  279,   -1,   -1,  282,  283,
-  284,  285,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,  335,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,
-   -1,  345,   -1,  347,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,
-  364,   40,  366,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  375,  376,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,
-  278,   -1,  280,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,  301,   -1,   -1,   -1,   -1,   -1,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
-  338,  339,  340,   -1,   -1,  343,  344,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
-  368,  369,  370,  371,  372,  373,  374,  375,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,
-   -1,  280,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,  301,   -1,   -1,   -1,   -1,   -1,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338,
-  339,  340,   -1,   -1,  343,  344,    0,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,
-  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,
-  369,  370,  371,  372,  373,  374,  375,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
-   -1,  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,  301,   -1,   -1,
-   -1,   -1,   -1,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,
-  344,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,  257,  258,  259,  260,   -1,   -1,  263,   -1,
-  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,
-   -1,   -1,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
-   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  355,  356,  357,  358,  359,  360,  361,  362,  363,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,
-  280,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,  301,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
-  340,   -1,   -1,  343,  344,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,
-  370,  371,  372,  373,  374,  375,  257,  258,  259,  260,
-   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  301,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,   -1,   -1,  337,  338,  339,  340,
-   -1,   -1,  343,  344,    0,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,
-  371,  372,  373,  374,  375,   -1,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  277,  278,   -1,  280,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,
-   -1,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
-   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,  368,  369,  370,  371,  372,  373,  374,  375,
-  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,
-  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  277,  278,   -1,  280,  281,  282,  283,  284,  285,  286,
-  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,   -1,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1,
-  337,  338,  339,  340,   -1,   -1,  343,  344,    0,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-  367,  368,  369,  370,  371,  372,  373,  374,  375,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
-   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,
-   -1,   -1,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,
-   -1,  343,  344,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,
-  372,  373,  374,  375,  257,  258,  259,  260,   -1,   -1,
-  263,   -1,  265,  266,  267,  268,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,   -1,
-   -1,   -1,   -1,   -1,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,
-   -1,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,
-  343,  344,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  355,  356,  357,  358,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,   -1,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,
-   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,
-  278,   -1,  280,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,  301,   -1,   -1,   -1,   -1,   -1,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
-  338,  339,  340,   -1,   -1,  343,  344,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
-  368,  369,  370,  371,  372,  373,  374,  375,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,
-   -1,  280,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,  301,   -1,   -1,   -1,   -1,   -1,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338,
-  339,  340,   -1,   -1,  343,  344,    0,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,
-  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,
-  369,  370,  371,  372,  373,  374,  375,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
-   -1,  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,  301,   -1,   -1,
-   -1,   -1,   -1,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,
-  344,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,  257,  258,  259,  260,   -1,   -1,  263,   -1,
-  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,
-   -1,   -1,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
-   -1,   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  355,  356,  357,  358,  359,  360,  361,  362,  363,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,
-  280,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,  301,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
-  340,   -1,   -1,  343,  344,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,
-  370,  371,  372,  373,  374,  375,  257,  258,  259,  260,
-   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  301,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,   -1,   -1,  337,  338,  339,  340,
-   -1,   -1,  343,  344,    0,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,  370,
-  371,  372,  373,  374,  375,   -1,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   -1,   -1,   -1,   44,   45,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  277,  278,   -1,  280,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,
-   -1,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
-   -1,  337,  338,  339,  340,   -1,   -1,  343,  344,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,  367,  368,  369,  370,  371,  372,  373,  374,  375,
-  258,  259,  260,   -1,   -1,   -1,   -1,  265,  266,  267,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,
-  278,   -1,  280,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,  301,   -1,   -1,   -1,   -1,   -1,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
-  338,  339,  340,   -1,   -1,  343,  344,    0,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   92,   -1,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,  367,
-  368,  369,  370,  371,  372,  373,  374,  375,   -1,   -1,
-   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,
-   43,   44,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  137,  138,  139,  140,   -1,   -1,   59,   -1,   -1,   62,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  167,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,  212,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  220,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   43,
-   -1,   45,   46,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  322,  323,   -1,   -1,   -1,
-  327,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,
-  263,   -1,  265,  266,  267,  268,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,   -1,
-   -1,   -1,   -1,  306,  307,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  401,  402,  319,  320,  321,  322,
-  323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,  419,  420,   -1,   -1,   -1,   -1,   -1,   -1,
-  343,  344,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,  257,  258,  259,  260,   -1,   -1,  263,
-   -1,  265,  266,  267,  268,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,  301,   -1,   -1,
-   -1,    0,   -1,  307,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  319,  320,  321,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,  343,
-  344,   40,   41,   -1,   -1,   44,   45,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,  367,  368,  369,  370,  371,  372,  373,
-  374,  375,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   41,   -1,   -1,   44,   -1,   -1,  125,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,
-   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,  277,  278,
-   -1,  280,  281,  282,  283,   -1,   -1,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,  301,   -1,   -1,   -1,   -1,   -1,  307,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,  257,  258,  259,  260,
-   -1,  125,  263,   -1,  343,  344,   -1,  268,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  284,  285,   -1,   -1,   -1,  367,  368,
-  369,  370,  371,  372,  373,  374,  375,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,   59,   -1,  337,  338,  339,  340,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  349,  350,
-  351,  352,  353,  354,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,   -1,   -1,   -1,  375,   -1,   -1,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
-  125,   -1,   -1,   -1,  268,   59,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  284,  285,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   -1,    0,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,  125,   -1,  337,  338,  339,  340,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  375,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,
-  265,  266,  267,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,  302,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,    0,   -1,  263,
-   -1,   -1,   -1,   -1,  268,   -1,   -1,   -1,  343,  344,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  284,  285,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,   -1,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   59,   -1,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,  337,  338,  339,  340,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,   -1,   -1,
-   -1,  375,  265,  266,  267,    0,   -1,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,  302,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  343,  344,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,   -1,   -1,
-   -1,   -1,  265,  266,  267,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  277,  278,   -1,  280,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,  301,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  343,  344,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  367,  368,  369,  370,  371,  372,
-  373,  374,  375,    0,  125,  260,   -1,   -1,   -1,   -1,
-  265,  266,  267,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  343,  344,
-   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,
-   -1,   -1,   -1,   -1,  265,  266,  267,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,  280,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  301,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  343,  344,   93,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  367,  368,  369,  370,
-  371,  372,  373,  374,  375,    0,  125,   -1,   -1,   -1,
-   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,  265,  266,
-  267,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  277,  278,   -1,  280,  281,  282,  283,  284,  285,  286,
-  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  343,  344,   93,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  367,  368,  369,  370,  371,  372,  373,  374,  375,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  260,   -1,   -1,   -1,   -1,  265,  266,  267,   -1,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,
-   -1,  280,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,  301,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
-   -1,   -1,   -1,   -1,  343,  344,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,  367,  368,
-  369,  370,  371,  372,  373,  374,  375,   -1,   -1,   -1,
-   43,   -1,   45,   46,   -1,  260,   -1,   -1,   -1,   -1,
-  265,  266,  267,   -1,   -1,  125,   59,   -1,   -1,   -1,
-   -1,   -1,  277,  278,   -1,  280,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,
-   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,  343,  344,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  367,  368,  369,  370,  371,  372,  373,  374,
-  375,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-   -1,   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,
-  280,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,  301,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
-  340,   -1,   -1,  343,  344,   -1,   -1,   -1,   -1,   -1,
-   -1,  284,  285,   -1,    0,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,
-  370,  371,  372,  373,  374,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,  317,  318,  319,  320,  321,  322,
-  323,   37,   -1,   -1,   -1,   41,   42,   43,   44,   45,
-   -1,   47,   -1,   -1,  337,  338,  339,  340,   -1,   -1,
-   -1,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,   -1,
-   -1,   -1,  355,  356,  357,  358,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,   -1,   -1,   -1,   93,   45,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   96,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   45,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   96,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  264,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  291,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  302,   -1,   -1,  305,
-  257,  258,  259,  260,  261,   -1,  263,   -1,   -1,   -1,
-   -1,  268,  269,  270,  271,  272,  273,  274,  275,  276,
-   -1,   -1,  279,   33,   -1,  282,  283,  284,  285,   -1,
-   40,   -1,   -1,   -1,   -1,   45,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  349,  350,  351,  352,  353,  354,   -1,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,  335,   -1,
-  337,  338,  339,  340,  341,  342,   96,   -1,  345,   -1,
-  347,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,  364,   -1,  366,
-  257,  258,  259,  260,  261,   -1,  263,   -1,  375,  376,
-   -1,  268,  269,  270,  271,  272,  273,  274,  275,  276,
-   -1,   -1,  279,   -1,   -1,  282,  283,  284,  285,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   41,   -1,   -1,   -1,   45,   -1,   -1,   -1,   -1,   -1,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,  335,   -1,
-  337,  338,  339,  340,  341,  342,   -1,   -1,  345,   -1,
-  347,   -1,   -1,   -1,   -1,   96,   -1,   -1,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,  364,   -1,  366,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  375,  376,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  277,  278,   -1,
-  280,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,  301,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   33,   -1,  337,  338,  339,
-  340,   -1,   40,  343,  344,   -1,   -1,   45,   46,   -1,
-   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,  367,  368,  369,
-  370,  371,  372,  373,  374,  375,  257,  258,  259,  260,
-   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   96,   -1,
-   -1,   -1,   -1,  284,  285,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,   -1,   -1,
-   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,   33,   -1,  337,  338,  339,  340,
-   -1,   40,   -1,   -1,   -1,   -1,   45,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,  360,
-  361,  362,  363,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  375,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
-   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  284,  285,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
-  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,  334,   -1,   -1,  337,
-  338,  339,  340,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  355,  356,  357,
-  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  375,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   33,   -1,  284,  285,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   45,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338,
-  339,  340,  257,  258,  259,  260,   96,   -1,  263,   -1,
-   -1,   -1,   -1,  268,   -1,   -1,  355,  356,  357,  358,
-  359,  360,  361,  362,  363,   -1,   -1,   33,   -1,  284,
-  285,   -1,   -1,   -1,   40,   -1,  375,   -1,   -1,   45,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
-   -1,   -1,  337,  338,  339,  340,   -1,   -1,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  355,  356,  357,  358,  359,  360,  361,  362,  363,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,
-  375,   -1,   -1,   45,   46,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   96,   -1,   -1,   -1,  268,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  284,  285,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,   -1,   42,   -1,   -1,   45,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
-  340,  257,  258,  259,  260,   -1,   -1,  263,   -1,   96,
-   -1,   -1,  268,   -1,   -1,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,   -1,   -1,   -1,   -1,  284,  285,
-   33,   -1,   -1,   -1,   -1,  375,   -1,   40,   -1,   -1,
-   -1,   -1,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,  333,  334,   -1,
-   -1,  337,  338,  339,  340,  257,  258,  259,   -1,   -1,
-   -1,  263,   -1,   96,   -1,   -1,  268,   -1,   -1,  355,
-  356,  357,  358,  359,  360,  361,  362,  363,   -1,   -1,
-   -1,   -1,  284,  285,   33,   -1,   -1,   -1,   -1,  375,
-   -1,   40,   -1,   -1,   -1,   -1,   45,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,
-   -1,   -1,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,  333,  334,   -1,   -1,  337,  338,  339,  340,   -1,
-  257,  258,  259,   -1,   -1,   -1,  263,   96,   -1,   -1,
-   -1,  268,   -1,  355,  356,  357,  358,  359,  360,  361,
-  362,  363,   -1,   -1,   -1,   -1,   -1,  284,  285,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
-   -1,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-  317,  318,   -1,   -1,   -1,   -1,   -1,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,  333,  334,   -1,   -1,
-  337,  338,  339,  340,  257,  258,  259,   -1,   -1,   -1,
-  263,   -1,   96,   -1,   -1,  268,   -1,   -1,  355,  356,
-  357,  358,  359,  360,  361,  362,  363,   -1,   -1,   -1,
-   -1,  284,  285,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   45,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,
-   -1,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-  333,  334,   -1,   -1,  337,  338,  339,  340,  257,  258,
-  259,   -1,   -1,   -1,  263,   -1,   96,   -1,   -1,  268,
-   -1,   -1,  355,  356,  357,  358,  359,  360,  361,  362,
-  363,   -1,   -1,   -1,   -1,  284,  285,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,  317,  318,
-   -1,   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,  333,  334,   -1,   -1,  337,  338,
-  339,  340,   -1,  257,  258,  259,   -1,   -1,   -1,  263,
-   -1,   -1,   -1,   -1,  268,   -1,  355,  356,  357,  358,
-  359,  360,  361,  362,  363,   -1,   -1,   -1,   -1,   -1,
-  284,  285,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,   -1,   -1,   -1,   -1,   -1,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
-  334,   -1,   -1,  337,  338,  339,  340,  257,  258,  259,
-   -1,   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,
-   -1,  355,  356,  357,  358,  359,  360,  361,  362,  363,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,   -1,
-   -1,   -1,   -1,   -1,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,  333,  334,   -1,   -1,  337,  338,  339,
-  340,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  355,  356,  357,  358,  359,
-  360,  361,  362,  363,
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -206
+static const yytype_int16 yytable[] =
+{
+     109,   266,   229,   404,   122,   424,   109,   129,   231,    41,
+     408,   252,     4,    50,   170,    47,   -17,    44,    45,    53,
+       6,   208,   209,   210,    54,     1,   409,    50,   -16,     9,
+     103,    99,    42,    53,    46,   421,   103,    99,    54,   174,
+     175,   115,   375,    43,   308,   169,   380,   127,   208,   201,
+     112,   191,   192,   121,   217,   171,   123,   172,   230,   209,
+     210,   131,   245,   246,   247,   218,   248,   203,   177,   206,
+     207,   109,   445,   219,   220,   221,   222,   223,   224,   225,
+     173,   226,   179,   209,   210,   209,   210,   111,   253,   209,
+     210,    48,   180,   111,   255,   256,   290,   202,   109,   257,
+     258,   103,    99,   292,   441,   209,   210,   205,   181,   269,
+     270,   271,   272,   273,   274,   275,   276,   278,   278,   278,
+     278,   293,   193,   194,   294,   295,   296,   261,   103,    99,
+     340,   250,   130,    41,   182,   297,   298,    94,   411,   412,
+     302,   303,   263,   265,    31,   278,   251,   103,   103,   103,
+     103,    94,   361,   363,   204,   -17,   367,   369,   111,   -17,
+     -17,   446,   209,   210,   183,   336,   337,   -16,   299,   300,
+     301,   -16,   -16,   184,   433,   311,    41,   185,   377,   378,
+     195,   196,   254,   293,   293,   111,   312,   227,  -140,  -140,
+     231,   186,   200,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   325,   326,   111,   111,   111,   111,   342,   343,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   278,   278,   359,     9,   187,   188,   362,
+     364,   376,   111,   368,   370,   290,   328,   382,   189,   329,
+     330,   201,   277,   279,   280,   286,   405,   383,   190,   209,
+     210,   197,   198,   103,   103,   262,   267,   425,   314,   203,
+     209,   210,   365,   366,   218,   384,   327,   334,   331,    41,
+     309,   335,   248,   220,   221,   222,   223,   224,   225,   338,
+     226,   216,   339,   431,   341,   399,   400,   372,   374,   202,
+     220,   221,   222,   223,   224,   225,   373,   226,   379,   385,
+     387,   389,   278,   293,   293,   388,   390,   278,   278,   391,
+     111,   111,   392,   393,   394,   234,   235,   236,   237,   238,
+     239,   211,   212,   213,   214,   215,   395,   376,   376,   403,
+     407,   396,   103,   397,   255,   413,   414,   103,   103,   416,
+     422,    31,   423,   426,   435,   436,   204,   437,   357,   358,
+     241,   242,   243,   244,   245,   246,   247,   438,   248,   444,
+     449,   450,   453,   376,   128,   310,   124,   211,   212,   213,
+     214,   215,   333,   434,     0,     0,   406,     0,   278,   278,
+     429,     0,   430,     0,   200,     0,   227,     0,     0,   111,
+       0,     0,     0,     0,   111,   111,   442,     0,   278,   278,
+       0,   332,   418,   227,     0,     0,   419,   420,   103,   103,
+       0,   236,   237,   238,   239,    41,   448,     0,     0,     0,
+       0,   451,   211,   212,   213,   214,   215,   398,   103,   103,
+       0,     0,   401,   402,  -141,  -141,     0,     0,   234,   235,
+     236,   237,   238,   239,   241,   242,   243,   244,   245,   246,
+     247,     0,   248,     0,     0,   234,   235,   236,   237,   238,
+     239,    50,    51,    52,     9,   111,   111,    53,     0,     0,
+       0,     0,    54,   241,   242,   243,   244,   245,   246,   247,
+       0,   248,     0,     0,     0,   111,   111,     0,    55,    56,
+     241,   242,   243,   244,   245,   246,   247,     0,   248,     0,
+       0,     0,     0,   427,   428,     0,     0,     0,     0,     0,
+       0,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,   439,   440,     0,     0,     0,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,   238,
+     239,    80,    81,    82,    83,   243,   244,   245,   246,   247,
+       0,   248,     0,     0,     0,     0,     0,     0,     0,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,     0,     0,
+     241,   242,   243,   244,   245,   246,   247,     0,   248,    31,
+       0,     0,     0,     0,   113,    94,     0,     0,     0,     0,
+       0,    95,     0,     0,     0,   114,   304,   305,    52,     9,
+      10,     0,    53,   324,     0,     0,     0,    54,    11,    12,
+      13,    14,    15,    16,    17,    18,     0,     0,    19,     0,
+       0,    20,    21,   306,   307,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,     0,     0,
+       0,     0,     0,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    24,     0,    80,    81,    82,    83,
+      25,    26,     0,     0,    27,     0,    28,     0,     0,     0,
+       0,     0,     0,     0,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    29,     0,    30,     0,     0,     0,     0,
+       0,     0,     0,     0,    31,    32,     0,     0,     0,    93,
+      94,    33,     0,     0,     7,     8,    95,     9,    10,     0,
+      96,     0,     0,     0,     0,    34,    11,    12,    13,    14,
+      15,    16,    17,    18,     0,     0,    19,     0,     0,    20,
+      21,    22,    23,     0,     0,     0,     0,     0,     0,     0,
+       7,     8,     0,     9,    10,     0,     0,     0,     0,     0,
+       0,     0,    11,    12,    13,    14,    15,    16,    17,    18,
+       0,     0,    19,     0,     0,    20,    21,    22,    23,   234,
+     235,   236,   237,   238,   239,     0,     0,     0,     0,     0,
+       0,     0,    24,     0,     0,     0,     0,     0,    25,    26,
+       0,     0,    27,     0,    28,     0,     0,     0,     0,     0,
+       0,     0,     0,   240,   241,   242,   243,   244,   245,   246,
+     247,    29,   248,    30,     0,     0,     0,     0,    24,     0,
+       0,     0,    31,    32,    25,    26,     0,     0,    27,    33,
+      28,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      42,     0,     0,    34,     0,     0,     0,    29,     0,    30,
+       0,     0,     0,     0,     0,     0,     0,     0,    31,    32,
+      50,    51,    52,     9,     0,    33,    53,     0,   132,   133,
+     134,    54,     0,     0,     0,     0,     0,     0,     0,    34,
+     135,   136,     0,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,     0,     0,     0,     0,     0,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,     0,     0,     0,     0,     0,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,    82,    83,     0,     0,   159,   160,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+     161,   162,   163,   164,   165,   166,   167,   168,    31,     0,
+       0,     0,     0,   113,    94,    50,    51,    52,     9,     0,
+      95,    53,     0,     0,    96,     0,    54,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    55,    56,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,     0,     0,     0,
+       0,     0,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,     0,     0,    80,    81,    82,    83,     0,
+      50,    51,    52,     9,     0,     0,    53,     0,     0,     0,
+       0,    54,     0,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,     0,     0,    55,    56,     0,
+       0,     0,     0,    31,     0,     0,     0,   284,    93,    94,
+       0,     0,     0,     0,     0,    95,     0,     0,     0,   114,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,     0,     0,     0,     0,     0,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,    82,    83,     0,    50,    51,    52,     9,     0,
+       0,    53,     0,     0,     0,     0,    54,     0,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+       0,     0,    55,    56,     0,     0,     0,     0,    31,     0,
+       0,     0,     0,    93,    94,     0,     0,     0,     0,     0,
+      95,     0,     0,     0,    96,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,     0,     0,     0,
+       0,     0,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,     0,     0,    80,    81,    82,    83,     0,
+      50,    51,    52,     9,     0,     0,    53,     0,     0,     0,
+       0,    54,     0,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,     0,     0,    55,    56,     0,
+       0,     0,     0,    31,     0,     0,     0,     0,   113,    94,
+       0,     0,     0,     0,     0,    95,     0,     0,     0,   114,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,     0,     0,     0,     0,     0,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,    82,    83,     0,    50,    51,    52,     9,     0,
+       0,    53,     0,     0,     0,     0,    54,     0,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+       0,     0,    55,    56,     0,     0,     0,     0,    31,     0,
+       0,     0,     0,    93,    94,     0,     0,     0,     0,     0,
+      95,     0,     0,     0,   114,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,     0,     0,     0,
+       0,     0,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,     0,     0,    80,    81,    82,    83,     0,
+     281,    51,    52,     0,     0,     0,   282,     0,     0,     0,
+       0,   283,     0,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,     0,     0,    55,    56,     0,
+       0,     0,     0,    31,     0,     0,     0,     0,   291,    94,
+       0,     0,     0,     0,     0,    95,     0,     0,     0,   114,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,     0,     0,     0,     0,     0,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,    82,    83,     0,    50,    51,    52,     0,     0,
+       0,    53,     0,     0,     0,     0,    54,     0,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+       0,     0,    55,    56,     0,     0,     0,     0,     0,     0,
+       0,     0,   284,   285,    94,     0,     0,     0,     0,     0,
+      95,     0,     0,     0,    96,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,     0,     0,     0,
+       0,     0,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,     0,     0,    80,    81,    82,    83,     0,
+      50,    51,    52,     0,     0,     0,    53,     0,     0,     0,
+       0,    54,     0,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,     0,     0,    55,    56,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   113,    94,
+       0,     0,     0,     0,     0,    95,   447,     0,     0,    96,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,     0,     0,     0,     0,     0,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,    82,    83,     0,    50,    51,    52,     0,     0,
+       0,    53,     0,     0,     0,     0,    54,     0,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+       0,     0,    55,    56,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   113,    94,     0,     0,     0,     0,     0,
+      95,     0,     0,     0,    96,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,     0,     0,     0,
+       0,     0,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,     0,     0,    80,    81,    82,    83,     0,
+      50,    51,    52,     0,     0,     0,    53,     0,     0,     0,
+       0,    54,     0,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,     0,     0,    55,    56,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    93,    94,
+       0,     0,     0,     0,     0,    95,     0,     0,     0,    96,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,     0,     0,     0,     0,     0,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,    82,    83,     0,     0,    50,    51,    52,     0,
+       0,     0,    53,     0,     0,     0,     0,    54,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   291,    94,     0,     0,     0,     0,     0,
+      95,  -205,     0,     0,    96,     0,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,     0,     0,
+       0,     0,     0,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,     0,     0,    80,    81,    82,    83,
+       0,     0,    50,    51,    52,     0,     0,     0,    53,     0,
+       0,     0,     0,    54,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   113,
+      94,     0,     0,     0,     0,     0,    95,  -204,     0,     0,
+      96,     0,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,     0,     0,     0,     0,     0,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+       0,     0,    80,    81,    82,    83,     0,    50,    51,    52,
+       0,     0,     0,    53,     0,     0,     0,     0,    54,     0,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   113,    94,     0,     0,     0,
+       0,     0,    95,     0,     0,     0,    96,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,     0,
+       0,     0,     0,     0,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,     0,     0,    80,    81,    82,
+      83,    55,    56,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,     0,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    55,    56,     0,     0,
+     113,    94,     0,     0,     0,     0,     0,    95,     0,     0,
+       0,    96,     0,     0,    80,    81,    82,    83,     0,     0,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,     0,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,     0,     0,     0,     0,   232,     0,     0,   233,    80,
+      81,    82,    83,     0,     0,   232,   381,     0,   233,     0,
+       0,     0,     0,     0,     0,     0,     0,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,   259,   260,   236,   237,
+     238,   239,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   284,   234,   235,   236,   237,   238,   239,     0,     0,
+       0,     0,   259,   260,   236,   237,   238,   239,     0,     0,
+     240,   241,   242,   243,   244,   245,   246,   247,     0,   248,
+       0,     0,     0,     0,     0,     0,   240,   241,   242,   243,
+     244,   245,   246,   247,     0,   248,   240,   241,   242,   243,
+     244,   245,   246,   247,     0,   248,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,     0,     0,
+       0,     0,     0,     0,     0,    80,    81,    82,    83,     0,
+       0,     0,     0,     0,     0,     0,    80,    81,    82,    83,
+       0,     0,     0,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,     0,     0,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,     0,     0,     0,     0,   216,   259,   260,
+     236,   237,   238,   239,     0,     0,     0,   234,   235,   236,
+     237,   238,   239,     0,     0,     0,   234,     0,   236,   237,
+     238,   239,     0,     0,     0,   259,     0,   236,   237,   238,
+     239,     0,     0,   241,   242,   243,   244,   245,   246,   247,
+       0,   248,   241,   242,   243,   244,   245,   246,   247,     0,
+     248,   241,   242,   243,   244,   245,   246,   247,     0,   248,
+     241,   242,   243,   244,   245,   246,   247,     0,   248
 };
-#define YYFINAL 2
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 378
-#if YYDEBUG
-static const char *yyname[] = {
 
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-"'!'",0,0,0,"'%'",0,0,"'('","')'","'*'","'+'","','","'-'","'.'","'/'",0,0,0,0,0,
-0,0,0,0,0,"':'","';'","'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,"'['",0,"']'","'^'",0,"'`'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,"'{'",0,"'}'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"LABEL","VARIABLE","NUMBER",
-"TEXT","COMMAND_LINE","DELIMITED","ORDINAL","TH","LEFT_ARROW_HEAD",
-"RIGHT_ARROW_HEAD","DOUBLE_ARROW_HEAD","LAST","BOX","CIRCLE","ELLIPSE","ARC",
-"LINE","ARROW","MOVE","SPLINE","HEIGHT","RADIUS","FIGNAME","WIDTH","DIAMETER",
-"UP","DOWN","RIGHT","LEFT","FROM","TO","AT","WITH","BY","THEN","SOLID","DOTTED",
-"DASHED","CHOP","SAME","INVISIBLE","LJUST","RJUST","ABOVE","BELOW","OF","THE",
-"WAY","BETWEEN","AND","HERE","DOT_N","DOT_E","DOT_W","DOT_S","DOT_NE","DOT_SE",
-"DOT_NW","DOT_SW","DOT_C","DOT_START","DOT_END","DOT_X","DOT_Y","DOT_HT",
-"DOT_WID","DOT_RAD","SIN","COS","ATAN2","LOG","EXP","SQRT","K_MAX","K_MIN",
-"INT","RAND","SRAND","COPY","THRU","TOP","BOTTOM","UPPER","LOWER","SH","PRINT",
-"CW","CCW","FOR","DO","IF","ELSE","ANDAND","OROR","NOTEQUAL","EQUALEQUAL",
-"LESSEQUAL","GREATEREQUAL","LEFT_CORNER","RIGHT_CORNER","NORTH","SOUTH","EAST",
-"WEST","CENTER","END","START","RESET","UNTIL","PLOT","THICKNESS","FILL",
-"COLORED","OUTLINED","SHADED","XSLANTED","YSLANTED","ALIGNED","SPRINTF",
-"COMMAND","DEFINE","UNDEF",
+static const yytype_int16 yycheck[] =
+{
+      26,   128,   106,    52,    30,    52,    32,     4,   108,     4,
+     129,   114,     0,     3,    40,     6,     0,   140,   141,     9,
+       0,    97,   132,   133,    14,   139,   145,     3,     0,     6,
+      26,    26,   139,     9,   140,   145,    32,    32,    14,     3,
+       4,    28,   281,   141,   171,    40,   285,    35,   124,    93,
+       4,    30,    31,     4,   104,    43,   126,    44,    48,   132,
+     133,    94,   134,   135,   136,     6,   138,    93,    82,    95,
+      96,    97,   145,    14,    15,    16,    17,    18,    19,    20,
+     140,    22,     8,   132,   133,   132,   133,    26,   114,   132,
+     133,    82,   126,    32,    95,    96,   146,    93,   124,    97,
+      98,    97,    97,   147,   131,   132,   133,    94,   126,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   101,   102,   150,   151,   152,   122,   124,   124,
+     230,   130,   129,   128,   126,   161,   162,   127,   377,   378,
+     166,   167,   125,   126,   121,   171,   140,   143,   144,   145,
+     146,   127,   255,   256,    93,   139,   259,   260,    97,   143,
+     144,   131,   132,   133,   126,   209,   210,   139,   163,   164,
+     165,   143,   144,   126,   413,   171,   171,   126,   282,   283,
+      30,    31,    37,   209,   210,   124,   173,   128,   132,   133,
+     290,   126,    93,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   143,   144,   145,   146,   234,   235,
+     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   250,   251,     6,   126,   126,   255,
+     256,   281,   171,   259,   260,   285,   129,   287,   126,   132,
+     133,   285,   143,   144,   145,   146,   129,   291,   126,   132,
+     133,   101,   102,   249,   250,     6,     4,   129,     8,   285,
+     132,   133,   257,   258,     6,   291,   145,   130,   145,   264,
+     171,    10,   138,    15,    16,    17,    18,    19,    20,     3,
+      22,   125,   144,   410,    49,   329,   330,   144,     8,   285,
+      15,    16,    17,    18,    19,    20,   143,    22,     3,     8,
+     145,   129,   328,   329,   330,   145,   145,   333,   334,   145,
+     249,   250,   145,   129,   129,    95,    96,    97,    98,    99,
+     100,    65,    66,    67,    68,    69,   145,   377,   378,    50,
+       8,   145,   328,   145,    95,   129,     3,   333,   334,   111,
+     145,   121,   145,    51,     6,   145,   285,   145,   249,   250,
+     130,   131,   132,   133,   134,   135,   136,   145,   138,   145,
+      92,   145,     8,   413,    35,   171,    32,    65,    66,    67,
+      68,    69,   203,   415,    -1,    -1,    33,    -1,   404,   405,
+     406,    -1,   408,    -1,   285,    -1,   128,    -1,    -1,   328,
+      -1,    -1,    -1,    -1,   333,   334,    36,    -1,   424,   425,
+      -1,   145,   389,   128,    -1,    -1,   393,   394,   404,   405,
+      -1,    97,    98,    99,   100,   410,   442,    -1,    -1,    -1,
+      -1,   447,    65,    66,    67,    68,    69,   328,   424,   425,
+      -1,    -1,   333,   334,   132,   133,    -1,    -1,    95,    96,
+      97,    98,    99,   100,   130,   131,   132,   133,   134,   135,
+     136,    -1,   138,    -1,    -1,    95,    96,    97,    98,    99,
+     100,     3,     4,     5,     6,   404,   405,     9,    -1,    -1,
+      -1,    -1,    14,   130,   131,   132,   133,   134,   135,   136,
+      -1,   138,    -1,    -1,    -1,   424,   425,    -1,    30,    31,
+     130,   131,   132,   133,   134,   135,   136,    -1,   138,    -1,
+      -1,    -1,    -1,   404,   405,    -1,    -1,    -1,    -1,    -1,
+      -1,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,   424,   425,    -1,    -1,    -1,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    99,
+     100,    83,    84,    85,    86,   132,   133,   134,   135,   136,
+      -1,   138,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,    -1,    -1,
+     130,   131,   132,   133,   134,   135,   136,    -1,   138,   121,
+      -1,    -1,    -1,    -1,   126,   127,    -1,    -1,    -1,    -1,
+      -1,   133,    -1,    -1,    -1,   137,     3,     4,     5,     6,
+       7,    -1,     9,   145,    -1,    -1,    -1,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    -1,    -1,    25,    -1,
+      -1,    28,    29,    30,    31,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    -1,    -1,
+      -1,    -1,    -1,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    -1,    83,    84,    85,    86,
+      87,    88,    -1,    -1,    91,    -1,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,    -1,   112,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   121,   122,    -1,    -1,    -1,   126,
+     127,   128,    -1,    -1,     3,     4,   133,     6,     7,    -1,
+     137,    -1,    -1,    -1,    -1,   142,    15,    16,    17,    18,
+      19,    20,    21,    22,    -1,    -1,    25,    -1,    -1,    28,
+      29,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,     4,    -1,     6,     7,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    15,    16,    17,    18,    19,    20,    21,    22,
+      -1,    -1,    25,    -1,    -1,    28,    29,    30,    31,    95,
+      96,    97,    98,    99,   100,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,    87,    88,
+      -1,    -1,    91,    -1,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   129,   130,   131,   132,   133,   134,   135,
+     136,   110,   138,   112,    -1,    -1,    -1,    -1,    81,    -1,
+      -1,    -1,   121,   122,    87,    88,    -1,    -1,    91,   128,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     139,    -1,    -1,   142,    -1,    -1,    -1,   110,    -1,   112,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   121,   122,
+       3,     4,     5,     6,    -1,   128,     9,    -1,    11,    12,
+      13,    14,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,
+      23,    24,    -1,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    -1,    -1,    -1,    -1,    -1,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
+      83,    84,    85,    86,    -1,    -1,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,    -1,    -1,    -1,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,     3,     4,     5,     6,    -1,
+     133,     9,    -1,    -1,   137,    -1,    14,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    -1,    -1,    -1,
+      -1,    -1,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    -1,    83,    84,    85,    86,    -1,
+       3,     4,     5,     6,    -1,    -1,     9,    -1,    -1,    -1,
+      -1,    14,    -1,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,
+      -1,    -1,    -1,   121,    -1,    -1,    -1,   125,   126,   127,
+      -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,    -1,   137,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
+      83,    84,    85,    86,    -1,     3,     4,     5,     6,    -1,
+      -1,     9,    -1,    -1,    -1,    -1,    14,    -1,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    -1,    -1,    -1,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,    -1,    -1,    -1,    -1,
+     133,    -1,    -1,    -1,   137,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    -1,    -1,    -1,
+      -1,    -1,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    -1,    83,    84,    85,    86,    -1,
+       3,     4,     5,     6,    -1,    -1,     9,    -1,    -1,    -1,
+      -1,    14,    -1,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,
+      -1,    -1,    -1,   121,    -1,    -1,    -1,    -1,   126,   127,
+      -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,    -1,   137,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
+      83,    84,    85,    86,    -1,     3,     4,     5,     6,    -1,
+      -1,     9,    -1,    -1,    -1,    -1,    14,    -1,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    -1,    -1,    -1,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,    -1,    -1,    -1,    -1,
+     133,    -1,    -1,    -1,   137,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    -1,    -1,    -1,
+      -1,    -1,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    -1,    83,    84,    85,    86,    -1,
+       3,     4,     5,    -1,    -1,    -1,     9,    -1,    -1,    -1,
+      -1,    14,    -1,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,
+      -1,    -1,    -1,   121,    -1,    -1,    -1,    -1,   126,   127,
+      -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,    -1,   137,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
+      83,    84,    85,    86,    -1,     3,     4,     5,    -1,    -1,
+      -1,     9,    -1,    -1,    -1,    -1,    14,    -1,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   125,   126,   127,    -1,    -1,    -1,    -1,    -1,
+     133,    -1,    -1,    -1,   137,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    -1,    -1,    -1,
+      -1,    -1,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    -1,    83,    84,    85,    86,    -1,
+       3,     4,     5,    -1,    -1,    -1,     9,    -1,    -1,    -1,
+      -1,    14,    -1,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   126,   127,
+      -1,    -1,    -1,    -1,    -1,   133,   134,    -1,    -1,   137,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
+      83,    84,    85,    86,    -1,     3,     4,     5,    -1,    -1,
+      -1,     9,    -1,    -1,    -1,    -1,    14,    -1,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   126,   127,    -1,    -1,    -1,    -1,    -1,
+     133,    -1,    -1,    -1,   137,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    -1,    -1,    -1,
+      -1,    -1,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    -1,    -1,    83,    84,    85,    86,    -1,
+       3,     4,     5,    -1,    -1,    -1,     9,    -1,    -1,    -1,
+      -1,    14,    -1,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   126,   127,
+      -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,    -1,   137,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
+      83,    84,    85,    86,    -1,    -1,     3,     4,     5,    -1,
+      -1,    -1,     9,    -1,    -1,    -1,    -1,    14,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   126,   127,    -1,    -1,    -1,    -1,    -1,
+     133,    48,    -1,    -1,   137,    -1,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    -1,    -1,
+      -1,    -1,    -1,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    -1,    -1,    83,    84,    85,    86,
+      -1,    -1,     3,     4,     5,    -1,    -1,    -1,     9,    -1,
+      -1,    -1,    -1,    14,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   126,
+     127,    -1,    -1,    -1,    -1,    -1,   133,    48,    -1,    -1,
+     137,    -1,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    -1,    -1,    -1,    -1,    -1,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      -1,    -1,    83,    84,    85,    86,    -1,     3,     4,     5,
+      -1,    -1,    -1,     9,    -1,    -1,    -1,    -1,    14,    -1,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   126,   127,    -1,    -1,    -1,
+      -1,    -1,   133,    -1,    -1,    -1,   137,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    -1,
+      -1,    -1,    -1,    -1,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    -1,    -1,    83,    84,    85,
+      86,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,    -1,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    30,    31,    -1,    -1,
+     126,   127,    -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,
+      -1,   137,    -1,    -1,    83,    84,    85,    86,    -1,    -1,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    -1,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,    -1,    -1,    -1,    -1,    48,    -1,    -1,    51,    83,
+      84,    85,    86,    -1,    -1,    48,   125,    -1,    51,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,    95,    96,    97,    98,
+      99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   125,    95,    96,    97,    98,    99,   100,    -1,    -1,
+      -1,    -1,    95,    96,    97,    98,    99,   100,    -1,    -1,
+     129,   130,   131,   132,   133,   134,   135,   136,    -1,   138,
+      -1,    -1,    -1,    -1,    -1,    -1,   129,   130,   131,   132,
+     133,   134,   135,   136,    -1,   138,   129,   130,   131,   132,
+     133,   134,   135,   136,    -1,   138,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    83,    84,    85,    86,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    85,    86,
+      -1,    -1,    -1,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,    -1,    -1,    -1,    -1,   125,    95,    96,
+      97,    98,    99,   100,    -1,    -1,    -1,    95,    96,    97,
+      98,    99,   100,    -1,    -1,    -1,    95,    -1,    97,    98,
+      99,   100,    -1,    -1,    -1,    95,    -1,    97,    98,    99,
+     100,    -1,    -1,   130,   131,   132,   133,   134,   135,   136,
+      -1,   138,   130,   131,   132,   133,   134,   135,   136,    -1,
+     138,   130,   131,   132,   133,   134,   135,   136,    -1,   138,
+     130,   131,   132,   133,   134,   135,   136,    -1,   138
 };
-static const char *yyrule[] = {
-"$accept : top",
-"top : optional_separator",
-"top : element_list",
-"element_list : optional_separator middle_element_list optional_separator",
-"middle_element_list : element",
-"middle_element_list : middle_element_list separator element",
-"optional_separator :",
-"optional_separator : separator",
-"separator : ';'",
-"separator : separator ';'",
-"placeless_element : FIGNAME '=' macro_name",
-"placeless_element : VARIABLE '=' any_expr",
-"placeless_element : VARIABLE ':' '=' any_expr",
-"placeless_element : UP",
-"placeless_element : DOWN",
-"placeless_element : LEFT",
-"placeless_element : RIGHT",
-"placeless_element : COMMAND_LINE",
-"placeless_element : COMMAND print_args",
-"placeless_element : PRINT print_args",
-"$$1 :",
-"placeless_element : SH $$1 DELIMITED",
-"placeless_element : COPY TEXT",
-"$$2 :",
-"$$3 :",
-"placeless_element : COPY TEXT THRU $$2 DELIMITED $$3 until",
-"$$4 :",
-"$$5 :",
-"placeless_element : COPY THRU $$4 DELIMITED $$5 until",
-"$$6 :",
-"placeless_element : FOR VARIABLE '=' expr TO expr optional_by DO $$6 DELIMITED",
-"placeless_element : simple_if",
-"$$7 :",
-"placeless_element : simple_if ELSE $$7 DELIMITED",
-"placeless_element : reset_variables",
-"placeless_element : RESET",
-"macro_name : VARIABLE",
-"macro_name : LABEL",
-"reset_variables : RESET VARIABLE",
-"reset_variables : reset_variables VARIABLE",
-"reset_variables : reset_variables ',' VARIABLE",
-"print_args : print_arg",
-"print_args : print_args print_arg",
-"print_arg : expr",
-"print_arg : text",
-"print_arg : position",
-"$$8 :",
-"simple_if : IF any_expr THEN $$8 DELIMITED",
-"until :",
-"until : UNTIL TEXT",
-"any_expr : expr",
-"any_expr : text_expr",
-"text_expr : text EQUALEQUAL text",
-"text_expr : text NOTEQUAL text",
-"text_expr : text_expr ANDAND text_expr",
-"text_expr : text_expr ANDAND expr",
-"text_expr : expr ANDAND text_expr",
-"text_expr : text_expr OROR text_expr",
-"text_expr : text_expr OROR expr",
-"text_expr : expr OROR text_expr",
-"text_expr : '!' text_expr",
-"optional_by :",
-"optional_by : BY expr",
-"optional_by : BY '*' expr",
-"element : object_spec",
-"element : LABEL ':' optional_separator element",
-"element : LABEL ':' optional_separator position_not_place",
-"element : LABEL ':' optional_separator place",
-"$$9 :",
-"$$10 :",
-"element : '{' $$9 element_list '}' $$10 optional_element",
-"element : placeless_element",
-"optional_element :",
-"optional_element : element",
-"object_spec : BOX",
-"object_spec : CIRCLE",
-"object_spec : ELLIPSE",
-"object_spec : ARC",
-"object_spec : LINE",
-"object_spec : ARROW",
-"object_spec : MOVE",
-"object_spec : SPLINE",
-"object_spec : text",
-"object_spec : PLOT expr",
-"object_spec : PLOT expr text",
-"$$11 :",
-"object_spec : '[' $$11 element_list ']'",
-"object_spec : object_spec HEIGHT expr",
-"object_spec : object_spec RADIUS expr",
-"object_spec : object_spec WIDTH expr",
-"object_spec : object_spec DIAMETER expr",
-"object_spec : object_spec expr",
-"object_spec : object_spec UP",
-"object_spec : object_spec UP expr",
-"object_spec : object_spec DOWN",
-"object_spec : object_spec DOWN expr",
-"object_spec : object_spec RIGHT",
-"object_spec : object_spec RIGHT expr",
-"object_spec : object_spec LEFT",
-"object_spec : object_spec LEFT expr",
-"object_spec : object_spec FROM position",
-"object_spec : object_spec TO position",
-"object_spec : object_spec AT position",
-"object_spec : object_spec WITH path",
-"object_spec : object_spec WITH position",
-"object_spec : object_spec BY expr_pair",
-"object_spec : object_spec THEN",
-"object_spec : object_spec SOLID",
-"object_spec : object_spec DOTTED",
-"object_spec : object_spec DOTTED expr",
-"object_spec : object_spec DASHED",
-"object_spec : object_spec DASHED expr",
-"object_spec : object_spec FILL",
-"object_spec : object_spec FILL expr",
-"object_spec : object_spec XSLANTED expr",
-"object_spec : object_spec YSLANTED expr",
-"object_spec : object_spec SHADED text",
-"object_spec : object_spec COLORED text",
-"object_spec : object_spec OUTLINED text",
-"object_spec : object_spec CHOP",
-"object_spec : object_spec CHOP expr",
-"object_spec : object_spec SAME",
-"object_spec : object_spec INVISIBLE",
-"object_spec : object_spec LEFT_ARROW_HEAD",
-"object_spec : object_spec RIGHT_ARROW_HEAD",
-"object_spec : object_spec DOUBLE_ARROW_HEAD",
-"object_spec : object_spec CW",
-"object_spec : object_spec CCW",
-"object_spec : object_spec text",
-"object_spec : object_spec LJUST",
-"object_spec : object_spec RJUST",
-"object_spec : object_spec ABOVE",
-"object_spec : object_spec BELOW",
-"object_spec : object_spec THICKNESS expr",
-"object_spec : object_spec ALIGNED",
-"text : TEXT",
-"text : SPRINTF '(' TEXT sprintf_args ')'",
-"sprintf_args :",
-"sprintf_args : sprintf_args ',' expr",
-"position : position_not_place",
-"position : place",
-"position : '(' place ')'",
-"position_not_place : expr_pair",
-"position_not_place : position '+' expr_pair",
-"position_not_place : '(' position '+' expr_pair ')'",
-"position_not_place : position '-' expr_pair",
-"position_not_place : '(' position '-' expr_pair ')'",
-"position_not_place : '(' position ',' position ')'",
-"position_not_place : expr between position AND position",
-"position_not_place : '(' expr between position AND position ')'",
-"position_not_place : expr '<' position ',' position '>'",
-"position_not_place : '(' expr '<' position ',' position '>' ')'",
-"between : BETWEEN",
-"between : OF THE WAY BETWEEN",
-"expr_pair : expr ',' expr",
-"expr_pair : '(' expr_pair ')'",
-"place : label",
-"place : label corner",
-"place : corner label",
-"place : corner OF label",
-"place : HERE",
-"label : LABEL",
-"label : nth_primitive",
-"label : label '.' LABEL",
-"ordinal : ORDINAL",
-"ordinal : '`' any_expr TH",
-"optional_ordinal_last : LAST",
-"optional_ordinal_last : ordinal LAST",
-"nth_primitive : ordinal object_type",
-"nth_primitive : optional_ordinal_last object_type",
-"object_type : BOX",
-"object_type : CIRCLE",
-"object_type : ELLIPSE",
-"object_type : ARC",
-"object_type : LINE",
-"object_type : ARROW",
-"object_type : SPLINE",
-"object_type : '[' ']'",
-"object_type : TEXT",
-"label_path : '.' LABEL",
-"label_path : label_path '.' LABEL",
-"relative_path : corner",
-"relative_path : label_path",
-"relative_path : label_path corner",
-"path : relative_path",
-"path : '(' relative_path ',' relative_path ')'",
-"path : ORDINAL LAST object_type relative_path",
-"path : LAST object_type relative_path",
-"path : ORDINAL object_type relative_path",
-"path : LABEL relative_path",
-"corner : DOT_N",
-"corner : DOT_E",
-"corner : DOT_W",
-"corner : DOT_S",
-"corner : DOT_NE",
-"corner : DOT_SE",
-"corner : DOT_NW",
-"corner : DOT_SW",
-"corner : DOT_C",
-"corner : DOT_START",
-"corner : DOT_END",
-"corner : TOP",
-"corner : BOTTOM",
-"corner : LEFT",
-"corner : RIGHT",
-"corner : UPPER LEFT",
-"corner : LOWER LEFT",
-"corner : UPPER RIGHT",
-"corner : LOWER RIGHT",
-"corner : LEFT_CORNER",
-"corner : RIGHT_CORNER",
-"corner : UPPER LEFT_CORNER",
-"corner : LOWER LEFT_CORNER",
-"corner : UPPER RIGHT_CORNER",
-"corner : LOWER RIGHT_CORNER",
-"corner : NORTH",
-"corner : SOUTH",
-"corner : EAST",
-"corner : WEST",
-"corner : CENTER",
-"corner : START",
-"corner : END",
-"expr : VARIABLE",
-"expr : NUMBER",
-"expr : place DOT_X",
-"expr : place DOT_Y",
-"expr : place DOT_HT",
-"expr : place DOT_WID",
-"expr : place DOT_RAD",
-"expr : expr '+' expr",
-"expr : expr '-' expr",
-"expr : expr '*' expr",
-"expr : expr '/' expr",
-"expr : expr '%' expr",
-"expr : expr '^' expr",
-"expr : '-' expr",
-"expr : '(' any_expr ')'",
-"expr : SIN '(' any_expr ')'",
-"expr : COS '(' any_expr ')'",
-"expr : ATAN2 '(' any_expr ',' any_expr ')'",
-"expr : LOG '(' any_expr ')'",
-"expr : EXP '(' any_expr ')'",
-"expr : SQRT '(' any_expr ')'",
-"expr : K_MAX '(' any_expr ',' any_expr ')'",
-"expr : K_MIN '(' any_expr ',' any_expr ')'",
-"expr : INT '(' any_expr ')'",
-"expr : RAND '(' any_expr ')'",
-"expr : RAND '(' ')'",
-"expr : SRAND '(' any_expr ')'",
-"expr : expr '<' expr",
-"expr : expr LESSEQUAL expr",
-"expr : expr '>' expr",
-"expr : expr GREATEREQUAL expr",
-"expr : expr EQUALEQUAL expr",
-"expr : expr NOTEQUAL expr",
-"expr : expr ANDAND expr",
-"expr : expr OROR expr",
-"expr : '!' expr",
 
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,   139,   147,   148,   150,   151,     0,     3,     4,     6,
+       7,    15,    16,    17,    18,    19,    20,    21,    22,    25,
+      28,    29,    30,    31,    81,    87,    88,    91,    93,   110,
+     112,   121,   122,   128,   142,   149,   152,   161,   164,   170,
+     174,   176,   139,   141,   140,   141,   140,     6,    82,   153,
+       3,     4,     5,     9,    14,    30,    31,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      83,    84,    85,    86,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   126,   127,   133,   137,   162,   163,   176,
+     178,   179,   181,   182,   183,   184,   185,   186,   191,   192,
+     193,   194,     4,   126,   137,   167,   168,   176,   182,   192,
+     194,     4,   192,   126,   162,   175,   171,   150,   151,     4,
+     129,    94,    11,    12,    13,    23,    24,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    89,
+      90,   113,   114,   115,   116,   117,   118,   119,   120,   176,
+     192,   150,   167,   140,     3,     4,   160,    82,   156,     8,
+     126,   126,   126,   126,   126,   126,   126,   126,   126,   126,
+     126,    30,    31,   101,   102,    30,    31,   101,   102,   167,
+     178,   181,   182,   192,   194,   167,   192,   192,   163,   132,
+     133,    65,    66,    67,    68,    69,   125,   191,     6,    14,
+      15,    16,    17,    18,    19,    20,    22,   128,   187,   187,
+      48,   183,    48,    51,    95,    96,    97,    98,    99,   100,
+     129,   130,   131,   132,   133,   134,   135,   136,   138,   180,
+     130,   140,   168,   192,    37,    95,    96,    97,    98,    95,
+      96,   176,     6,   148,   150,   148,   170,     4,   159,   192,
+     192,   192,   192,   192,   192,   192,   192,   178,   192,   178,
+     178,     3,     9,    14,   125,   126,   178,   188,   189,   190,
+     191,   126,   181,   192,   192,   192,   192,   192,   192,   176,
+     176,   176,   192,   192,     3,     4,    30,    31,   170,   178,
+     179,   182,   167,   154,     8,   167,   167,   167,   167,   167,
+     167,   167,   167,   167,   145,   167,   167,   145,   129,   132,
+     133,   145,   145,   180,   130,    10,   181,   181,     3,   144,
+     183,    49,   192,   192,   192,   192,   192,   192,   192,   192,
+     192,   192,   192,   192,   192,   192,   192,   178,   178,   192,
+     165,   168,   192,   168,   192,   176,   176,   168,   192,   168,
+     192,   177,   144,   143,     8,   189,   191,   187,   187,     3,
+     189,   125,   191,   181,   192,     8,   157,   145,   145,   129,
+     145,   145,   145,   129,   129,   145,   145,   145,   178,   181,
+     181,   178,   178,    50,    52,   129,    33,     8,   129,   145,
+     172,   189,   189,   129,     3,   155,   111,   166,   167,   167,
+     167,   145,   145,   145,    52,   129,    51,   178,   178,   192,
+     192,   170,   173,   189,   166,     6,   145,   145,   145,   178,
+     178,   131,    36,   169,   145,   145,   131,   134,   192,    92,
+     145,   192,   158,     8
 };
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
-#if YYDEBUG
-#include <stdio.h>
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
-#endif
+# define YYLEX yylex ()
 #endif
 
-#define YYINITSTACKSIZE 500
+/* Enable debugging if requested.  */
+#if YYDEBUG
 
-int      yydebug;
-int      yynerrs;
-int      yyerrflag;
-int      yychar;
-short   *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* variables for the parser stack */
-static short   *yyss;
-static short   *yysslim;
-static YYSTYPE *yyvs;
-static unsigned yystacksize;
-#line 1667 "pic.y"
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
 
-/* bison defines const to be empty unless __STDC__ is defined, which it
-isn't under cfront */
 
-#ifdef const
-#undef const
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-static struct {
-  const char *name;
-  double val;
-  int scaled;		     // non-zero if val should be multiplied by scale
-} defaults_table[] = {
-  { "arcrad", .25, 1 },
-  { "arrowht", .1, 1 },
-  { "arrowwid", .05, 1 },
-  { "circlerad", .25, 1 },
-  { "boxht", .5, 1 },
-  { "boxwid", .75, 1 },
-  { "boxrad", 0.0, 1 },
-  { "dashwid", .05, 1 },
-  { "ellipseht", .5, 1 },
-  { "ellipsewid", .75, 1 },
-  { "moveht", .5, 1 },
-  { "movewid", .5, 1 },
-  { "lineht", .5, 1 },
-  { "linewid", .5, 1 },
-  { "textht", 0.0, 1 },
-  { "textwid", 0.0, 1 },
-  { "scale", 1.0, 0 },
-  { "linethick", -1.0, 0 },		// in points
-  { "fillval", .5, 0 },
-  { "arrowhead", 1.0, 0 },
-  { "maxpswid", 8.5, 0 },
-  { "maxpsht", 11.0, 0 },
-};
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
-place *lookup_label(const char *label)
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
 {
-  saved_state *state = current_saved_state;
-  PTABLE(place) *tbl = current_table;
-  for (;;) {
-    place *pl = tbl->lookup(label);
-    if (pl)
-      return pl;
-    if (!state)
-      return 0;
-    tbl = state->tbl;
-    state = state->prev;
-  }
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
 }
 
-void define_label(const char *label, const place *pl)
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
 {
-  place *p = new place[1];
-  *p = *pl;
-  current_table->define(label, p);
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      YYFPRINTF (stderr, "\n");
+    }
 }
 
-int lookup_variable(const char *name, double *val)
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
 {
-  place *pl = lookup_label(name);
-  if (pl) {
-    *val = pl->x;
-    return 1;
-  }
-  return 0;
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
 }
+#  endif
+# endif
 
-void define_variable(const char *name, double val)
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  place *p = new place[1];
-  p->obj = 0;
-  p->x = val;
-  p->y = 0.0;
-  current_table->define(name, p);
-  if (strcmp(name, "scale") == 0) {
-    // When the scale changes, reset all scaled pre-defined variables to
-    // their default values.
-    for (unsigned int i = 0;
-	 i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) 
-      if (defaults_table[i].scaled)
-	define_variable(defaults_table[i].name, val*defaults_table[i].val);
-  }
-}
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-// called once only (not once per parse)
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-void parse_init()
-{
-  current_direction = RIGHT_DIRECTION;
-  current_position.x = 0.0;
-  current_position.y = 0.0;
-  // This resets everything to its default value.
-  reset_all();
+  return yyd - 1;
 }
+#  endif
+# endif
 
-void reset(const char *nm)
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
 {
-  for (unsigned int i = 0;
-       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
-    if (strcmp(nm, defaults_table[i].name) == 0) {
-      double val = defaults_table[i].val;
-      if (defaults_table[i].scaled) {
-	double scale;
-	lookup_variable("scale", &scale);
-	val *= scale;
-      }
-      define_variable(defaults_table[i].name, val);
-      return;
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
     }
-  lex_error("`%1' is not a predefined variable", nm);
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
 }
+# endif
 
-void reset_all()
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  // We only have to explicitly reset the pre-defined variables that
-  // aren't scaled because `scale' is not scaled, and changing the
-  // value of `scale' will reset all the pre-defined variables that
-  // are scaled.
-  for (unsigned int i = 0;
-       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
-    if (!defaults_table[i].scaled)
-      define_variable(defaults_table[i].name, defaults_table[i].val);
-}
-
-// called after each parse
+  int yyn = yypact[yystate];
 
-void parse_cleanup()
-{
-  while (current_saved_state != 0) {
-    delete current_table;
-    current_table = current_saved_state->tbl;
-    saved_state *tem = current_saved_state;
-    current_saved_state = current_saved_state->prev;
-    delete tem;
-  }
-  assert(current_table == &top_table);
-  PTABLE_ITERATOR(place) iter(current_table);
-  const char *key;
-  place *pl;
-  while (iter.next(&key, &pl))
-    if (pl->obj != 0) {
-      position pos = pl->obj->origin();
-      pl->obj = 0;
-      pl->x = pos.x;
-      pl->y = pos.y;
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-  while (olist.head != 0) {
-    object *tem = olist.head;
-    olist.head = olist.head->next;
-    delete tem;
-  }
-  olist.tail = 0;
-  current_direction = RIGHT_DIRECTION;
-  current_position.x = 0.0;
-  current_position.y = 0.0;
 }
+#endif /* YYERROR_VERBOSE */
+
 
-const char *ordinal_postfix(int n)
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
 {
-  if (n < 10 || n > 20)
-    switch (n % 10) {
-    case 1:
-      return "st";
-    case 2:
-      return "nd";
-    case 3:
-      return "rd";
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
     }
-  return "th";
 }
 
-const char *object_type_name(object_type type)
-{
-  switch (type) {
-  case BOX_OBJECT:
-    return "box";
-  case CIRCLE_OBJECT:
-    return "circle";
-  case ELLIPSE_OBJECT:
-    return "ellipse";
-  case ARC_OBJECT:
-    return "arc";
-  case SPLINE_OBJECT:
-    return "spline";
-  case LINE_OBJECT:
-    return "line";
-  case ARROW_OBJECT:
-    return "arrow";
-  case MOVE_OBJECT:
-    return "move";
-  case TEXT_OBJECT:
-    return "\"\"";
-  case BLOCK_OBJECT:
-    return "[]";
-  case OTHER_OBJECT:
-  case MARK_OBJECT:
-  default:
-    break;
-  }
-  return "object";
-}
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
-static char sprintf_buf[1024];
 
-char *format_number(const char *form, double n)
-{
-  if (form == 0)
-    form = "%g";
-  return do_sprintf(form, &n, 1);
-}
+/* The lookahead symbol.  */
+int yychar;
 
-char *do_sprintf(const char *form, const double *v, int nv)
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
 {
-  string result;
-  int i = 0;
-  string one_format;
-  while (*form) {
-    if (*form == '%') {
-      one_format += *form++;
-      for (; *form != '\0' && strchr("#-+ 0123456789.", *form) != 0; form++)
-	one_format += *form;
-      if (*form == '\0' || strchr("eEfgG%", *form) == 0) {
-	lex_error("bad sprintf format");
-	result += one_format;
-	result += form;
-	break;
-      }
-      if (*form == '%') {
-	one_format += *form++;
-	one_format += '\0';
-	snprintf(sprintf_buf, sizeof(sprintf_buf),
-		 "%s", one_format.contents());
+
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
       }
-      else {
-	if (i >= nv) {
-	  lex_error("too few arguments to snprintf");
-	  result += one_format;
-	  result += form;
-	  break;
-	}
-	one_format += *form++;
-	one_format += '\0';
-	snprintf(sprintf_buf, sizeof(sprintf_buf),
-		 one_format.contents(), v[i++]);
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
       }
-      one_format.clear();
-      result += sprintf_buf;
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
     }
-    else
-      result += *form++;
-  }
-  result += '\0';
-  return strsave(result.contents());
-}
-#line 3917 "pic.cpp"
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(void)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = yystacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = yyssp - yyss;
-    newss = (yyss != 0)
-          ? (short *)realloc(yyss, newsize * sizeof(*newss))
-          : (short *)malloc(newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    yyss  = newss;
-    yyssp = newss + i;
-    newvs = (yyvs != 0)
-          ? (YYSTYPE *)realloc(yyvs, newsize * sizeof(*newvs))
-          : (YYSTYPE *)malloc(newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    yyvs = newvs;
-    yyvsp = newvs + i;
-    yystacksize = newsize;
-    yysslim = yyss + newsize - 1;
-    return 0;
-}
 
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
-    if ((yys = getenv("YYDEBUG")) != 0)
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
     {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
     }
-#endif
 
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-    if (yyss == NULL && yygrowstack()) goto yyoverflow;
-    yyssp = yyss;
-    yyvsp = yyvs;
-    yystate = 0;
-    *yyssp = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
+  if (yychar <= YYEOF)
     {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+  else
     {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yysslim && yygrowstack())
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yyssp = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
     {
-        yyn = yytable[yyn];
-        goto yyreduce;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
     }
-    if (yyerrflag) goto yyinrecovery;
 
-    yyerror("syntax error");
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
 
-yyerrlab:
-    ++yynerrs;
 
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yysslim && yygrowstack())
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yyssp = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
+        case 3:
 
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yyvsp[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
+/* Line 1455 of yacc.c  */
+#line 279 "pic.y"
     {
-case 2:
-#line 277 "pic.y"
-	{
 		  if (olist.head)
 		    print_picture(olist.head);
 		}
-break;
-case 3:
-#line 286 "pic.y"
-	{ yyval.pl = yyvsp[-1].pl; }
-break;
-case 4:
-#line 291 "pic.y"
-	{ yyval.pl = yyvsp[0].pl; }
-break;
-case 5:
+    break;
+
+  case 4:
+
+/* Line 1455 of yacc.c  */
+#line 288 "pic.y"
+    { (yyval.pl) = (yyvsp[(2) - (3)].pl); }
+    break;
+
+  case 5:
+
+/* Line 1455 of yacc.c  */
 #line 293 "pic.y"
-	{ yyval.pl = yyvsp[-2].pl; }
-break;
-case 10:
-#line 308 "pic.y"
-	{
+    { (yyval.pl) = (yyvsp[(1) - (1)].pl); }
+    break;
+
+  case 6:
+
+/* Line 1455 of yacc.c  */
+#line 295 "pic.y"
+    { (yyval.pl) = (yyvsp[(1) - (3)].pl); }
+    break;
+
+  case 11:
+
+/* Line 1455 of yacc.c  */
+#line 310 "pic.y"
+    {
 		  a_delete graphname;
-		  graphname = new char[strlen(yyvsp[0].str) + 1];
-		  strcpy(graphname, yyvsp[0].str);
-		  a_delete yyvsp[0].str;
-		}
-break;
-case 11:
-#line 316 "pic.y"
-	{
-		  define_variable(yyvsp[-2].str, yyvsp[0].x);
-		  a_delete yyvsp[-2].str;
+		  graphname = new char[strlen((yyvsp[(3) - (3)].str)) + 1];
+		  strcpy(graphname, (yyvsp[(3) - (3)].str));
+		  a_delete (yyvsp[(3) - (3)].str);
 		}
-break;
-case 12:
-#line 321 "pic.y"
-	{
-		  place *p = lookup_label(yyvsp[-3].str);
+    break;
+
+  case 12:
+
+/* Line 1455 of yacc.c  */
+#line 318 "pic.y"
+    {
+		  define_variable((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].x));
+		  a_delete (yyvsp[(1) - (3)].str);
+		}
+    break;
+
+  case 13:
+
+/* Line 1455 of yacc.c  */
+#line 323 "pic.y"
+    {
+		  place *p = lookup_label((yyvsp[(1) - (4)].str));
 		  if (!p) {
-		    lex_error("variable `%1' not defined", yyvsp[-3].str);
+		    lex_error("variable `%1' not defined", (yyvsp[(1) - (4)].str));
 		    YYABORT;
 		  }
 		  p->obj = 0;
-		  p->x = yyvsp[0].x;
+		  p->x = (yyvsp[(4) - (4)].x);
 		  p->y = 0.0;
-		  a_delete yyvsp[-3].str;
+		  a_delete (yyvsp[(1) - (4)].str);
 		}
-break;
-case 13:
-#line 333 "pic.y"
-	{ current_direction = UP_DIRECTION; }
-break;
-case 14:
+    break;
+
+  case 14:
+
+/* Line 1455 of yacc.c  */
 #line 335 "pic.y"
-	{ current_direction = DOWN_DIRECTION; }
-break;
-case 15:
+    { current_direction = UP_DIRECTION; }
+    break;
+
+  case 15:
+
+/* Line 1455 of yacc.c  */
 #line 337 "pic.y"
-	{ current_direction = LEFT_DIRECTION; }
-break;
-case 16:
+    { current_direction = DOWN_DIRECTION; }
+    break;
+
+  case 16:
+
+/* Line 1455 of yacc.c  */
 #line 339 "pic.y"
-	{ current_direction = RIGHT_DIRECTION; }
-break;
-case 17:
+    { current_direction = LEFT_DIRECTION; }
+    break;
+
+  case 17:
+
+/* Line 1455 of yacc.c  */
 #line 341 "pic.y"
-	{
-		  olist.append(make_command_object(yyvsp[0].lstr.str, yyvsp[0].lstr.filename,
-						   yyvsp[0].lstr.lineno));
+    { current_direction = RIGHT_DIRECTION; }
+    break;
+
+  case 18:
+
+/* Line 1455 of yacc.c  */
+#line 343 "pic.y"
+    {
+		  olist.append(make_command_object((yyvsp[(1) - (1)].lstr).str, (yyvsp[(1) - (1)].lstr).filename,
+						   (yyvsp[(1) - (1)].lstr).lineno));
 		}
-break;
-case 18:
-#line 346 "pic.y"
-	{
-		  olist.append(make_command_object(yyvsp[0].lstr.str, yyvsp[0].lstr.filename,
-						   yyvsp[0].lstr.lineno));
+    break;
+
+  case 19:
+
+/* Line 1455 of yacc.c  */
+#line 348 "pic.y"
+    {
+		  olist.append(make_command_object((yyvsp[(2) - (2)].lstr).str, (yyvsp[(2) - (2)].lstr).filename,
+						   (yyvsp[(2) - (2)].lstr).lineno));
 		}
-break;
-case 19:
-#line 351 "pic.y"
-	{
-		  fprintf(stderr, "%s\n", yyvsp[0].lstr.str);
-		  a_delete yyvsp[0].lstr.str;
-		  fflush(stderr);
+    break;
+
+  case 20:
+
+/* Line 1455 of yacc.c  */
+#line 353 "pic.y"
+    {
+		  fprintf(stderr, "%s\n", (yyvsp[(2) - (2)].lstr).str);
+		  a_delete (yyvsp[(2) - (2)].lstr).str;
+		  fflush(stderr);
 		}
-break;
-case 20:
-#line 357 "pic.y"
-	{ delim_flag = 1; }
-break;
-case 21:
+    break;
+
+  case 21:
+
+/* Line 1455 of yacc.c  */
 #line 359 "pic.y"
-	{
+    { delim_flag = 1; }
+    break;
+
+  case 22:
+
+/* Line 1455 of yacc.c  */
+#line 361 "pic.y"
+    {
 		  delim_flag = 0;
 		  if (safer_flag)
-		    lex_error("unsafe to run command `%1'", yyvsp[0].str);
+		    lex_error("unsafe to run command `%1'", (yyvsp[(3) - (3)].str));
 		  else
-		    system(yyvsp[0].str);
-		  a_delete yyvsp[0].str;
+		    system((yyvsp[(3) - (3)].str));
+		  a_delete (yyvsp[(3) - (3)].str);
 		}
-break;
-case 22:
-#line 368 "pic.y"
-	{
+    break;
+
+  case 23:
+
+/* Line 1455 of yacc.c  */
+#line 370 "pic.y"
+    {
 		  if (yychar < 0)
 		    do_lookahead();
-		  do_copy(yyvsp[0].lstr.str);
-		  /* do not delete the filename*/
+		  do_copy((yyvsp[(2) - (2)].lstr).str);
+		  // do not delete the filename
 		}
-break;
-case 23:
-#line 375 "pic.y"
-	{ delim_flag = 2; }
-break;
-case 24:
+    break;
+
+  case 24:
+
+/* Line 1455 of yacc.c  */
 #line 377 "pic.y"
-	{ delim_flag = 0; }
-break;
-case 25:
+    { delim_flag = 2; }
+    break;
+
+  case 25:
+
+/* Line 1455 of yacc.c  */
 #line 379 "pic.y"
-	{
+    { delim_flag = 0; }
+    break;
+
+  case 26:
+
+/* Line 1455 of yacc.c  */
+#line 381 "pic.y"
+    {
 		  if (yychar < 0)
 		    do_lookahead();
-		  copy_file_thru(yyvsp[-5].lstr.str, yyvsp[-2].str, yyvsp[0].str);
-		  /* do not delete the filename*/
-		  a_delete yyvsp[-2].str;
-		  a_delete yyvsp[0].str;
-		}
-break;
-case 26:
-#line 388 "pic.y"
-	{ delim_flag = 2; }
-break;
-case 27:
+		  copy_file_thru((yyvsp[(2) - (7)].lstr).str, (yyvsp[(5) - (7)].str), (yyvsp[(7) - (7)].str));
+		  // do not delete the filename
+		  a_delete (yyvsp[(5) - (7)].str);
+		  a_delete (yyvsp[(7) - (7)].str);
+		}
+    break;
+
+  case 27:
+
+/* Line 1455 of yacc.c  */
 #line 390 "pic.y"
-	{ delim_flag = 0; }
-break;
-case 28:
+    { delim_flag = 2; }
+    break;
+
+  case 28:
+
+/* Line 1455 of yacc.c  */
 #line 392 "pic.y"
-	{
+    { delim_flag = 0; }
+    break;
+
+  case 29:
+
+/* Line 1455 of yacc.c  */
+#line 394 "pic.y"
+    {
 		  if (yychar < 0)
 		    do_lookahead();
-		  copy_rest_thru(yyvsp[-2].str, yyvsp[0].str);
-		  a_delete yyvsp[-2].str;
-		  a_delete yyvsp[0].str;
-		}
-break;
-case 29:
-#line 400 "pic.y"
-	{ delim_flag = 1; }
-break;
-case 30:
+		  copy_rest_thru((yyvsp[(4) - (6)].str), (yyvsp[(6) - (6)].str));
+		  a_delete (yyvsp[(4) - (6)].str);
+		  a_delete (yyvsp[(6) - (6)].str);
+		}
+    break;
+
+  case 30:
+
+/* Line 1455 of yacc.c  */
 #line 402 "pic.y"
-	{
+    { delim_flag = 1; }
+    break;
+
+  case 31:
+
+/* Line 1455 of yacc.c  */
+#line 404 "pic.y"
+    {
 		  delim_flag = 0;
 		  if (yychar < 0)
 		    do_lookahead();
-		  do_for(yyvsp[-8].str, yyvsp[-6].x, yyvsp[-4].x, yyvsp[-3].by.is_multiplicative, yyvsp[-3].by.val, yyvsp[0].str); 
+		  do_for((yyvsp[(2) - (10)].str), (yyvsp[(4) - (10)].x), (yyvsp[(6) - (10)].x), (yyvsp[(7) - (10)].by).is_multiplicative, (yyvsp[(7) - (10)].by).val, (yyvsp[(10) - (10)].str)); 
 		}
-break;
-case 31:
-#line 409 "pic.y"
-	{
+    break;
+
+  case 32:
+
+/* Line 1455 of yacc.c  */
+#line 411 "pic.y"
+    {
 		  if (yychar < 0)
 		    do_lookahead();
-		  if (yyvsp[0].if_data.x != 0.0)
-		    push_body(yyvsp[0].if_data.body);
-		  a_delete yyvsp[0].if_data.body;
-		}
-break;
-case 32:
-#line 417 "pic.y"
-	{ delim_flag = 1; }
-break;
-case 33:
+		  if ((yyvsp[(1) - (1)].if_data).x != 0.0)
+		    push_body((yyvsp[(1) - (1)].if_data).body);
+		  a_delete (yyvsp[(1) - (1)].if_data).body;
+		}
+    break;
+
+  case 33:
+
+/* Line 1455 of yacc.c  */
 #line 419 "pic.y"
-	{
+    { delim_flag = 1; }
+    break;
+
+  case 34:
+
+/* Line 1455 of yacc.c  */
+#line 421 "pic.y"
+    {
 		  delim_flag = 0;
 		  if (yychar < 0)
 		    do_lookahead();
-		  if (yyvsp[-3].if_data.x != 0.0)
-		    push_body(yyvsp[-3].if_data.body);
+		  if ((yyvsp[(1) - (4)].if_data).x != 0.0)
+		    push_body((yyvsp[(1) - (4)].if_data).body);
 		  else
-		    push_body(yyvsp[0].str);
-		  a_delete yyvsp[-3].if_data.body;
-		  a_delete yyvsp[0].str;
-		}
-break;
-case 35:
-#line 432 "pic.y"
-	{ define_variable("scale", 1.0); }
-break;
-case 38:
-#line 442 "pic.y"
-	{
-		  reset(yyvsp[0].str);
-		  a_delete yyvsp[0].str;
+		    push_body((yyvsp[(4) - (4)].str));
+		  a_delete (yyvsp[(1) - (4)].if_data).body;
+		  a_delete (yyvsp[(4) - (4)].str);
 		}
-break;
-case 39:
-#line 447 "pic.y"
-	{
-		  reset(yyvsp[0].str);
-		  a_delete yyvsp[0].str;
+    break;
+
+  case 36:
+
+/* Line 1455 of yacc.c  */
+#line 434 "pic.y"
+    { define_variable("scale", 1.0); }
+    break;
+
+  case 39:
+
+/* Line 1455 of yacc.c  */
+#line 444 "pic.y"
+    {
+		  reset((yyvsp[(2) - (2)].str));
+		  a_delete (yyvsp[(2) - (2)].str);
 		}
-break;
-case 40:
-#line 452 "pic.y"
-	{
-		  reset(yyvsp[0].str);
-		  a_delete yyvsp[0].str;
+    break;
+
+  case 40:
+
+/* Line 1455 of yacc.c  */
+#line 449 "pic.y"
+    {
+		  reset((yyvsp[(2) - (2)].str));
+		  a_delete (yyvsp[(2) - (2)].str);
+		}
+    break;
+
+  case 41:
+
+/* Line 1455 of yacc.c  */
+#line 454 "pic.y"
+    {
+		  reset((yyvsp[(3) - (3)].str));
+		  a_delete (yyvsp[(3) - (3)].str);
 		}
-break;
-case 41:
-#line 460 "pic.y"
-	{ yyval.lstr = yyvsp[0].lstr; }
-break;
-case 42:
+    break;
+
+  case 42:
+
+/* Line 1455 of yacc.c  */
 #line 462 "pic.y"
-	{
-		  yyval.lstr.str = new char[strlen(yyvsp[-1].lstr.str) + strlen(yyvsp[0].lstr.str) + 1];
-		  strcpy(yyval.lstr.str, yyvsp[-1].lstr.str);
-		  strcat(yyval.lstr.str, yyvsp[0].lstr.str);
-		  a_delete yyvsp[-1].lstr.str;
-		  a_delete yyvsp[0].lstr.str;
-		  if (yyvsp[-1].lstr.filename) {
-		    yyval.lstr.filename = yyvsp[-1].lstr.filename;
-		    yyval.lstr.lineno = yyvsp[-1].lstr.lineno;
+    { (yyval.lstr) = (yyvsp[(1) - (1)].lstr); }
+    break;
+
+  case 43:
+
+/* Line 1455 of yacc.c  */
+#line 464 "pic.y"
+    {
+		  (yyval.lstr).str = new char[strlen((yyvsp[(1) - (2)].lstr).str) + strlen((yyvsp[(2) - (2)].lstr).str) + 1];
+		  strcpy((yyval.lstr).str, (yyvsp[(1) - (2)].lstr).str);
+		  strcat((yyval.lstr).str, (yyvsp[(2) - (2)].lstr).str);
+		  a_delete (yyvsp[(1) - (2)].lstr).str;
+		  a_delete (yyvsp[(2) - (2)].lstr).str;
+		  if ((yyvsp[(1) - (2)].lstr).filename) {
+		    (yyval.lstr).filename = (yyvsp[(1) - (2)].lstr).filename;
+		    (yyval.lstr).lineno = (yyvsp[(1) - (2)].lstr).lineno;
 		  }
-		  else if (yyvsp[0].lstr.filename) {
-		    yyval.lstr.filename = yyvsp[0].lstr.filename;
-		    yyval.lstr.lineno = yyvsp[0].lstr.lineno;
+		  else if ((yyvsp[(2) - (2)].lstr).filename) {
+		    (yyval.lstr).filename = (yyvsp[(2) - (2)].lstr).filename;
+		    (yyval.lstr).lineno = (yyvsp[(2) - (2)].lstr).lineno;
 		  }
 		}
-break;
-case 43:
-#line 481 "pic.y"
-	{
-		  yyval.lstr.str = new char[GDIGITS + 1];
-		  sprintf(yyval.lstr.str, "%g", yyvsp[0].x);
-		  yyval.lstr.filename = 0;
-		  yyval.lstr.lineno = 0;
-		}
-break;
-case 44:
-#line 488 "pic.y"
-	{ yyval.lstr = yyvsp[0].lstr; }
-break;
-case 45:
+    break;
+
+  case 44:
+
+/* Line 1455 of yacc.c  */
+#line 483 "pic.y"
+    {
+		  (yyval.lstr).str = new char[GDIGITS + 1];
+		  sprintf((yyval.lstr).str, "%g", (yyvsp[(1) - (1)].x));
+		  (yyval.lstr).filename = 0;
+		  (yyval.lstr).lineno = 0;
+		}
+    break;
+
+  case 45:
+
+/* Line 1455 of yacc.c  */
 #line 490 "pic.y"
-	{
-		  yyval.lstr.str = new char[GDIGITS + 2 + GDIGITS + 1];
-		  sprintf(yyval.lstr.str, "%g, %g", yyvsp[0].pair.x, yyvsp[0].pair.y);
-		  yyval.lstr.filename = 0;
-		  yyval.lstr.lineno = 0;
-		}
-break;
-case 46:
-#line 500 "pic.y"
-	{ delim_flag = 1; }
-break;
-case 47:
+    { (yyval.lstr) = (yyvsp[(1) - (1)].lstr); }
+    break;
+
+  case 46:
+
+/* Line 1455 of yacc.c  */
+#line 492 "pic.y"
+    {
+		  (yyval.lstr).str = new char[GDIGITS + 2 + GDIGITS + 1];
+		  sprintf((yyval.lstr).str, "%g, %g", (yyvsp[(1) - (1)].pair).x, (yyvsp[(1) - (1)].pair).y);
+		  (yyval.lstr).filename = 0;
+		  (yyval.lstr).lineno = 0;
+		}
+    break;
+
+  case 47:
+
+/* Line 1455 of yacc.c  */
 #line 502 "pic.y"
-	{
+    { delim_flag = 1; }
+    break;
+
+  case 48:
+
+/* Line 1455 of yacc.c  */
+#line 504 "pic.y"
+    {
 		  delim_flag = 0;
-		  yyval.if_data.x = yyvsp[-3].x;
-		  yyval.if_data.body = yyvsp[0].str;
+		  (yyval.if_data).x = (yyvsp[(2) - (5)].x);
+		  (yyval.if_data).body = (yyvsp[(5) - (5)].str);
 		}
-break;
-case 48:
-#line 511 "pic.y"
-	{ yyval.str = 0; }
-break;
-case 49:
+    break;
+
+  case 49:
+
+/* Line 1455 of yacc.c  */
 #line 513 "pic.y"
-	{ yyval.str = yyvsp[0].lstr.str; }
-break;
-case 50:
-#line 518 "pic.y"
-	{ yyval.x = yyvsp[0].x; }
-break;
-case 51:
+    { (yyval.str) = 0; }
+    break;
+
+  case 50:
+
+/* Line 1455 of yacc.c  */
+#line 515 "pic.y"
+    { (yyval.str) = (yyvsp[(2) - (2)].lstr).str; }
+    break;
+
+  case 51:
+
+/* Line 1455 of yacc.c  */
 #line 520 "pic.y"
-	{ yyval.x = yyvsp[0].x; }
-break;
-case 52:
-#line 525 "pic.y"
-	{
-		  yyval.x = strcmp(yyvsp[-2].lstr.str, yyvsp[0].lstr.str) == 0;
-		  a_delete yyvsp[-2].lstr.str;
-		  a_delete yyvsp[0].lstr.str;
-		}
-break;
-case 53:
-#line 531 "pic.y"
-	{
-		  yyval.x = strcmp(yyvsp[-2].lstr.str, yyvsp[0].lstr.str) != 0;
-		  a_delete yyvsp[-2].lstr.str;
-		  a_delete yyvsp[0].lstr.str;
-		}
-break;
-case 54:
-#line 537 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
-break;
-case 55:
+    { (yyval.x) = (yyvsp[(1) - (1)].x); }
+    break;
+
+  case 52:
+
+/* Line 1455 of yacc.c  */
+#line 522 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (1)].x); }
+    break;
+
+  case 53:
+
+/* Line 1455 of yacc.c  */
+#line 527 "pic.y"
+    {
+		  (yyval.x) = strcmp((yyvsp[(1) - (3)].lstr).str, (yyvsp[(3) - (3)].lstr).str) == 0;
+		  a_delete (yyvsp[(1) - (3)].lstr).str;
+		  a_delete (yyvsp[(3) - (3)].lstr).str;
+		}
+    break;
+
+  case 54:
+
+/* Line 1455 of yacc.c  */
+#line 533 "pic.y"
+    {
+		  (yyval.x) = strcmp((yyvsp[(1) - (3)].lstr).str, (yyvsp[(3) - (3)].lstr).str) != 0;
+		  a_delete (yyvsp[(1) - (3)].lstr).str;
+		  a_delete (yyvsp[(3) - (3)].lstr).str;
+		}
+    break;
+
+  case 55:
+
+/* Line 1455 of yacc.c  */
 #line 539 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
-break;
-case 56:
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 && (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 56:
+
+/* Line 1455 of yacc.c  */
 #line 541 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
-break;
-case 57:
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 && (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 57:
+
+/* Line 1455 of yacc.c  */
 #line 543 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
-break;
-case 58:
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 && (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 58:
+
+/* Line 1455 of yacc.c  */
 #line 545 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
-break;
-case 59:
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 || (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 59:
+
+/* Line 1455 of yacc.c  */
 #line 547 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
-break;
-case 60:
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 || (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 60:
+
+/* Line 1455 of yacc.c  */
 #line 549 "pic.y"
-	{ yyval.x = (yyvsp[0].x == 0.0); }
-break;
-case 61:
-#line 555 "pic.y"
-	{
-		  yyval.by.val = 1.0;
-		  yyval.by.is_multiplicative = 0;
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 || (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 61:
+
+/* Line 1455 of yacc.c  */
+#line 551 "pic.y"
+    { (yyval.x) = ((yyvsp[(2) - (2)].x) == 0.0); }
+    break;
+
+  case 62:
+
+/* Line 1455 of yacc.c  */
+#line 557 "pic.y"
+    {
+		  (yyval.by).val = 1.0;
+		  (yyval.by).is_multiplicative = 0;
 		}
-break;
-case 62:
-#line 560 "pic.y"
-	{
-		  yyval.by.val = yyvsp[0].x;
-		  yyval.by.is_multiplicative = 0;
+    break;
+
+  case 63:
+
+/* Line 1455 of yacc.c  */
+#line 562 "pic.y"
+    {
+		  (yyval.by).val = (yyvsp[(2) - (2)].x);
+		  (yyval.by).is_multiplicative = 0;
 		}
-break;
-case 63:
-#line 565 "pic.y"
-	{
-		  yyval.by.val = yyvsp[0].x;
-		  yyval.by.is_multiplicative = 1;
+    break;
+
+  case 64:
+
+/* Line 1455 of yacc.c  */
+#line 567 "pic.y"
+    {
+		  (yyval.by).val = (yyvsp[(3) - (3)].x);
+		  (yyval.by).is_multiplicative = 1;
 		}
-break;
-case 64:
-#line 573 "pic.y"
-	{
-		  yyval.pl.obj = yyvsp[0].spec->make_object(&current_position,
+    break;
+
+  case 65:
+
+/* Line 1455 of yacc.c  */
+#line 575 "pic.y"
+    {
+		  (yyval.pl).obj = (yyvsp[(1) - (1)].spec)->make_object(&current_position,
 					   &current_direction);
-		  if (yyval.pl.obj == 0)
+		  if ((yyval.pl).obj == 0)
 		    YYABORT;
-		  delete yyvsp[0].spec;
-		  if (yyval.pl.obj)
-		    olist.append(yyval.pl.obj);
+		  delete (yyvsp[(1) - (1)].spec);
+		  if ((yyval.pl).obj)
+		    olist.append((yyval.pl).obj);
 		  else {
-		    yyval.pl.x = current_position.x;
-		    yyval.pl.y = current_position.y;
+		    (yyval.pl).x = current_position.x;
+		    (yyval.pl).y = current_position.y;
 		  }
 		}
-break;
-case 65:
-#line 587 "pic.y"
-	{
-		  yyval.pl = yyvsp[0].pl;
-		  define_label(yyvsp[-3].str, & yyval.pl);
-		  a_delete yyvsp[-3].str;
-		}
-break;
-case 66:
-#line 593 "pic.y"
-	{
-		  yyval.pl.obj = 0;
-		  yyval.pl.x = yyvsp[0].pair.x;
-		  yyval.pl.y = yyvsp[0].pair.y;
-		  define_label(yyvsp[-3].str, & yyval.pl);
-		  a_delete yyvsp[-3].str;
-		}
-break;
-case 67:
-#line 601 "pic.y"
-	{
-		  yyval.pl = yyvsp[0].pl;
-		  define_label(yyvsp[-3].str, & yyval.pl);
-		  a_delete yyvsp[-3].str;
-		}
-break;
-case 68:
-#line 607 "pic.y"
-	{
-		  yyval.state.x = current_position.x;
-		  yyval.state.y = current_position.y;
-		  yyval.state.dir = current_direction;
-		}
-break;
-case 69:
-#line 613 "pic.y"
-	{
-		  current_position.x = yyvsp[-2].state.x;
-		  current_position.y = yyvsp[-2].state.y;
-		  current_direction = yyvsp[-2].state.dir;
-		}
-break;
-case 70:
-#line 619 "pic.y"
-	{
-		  yyval.pl = yyvsp[-3].pl;
+    break;
+
+  case 66:
+
+/* Line 1455 of yacc.c  */
+#line 589 "pic.y"
+    {
+		  (yyval.pl) = (yyvsp[(4) - (4)].pl);
+		  define_label((yyvsp[(1) - (4)].str), & (yyval.pl));
+		  a_delete (yyvsp[(1) - (4)].str);
 		}
-break;
-case 71:
-#line 623 "pic.y"
-	{
-		  yyval.pl.obj = 0;
-		  yyval.pl.x = current_position.x;
-		  yyval.pl.y = current_position.y;
-		}
-break;
-case 72:
-#line 632 "pic.y"
-	{}
-break;
-case 73:
+    break;
+
+  case 67:
+
+/* Line 1455 of yacc.c  */
+#line 595 "pic.y"
+    {
+		  (yyval.pl).obj = 0;
+		  (yyval.pl).x = (yyvsp[(4) - (4)].pair).x;
+		  (yyval.pl).y = (yyvsp[(4) - (4)].pair).y;
+		  define_label((yyvsp[(1) - (4)].str), & (yyval.pl));
+		  a_delete (yyvsp[(1) - (4)].str);
+		}
+    break;
+
+  case 68:
+
+/* Line 1455 of yacc.c  */
+#line 603 "pic.y"
+    {
+		  (yyval.pl) = (yyvsp[(4) - (4)].pl);
+		  define_label((yyvsp[(1) - (4)].str), & (yyval.pl));
+		  a_delete (yyvsp[(1) - (4)].str);
+		}
+    break;
+
+  case 69:
+
+/* Line 1455 of yacc.c  */
+#line 609 "pic.y"
+    {
+		  (yyval.state).x = current_position.x;
+		  (yyval.state).y = current_position.y;
+		  (yyval.state).dir = current_direction;
+		}
+    break;
+
+  case 70:
+
+/* Line 1455 of yacc.c  */
+#line 615 "pic.y"
+    {
+		  current_position.x = (yyvsp[(2) - (4)].state).x;
+		  current_position.y = (yyvsp[(2) - (4)].state).y;
+		  current_direction = (yyvsp[(2) - (4)].state).dir;
+		}
+    break;
+
+  case 71:
+
+/* Line 1455 of yacc.c  */
+#line 621 "pic.y"
+    {
+		  (yyval.pl) = (yyvsp[(3) - (6)].pl);
+		}
+    break;
+
+  case 72:
+
+/* Line 1455 of yacc.c  */
+#line 625 "pic.y"
+    {
+		  (yyval.pl).obj = 0;
+		  (yyval.pl).x = current_position.x;
+		  (yyval.pl).y = current_position.y;
+		}
+    break;
+
+  case 73:
+
+/* Line 1455 of yacc.c  */
 #line 634 "pic.y"
-	{}
-break;
-case 74:
-#line 639 "pic.y"
-	{ yyval.spec = new object_spec(BOX_OBJECT); }
-break;
-case 75:
+    {}
+    break;
+
+  case 74:
+
+/* Line 1455 of yacc.c  */
+#line 636 "pic.y"
+    {}
+    break;
+
+  case 75:
+
+/* Line 1455 of yacc.c  */
 #line 641 "pic.y"
-	{ yyval.spec = new object_spec(CIRCLE_OBJECT); }
-break;
-case 76:
+    { (yyval.spec) = new object_spec(BOX_OBJECT); }
+    break;
+
+  case 76:
+
+/* Line 1455 of yacc.c  */
 #line 643 "pic.y"
-	{ yyval.spec = new object_spec(ELLIPSE_OBJECT); }
-break;
-case 77:
+    { (yyval.spec) = new object_spec(CIRCLE_OBJECT); }
+    break;
+
+  case 77:
+
+/* Line 1455 of yacc.c  */
 #line 645 "pic.y"
-	{
-		  yyval.spec = new object_spec(ARC_OBJECT);
-		  yyval.spec->dir = current_direction;
+    { (yyval.spec) = new object_spec(ELLIPSE_OBJECT); }
+    break;
+
+  case 78:
+
+/* Line 1455 of yacc.c  */
+#line 647 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(ARC_OBJECT);
+		  (yyval.spec)->dir = current_direction;
 		}
-break;
-case 78:
-#line 650 "pic.y"
-	{
-		  yyval.spec = new object_spec(LINE_OBJECT);
-		  lookup_variable("lineht", & yyval.spec->segment_height);
-		  lookup_variable("linewid", & yyval.spec->segment_width);
-		  yyval.spec->dir = current_direction;
-		}
-break;
-case 79:
-#line 657 "pic.y"
-	{
-		  yyval.spec = new object_spec(ARROW_OBJECT);
-		  lookup_variable("lineht", & yyval.spec->segment_height);
-		  lookup_variable("linewid", & yyval.spec->segment_width);
-		  yyval.spec->dir = current_direction;
-		}
-break;
-case 80:
-#line 664 "pic.y"
-	{
-		  yyval.spec = new object_spec(MOVE_OBJECT);
-		  lookup_variable("moveht", & yyval.spec->segment_height);
-		  lookup_variable("movewid", & yyval.spec->segment_width);
-		  yyval.spec->dir = current_direction;
-		}
-break;
-case 81:
-#line 671 "pic.y"
-	{
-		  yyval.spec = new object_spec(SPLINE_OBJECT);
-		  lookup_variable("lineht", & yyval.spec->segment_height);
-		  lookup_variable("linewid", & yyval.spec->segment_width);
-		  yyval.spec->dir = current_direction;
-		}
-break;
-case 82:
-#line 678 "pic.y"
-	{
-		  yyval.spec = new object_spec(TEXT_OBJECT);
-		  yyval.spec->text = new text_item(yyvsp[0].lstr.str, yyvsp[0].lstr.filename, yyvsp[0].lstr.lineno);
+    break;
+
+  case 79:
+
+/* Line 1455 of yacc.c  */
+#line 652 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(LINE_OBJECT);
+		  lookup_variable("lineht", & (yyval.spec)->segment_height);
+		  lookup_variable("linewid", & (yyval.spec)->segment_width);
+		  (yyval.spec)->dir = current_direction;
 		}
-break;
-case 83:
-#line 683 "pic.y"
-	{
-		  yyval.spec = new object_spec(TEXT_OBJECT);
-		  yyval.spec->text = new text_item(format_number(0, yyvsp[0].x), 0, -1);
+    break;
+
+  case 80:
+
+/* Line 1455 of yacc.c  */
+#line 659 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(ARROW_OBJECT);
+		  lookup_variable("lineht", & (yyval.spec)->segment_height);
+		  lookup_variable("linewid", & (yyval.spec)->segment_width);
+		  (yyval.spec)->dir = current_direction;
 		}
-break;
-case 84:
-#line 688 "pic.y"
-	{
-		  yyval.spec = new object_spec(TEXT_OBJECT);
-		  yyval.spec->text = new text_item(format_number(yyvsp[0].lstr.str, yyvsp[-1].x),
-					   yyvsp[0].lstr.filename, yyvsp[0].lstr.lineno);
-		  a_delete yyvsp[0].lstr.str;
-		}
-break;
-case 85:
-#line 695 "pic.y"
-	{
+    break;
+
+  case 81:
+
+/* Line 1455 of yacc.c  */
+#line 666 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(MOVE_OBJECT);
+		  lookup_variable("moveht", & (yyval.spec)->segment_height);
+		  lookup_variable("movewid", & (yyval.spec)->segment_width);
+		  (yyval.spec)->dir = current_direction;
+		}
+    break;
+
+  case 82:
+
+/* Line 1455 of yacc.c  */
+#line 673 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(SPLINE_OBJECT);
+		  lookup_variable("lineht", & (yyval.spec)->segment_height);
+		  lookup_variable("linewid", & (yyval.spec)->segment_width);
+		  (yyval.spec)->dir = current_direction;
+		}
+    break;
+
+  case 83:
+
+/* Line 1455 of yacc.c  */
+#line 680 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(TEXT_OBJECT);
+		  (yyval.spec)->text = new text_item((yyvsp[(1) - (1)].lstr).str, (yyvsp[(1) - (1)].lstr).filename, (yyvsp[(1) - (1)].lstr).lineno);
+		}
+    break;
+
+  case 84:
+
+/* Line 1455 of yacc.c  */
+#line 685 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(TEXT_OBJECT);
+		  (yyval.spec)->text = new text_item(format_number(0, (yyvsp[(2) - (2)].x)), 0, -1);
+		}
+    break;
+
+  case 85:
+
+/* Line 1455 of yacc.c  */
+#line 690 "pic.y"
+    {
+		  (yyval.spec) = new object_spec(TEXT_OBJECT);
+		  (yyval.spec)->text = new text_item(format_number((yyvsp[(3) - (3)].lstr).str, (yyvsp[(2) - (3)].x)),
+					   (yyvsp[(3) - (3)].lstr).filename, (yyvsp[(3) - (3)].lstr).lineno);
+		  a_delete (yyvsp[(3) - (3)].lstr).str;
+		}
+    break;
+
+  case 86:
+
+/* Line 1455 of yacc.c  */
+#line 697 "pic.y"
+    {
 		  saved_state *p = new saved_state;
-		  yyval.pstate = p;
+		  (yyval.pstate) = p;
 		  p->x = current_position.x;
 		  p->y = current_position.y;
 		  p->dir = current_direction;
@@ -4624,1089 +3229,1551 @@
 		  current_saved_state = p;
 		  olist.append(make_mark_object());
 		}
-break;
-case 86:
-#line 710 "pic.y"
-	{
-		  current_position.x = yyvsp[-2].pstate->x;
-		  current_position.y = yyvsp[-2].pstate->y;
-		  current_direction = yyvsp[-2].pstate->dir;
-		  yyval.spec = new object_spec(BLOCK_OBJECT);
-		  olist.wrap_up_block(& yyval.spec->oblist);
-		  yyval.spec->tbl = current_table;
-		  current_table = yyvsp[-2].pstate->tbl;
-		  current_saved_state = yyvsp[-2].pstate->prev;
-		  delete yyvsp[-2].pstate;
-		}
-break;
-case 87:
-#line 722 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->height = yyvsp[0].x;
-		  yyval.spec->flags |= HAS_HEIGHT;
-		}
-break;
-case 88:
-#line 728 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->radius = yyvsp[0].x;
-		  yyval.spec->flags |= HAS_RADIUS;
-		}
-break;
-case 89:
-#line 734 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->width = yyvsp[0].x;
-		  yyval.spec->flags |= HAS_WIDTH;
-		}
-break;
-case 90:
-#line 740 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->radius = yyvsp[0].x/2.0;
-		  yyval.spec->flags |= HAS_RADIUS;
-		}
-break;
-case 91:
-#line 746 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  switch (yyval.spec->dir) {
+    break;
+
+  case 87:
+
+/* Line 1455 of yacc.c  */
+#line 712 "pic.y"
+    {
+		  current_position.x = (yyvsp[(2) - (4)].pstate)->x;
+		  current_position.y = (yyvsp[(2) - (4)].pstate)->y;
+		  current_direction = (yyvsp[(2) - (4)].pstate)->dir;
+		  (yyval.spec) = new object_spec(BLOCK_OBJECT);
+		  olist.wrap_up_block(& (yyval.spec)->oblist);
+		  (yyval.spec)->tbl = current_table;
+		  current_table = (yyvsp[(2) - (4)].pstate)->tbl;
+		  current_saved_state = (yyvsp[(2) - (4)].pstate)->prev;
+		  delete (yyvsp[(2) - (4)].pstate);
+		}
+    break;
+
+  case 88:
+
+/* Line 1455 of yacc.c  */
+#line 724 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->height = (yyvsp[(3) - (3)].x);
+		  (yyval.spec)->flags |= HAS_HEIGHT;
+		}
+    break;
+
+  case 89:
+
+/* Line 1455 of yacc.c  */
+#line 730 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->radius = (yyvsp[(3) - (3)].x);
+		  (yyval.spec)->flags |= HAS_RADIUS;
+		}
+    break;
+
+  case 90:
+
+/* Line 1455 of yacc.c  */
+#line 736 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->width = (yyvsp[(3) - (3)].x);
+		  (yyval.spec)->flags |= HAS_WIDTH;
+		}
+    break;
+
+  case 91:
+
+/* Line 1455 of yacc.c  */
+#line 742 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->radius = (yyvsp[(3) - (3)].x)/2.0;
+		  (yyval.spec)->flags |= HAS_RADIUS;
+		}
+    break;
+
+  case 92:
+
+/* Line 1455 of yacc.c  */
+#line 748 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  switch ((yyval.spec)->dir) {
 		  case UP_DIRECTION:
-		    yyval.spec->segment_pos.y += yyvsp[0].x;
+		    (yyval.spec)->segment_pos.y += (yyvsp[(2) - (2)].x);
 		    break;
 		  case DOWN_DIRECTION:
-		    yyval.spec->segment_pos.y -= yyvsp[0].x;
+		    (yyval.spec)->segment_pos.y -= (yyvsp[(2) - (2)].x);
 		    break;
 		  case RIGHT_DIRECTION:
-		    yyval.spec->segment_pos.x += yyvsp[0].x;
+		    (yyval.spec)->segment_pos.x += (yyvsp[(2) - (2)].x);
 		    break;
 		  case LEFT_DIRECTION:
-		    yyval.spec->segment_pos.x -= yyvsp[0].x;
+		    (yyval.spec)->segment_pos.x -= (yyvsp[(2) - (2)].x);
 		    break;
 		  }
 		}
-break;
-case 92:
-#line 765 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->dir = UP_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.y += yyval.spec->segment_height;
-		}
-break;
-case 93:
-#line 772 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->dir = UP_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.y += yyvsp[0].x;
-		}
-break;
-case 94:
-#line 779 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->dir = DOWN_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.y -= yyval.spec->segment_height;
-		}
-break;
-case 95:
-#line 786 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->dir = DOWN_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.y -= yyvsp[0].x;
-		}
-break;
-case 96:
-#line 793 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->dir = RIGHT_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.x += yyval.spec->segment_width;
-		}
-break;
-case 97:
-#line 800 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->dir = RIGHT_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.x += yyvsp[0].x;
-		}
-break;
-case 98:
-#line 807 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->dir = LEFT_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.x -= yyval.spec->segment_width;
-		}
-break;
-case 99:
-#line 814 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->dir = LEFT_DIRECTION;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.x -= yyvsp[0].x;
-		}
-break;
-case 100:
-#line 821 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= HAS_FROM;
-		  yyval.spec->from.x = yyvsp[0].pair.x;
-		  yyval.spec->from.y = yyvsp[0].pair.y;
-		}
-break;
-case 101:
-#line 828 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  if (yyval.spec->flags & HAS_SEGMENT)
-		    yyval.spec->segment_list = new segment(yyval.spec->segment_pos,
-						   yyval.spec->segment_is_absolute,
-						   yyval.spec->segment_list);
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.x = yyvsp[0].pair.x;
-		  yyval.spec->segment_pos.y = yyvsp[0].pair.y;
-		  yyval.spec->segment_is_absolute = 1;
-		  yyval.spec->flags |= HAS_TO;
-		  yyval.spec->to.x = yyvsp[0].pair.x;
-		  yyval.spec->to.y = yyvsp[0].pair.y;
-		}
-break;
-case 102:
-#line 843 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= HAS_AT;
-		  yyval.spec->at.x = yyvsp[0].pair.x;
-		  yyval.spec->at.y = yyvsp[0].pair.y;
-		  if (yyval.spec->type != ARC_OBJECT) {
-		    yyval.spec->flags |= HAS_FROM;
-		    yyval.spec->from.x = yyvsp[0].pair.x;
-		    yyval.spec->from.y = yyvsp[0].pair.y;
+    break;
+
+  case 93:
+
+/* Line 1455 of yacc.c  */
+#line 767 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->dir = UP_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.y += (yyval.spec)->segment_height;
+		}
+    break;
+
+  case 94:
+
+/* Line 1455 of yacc.c  */
+#line 774 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->dir = UP_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.y += (yyvsp[(3) - (3)].x);
+		}
+    break;
+
+  case 95:
+
+/* Line 1455 of yacc.c  */
+#line 781 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->dir = DOWN_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.y -= (yyval.spec)->segment_height;
+		}
+    break;
+
+  case 96:
+
+/* Line 1455 of yacc.c  */
+#line 788 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->dir = DOWN_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.y -= (yyvsp[(3) - (3)].x);
+		}
+    break;
+
+  case 97:
+
+/* Line 1455 of yacc.c  */
+#line 795 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->dir = RIGHT_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x += (yyval.spec)->segment_width;
+		}
+    break;
+
+  case 98:
+
+/* Line 1455 of yacc.c  */
+#line 802 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->dir = RIGHT_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x += (yyvsp[(3) - (3)].x);
+		}
+    break;
+
+  case 99:
+
+/* Line 1455 of yacc.c  */
+#line 809 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->dir = LEFT_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x -= (yyval.spec)->segment_width;
+		}
+    break;
+
+  case 100:
+
+/* Line 1455 of yacc.c  */
+#line 816 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->dir = LEFT_DIRECTION;
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x -= (yyvsp[(3) - (3)].x);
+		}
+    break;
+
+  case 101:
+
+/* Line 1455 of yacc.c  */
+#line 823 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= HAS_FROM;
+		  (yyval.spec)->from.x = (yyvsp[(3) - (3)].pair).x;
+		  (yyval.spec)->from.y = (yyvsp[(3) - (3)].pair).y;
+		}
+    break;
+
+  case 102:
+
+/* Line 1455 of yacc.c  */
+#line 830 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  if ((yyval.spec)->flags & HAS_SEGMENT)
+		    (yyval.spec)->segment_list = new segment((yyval.spec)->segment_pos,
+						   (yyval.spec)->segment_is_absolute,
+						   (yyval.spec)->segment_list);
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x = (yyvsp[(3) - (3)].pair).x;
+		  (yyval.spec)->segment_pos.y = (yyvsp[(3) - (3)].pair).y;
+		  (yyval.spec)->segment_is_absolute = 1;
+		  (yyval.spec)->flags |= HAS_TO;
+		  (yyval.spec)->to.x = (yyvsp[(3) - (3)].pair).x;
+		  (yyval.spec)->to.y = (yyvsp[(3) - (3)].pair).y;
+		}
+    break;
+
+  case 103:
+
+/* Line 1455 of yacc.c  */
+#line 845 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= HAS_AT;
+		  (yyval.spec)->at.x = (yyvsp[(3) - (3)].pair).x;
+		  (yyval.spec)->at.y = (yyvsp[(3) - (3)].pair).y;
+		  if ((yyval.spec)->type != ARC_OBJECT) {
+		    (yyval.spec)->flags |= HAS_FROM;
+		    (yyval.spec)->from.x = (yyvsp[(3) - (3)].pair).x;
+		    (yyval.spec)->from.y = (yyvsp[(3) - (3)].pair).y;
 		  }
 		}
-break;
-case 103:
-#line 855 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= HAS_WITH;
-		  yyval.spec->with = yyvsp[0].pth;
-		}
-break;
-case 104:
-#line 861 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= HAS_WITH;
+    break;
+
+  case 104:
+
+/* Line 1455 of yacc.c  */
+#line 857 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= HAS_WITH;
+		  (yyval.spec)->with = (yyvsp[(3) - (3)].pth);
+		}
+    break;
+
+  case 105:
+
+/* Line 1455 of yacc.c  */
+#line 863 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= HAS_WITH;
 		  position pos;
-		  pos.x = yyvsp[0].pair.x;
-		  pos.y = yyvsp[0].pair.y;
-		  yyval.spec->with = new path(pos);
-		}
-break;
-case 105:
-#line 870 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= HAS_SEGMENT;
-		  yyval.spec->segment_pos.x += yyvsp[0].pair.x;
-		  yyval.spec->segment_pos.y += yyvsp[0].pair.y;
-		}
-break;
-case 106:
-#line 877 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  if (!(yyval.spec->flags & HAS_SEGMENT))
-		    switch (yyval.spec->dir) {
+		  pos.x = (yyvsp[(3) - (3)].pair).x;
+		  pos.y = (yyvsp[(3) - (3)].pair).y;
+		  (yyval.spec)->with = new path(pos);
+		}
+    break;
+
+  case 106:
+
+/* Line 1455 of yacc.c  */
+#line 872 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x += (yyvsp[(3) - (3)].pair).x;
+		  (yyval.spec)->segment_pos.y += (yyvsp[(3) - (3)].pair).y;
+		}
+    break;
+
+  case 107:
+
+/* Line 1455 of yacc.c  */
+#line 879 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  if (!((yyval.spec)->flags & HAS_SEGMENT))
+		    switch ((yyval.spec)->dir) {
 		    case UP_DIRECTION:
-		      yyval.spec->segment_pos.y += yyval.spec->segment_width;
+		      (yyval.spec)->segment_pos.y += (yyval.spec)->segment_width;
 		      break;
 		    case DOWN_DIRECTION:
-		      yyval.spec->segment_pos.y -= yyval.spec->segment_width;
+		      (yyval.spec)->segment_pos.y -= (yyval.spec)->segment_width;
 		      break;
 		    case RIGHT_DIRECTION:
-		      yyval.spec->segment_pos.x += yyval.spec->segment_width;
+		      (yyval.spec)->segment_pos.x += (yyval.spec)->segment_width;
 		      break;
 		    case LEFT_DIRECTION:
-		      yyval.spec->segment_pos.x -= yyval.spec->segment_width;
+		      (yyval.spec)->segment_pos.x -= (yyval.spec)->segment_width;
 		      break;
 		    }
-		  yyval.spec->segment_list = new segment(yyval.spec->segment_pos,
-						 yyval.spec->segment_is_absolute,
-						 yyval.spec->segment_list);
-		  yyval.spec->flags &= ~HAS_SEGMENT;
-		  yyval.spec->segment_pos.x = yyval.spec->segment_pos.y = 0.0;
-		  yyval.spec->segment_is_absolute = 0;
-		}
-break;
-case 107:
-#line 902 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;	/* nothing*/
+		  (yyval.spec)->segment_list = new segment((yyval.spec)->segment_pos,
+						 (yyval.spec)->segment_is_absolute,
+						 (yyval.spec)->segment_list);
+		  (yyval.spec)->flags &= ~HAS_SEGMENT;
+		  (yyval.spec)->segment_pos.x = (yyval.spec)->segment_pos.y = 0.0;
+		  (yyval.spec)->segment_is_absolute = 0;
 		}
-break;
-case 108:
-#line 906 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_DOTTED;
-		  lookup_variable("dashwid", & yyval.spec->dash_width);
-		}
-break;
-case 109:
-#line 912 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= IS_DOTTED;
-		  yyval.spec->dash_width = yyvsp[0].x;
-		}
-break;
-case 110:
-#line 918 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_DASHED;
-		  lookup_variable("dashwid", & yyval.spec->dash_width);
-		}
-break;
-case 111:
-#line 924 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= IS_DASHED;
-		  yyval.spec->dash_width = yyvsp[0].x;
-		}
-break;
-case 112:
-#line 930 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_DEFAULT_FILLED;
+    break;
+
+  case 108:
+
+/* Line 1455 of yacc.c  */
+#line 904 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);	// nothing
 		}
-break;
-case 113:
-#line 935 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= IS_FILLED;
-		  yyval.spec->fill = yyvsp[0].x;
-		}
-break;
-case 114:
-#line 941 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= IS_XSLANTED;
-		  yyval.spec->xslanted = yyvsp[0].x;
-		}
-break;
-case 115:
-#line 947 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= IS_YSLANTED;
-		  yyval.spec->yslanted = yyvsp[0].x;
-		}
-break;
-case 116:
-#line 953 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= (IS_SHADED | IS_FILLED);
-		  yyval.spec->shaded = new char[strlen(yyvsp[0].lstr.str)+1];
-		  strcpy(yyval.spec->shaded, yyvsp[0].lstr.str);
-		}
-break;
-case 117:
-#line 960 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= (IS_SHADED | IS_OUTLINED | IS_FILLED);
-		  yyval.spec->shaded = new char[strlen(yyvsp[0].lstr.str)+1];
-		  strcpy(yyval.spec->shaded, yyvsp[0].lstr.str);
-		  yyval.spec->outlined = new char[strlen(yyvsp[0].lstr.str)+1];
-		  strcpy(yyval.spec->outlined, yyvsp[0].lstr.str);
-		}
-break;
-case 118:
-#line 969 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= IS_OUTLINED;
-		  yyval.spec->outlined = new char[strlen(yyvsp[0].lstr.str)+1];
-		  strcpy(yyval.spec->outlined, yyvsp[0].lstr.str);
-		}
-break;
-case 119:
-#line 976 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  /* line chop chop means line chop 0 chop 0*/
-		  if (yyval.spec->flags & IS_DEFAULT_CHOPPED) {
-		    yyval.spec->flags |= IS_CHOPPED;
-		    yyval.spec->flags &= ~IS_DEFAULT_CHOPPED;
-		    yyval.spec->start_chop = yyval.spec->end_chop = 0.0;
-		  }
-		  else if (yyval.spec->flags & IS_CHOPPED) {
-		    yyval.spec->end_chop = 0.0;
-		  }
-		  else {
-		    yyval.spec->flags |= IS_DEFAULT_CHOPPED;
-		  }
+    break;
+
+  case 109:
+
+/* Line 1455 of yacc.c  */
+#line 908 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_DOTTED;
+		  lookup_variable("dashwid", & (yyval.spec)->dash_width);
 		}
-break;
-case 120:
-#line 992 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  if (yyval.spec->flags & IS_DEFAULT_CHOPPED) {
-		    yyval.spec->flags |= IS_CHOPPED;
-		    yyval.spec->flags &= ~IS_DEFAULT_CHOPPED;
-		    yyval.spec->start_chop = 0.0;
-		    yyval.spec->end_chop = yyvsp[0].x;
-		  }
-		  else if (yyval.spec->flags & IS_CHOPPED) {
-		    yyval.spec->end_chop = yyvsp[0].x;
-		  }
-		  else {
-		    yyval.spec->start_chop = yyval.spec->end_chop = yyvsp[0].x;
-		    yyval.spec->flags |= IS_CHOPPED;
-		  }
+    break;
+
+  case 110:
+
+/* Line 1455 of yacc.c  */
+#line 914 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= IS_DOTTED;
+		  (yyval.spec)->dash_width = (yyvsp[(3) - (3)].x);
 		}
-break;
-case 121:
-#line 1009 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_SAME;
+    break;
+
+  case 111:
+
+/* Line 1455 of yacc.c  */
+#line 920 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_DASHED;
+		  lookup_variable("dashwid", & (yyval.spec)->dash_width);
 		}
-break;
-case 122:
-#line 1014 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_INVISIBLE;
+    break;
+
+  case 112:
+
+/* Line 1455 of yacc.c  */
+#line 926 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= IS_DASHED;
+		  (yyval.spec)->dash_width = (yyvsp[(3) - (3)].x);
 		}
-break;
-case 123:
-#line 1019 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= HAS_LEFT_ARROW_HEAD;
+    break;
+
+  case 113:
+
+/* Line 1455 of yacc.c  */
+#line 932 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_DEFAULT_FILLED;
 		}
-break;
-case 124:
-#line 1024 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= HAS_RIGHT_ARROW_HEAD;
+    break;
+
+  case 114:
+
+/* Line 1455 of yacc.c  */
+#line 937 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= IS_FILLED;
+		  (yyval.spec)->fill = (yyvsp[(3) - (3)].x);
 		}
-break;
-case 125:
-#line 1029 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD);
+    break;
+
+  case 115:
+
+/* Line 1455 of yacc.c  */
+#line 943 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= IS_XSLANTED;
+		  (yyval.spec)->xslanted = (yyvsp[(3) - (3)].x);
 		}
-break;
-case 126:
-#line 1034 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_CLOCKWISE;
+    break;
+
+  case 116:
+
+/* Line 1455 of yacc.c  */
+#line 949 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= IS_YSLANTED;
+		  (yyval.spec)->yslanted = (yyvsp[(3) - (3)].x);
 		}
-break;
-case 127:
-#line 1039 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags &= ~IS_CLOCKWISE;
+    break;
+
+  case 117:
+
+/* Line 1455 of yacc.c  */
+#line 955 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= (IS_SHADED | IS_FILLED);
+		  (yyval.spec)->shaded = new char[strlen((yyvsp[(3) - (3)].lstr).str)+1];
+		  strcpy((yyval.spec)->shaded, (yyvsp[(3) - (3)].lstr).str);
 		}
-break;
-case 128:
-#line 1044 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  text_item **p;
-		  for (p = & yyval.spec->text; *p; p = &(*p)->next)
-		    ;
-		  *p = new text_item(yyvsp[0].lstr.str, yyvsp[0].lstr.filename, yyvsp[0].lstr.lineno);
+    break;
+
+  case 118:
+
+/* Line 1455 of yacc.c  */
+#line 962 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= (IS_SHADED | IS_OUTLINED | IS_FILLED);
+		  (yyval.spec)->shaded = new char[strlen((yyvsp[(3) - (3)].lstr).str)+1];
+		  strcpy((yyval.spec)->shaded, (yyvsp[(3) - (3)].lstr).str);
+		  (yyval.spec)->outlined = new char[strlen((yyvsp[(3) - (3)].lstr).str)+1];
+		  strcpy((yyval.spec)->outlined, (yyvsp[(3) - (3)].lstr).str);
 		}
-break;
-case 129:
-#line 1052 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  if (yyval.spec->text) {
-		    text_item *p;
-		    for (p = yyval.spec->text; p->next; p = p->next)
-		      ;
-		    p->adj.h = LEFT_ADJUST;
-		  }
+    break;
+
+  case 119:
+
+/* Line 1455 of yacc.c  */
+#line 971 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= IS_OUTLINED;
+		  (yyval.spec)->outlined = new char[strlen((yyvsp[(3) - (3)].lstr).str)+1];
+		  strcpy((yyval.spec)->outlined, (yyvsp[(3) - (3)].lstr).str);
 		}
-break;
-case 130:
-#line 1062 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  if (yyval.spec->text) {
-		    text_item *p;
-		    for (p = yyval.spec->text; p->next; p = p->next)
-		      ;
-		    p->adj.h = RIGHT_ADJUST;
+    break;
+
+  case 120:
+
+/* Line 1455 of yacc.c  */
+#line 978 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  // line chop chop means line chop 0 chop 0
+		  if ((yyval.spec)->flags & IS_DEFAULT_CHOPPED) {
+		    (yyval.spec)->flags |= IS_CHOPPED;
+		    (yyval.spec)->flags &= ~IS_DEFAULT_CHOPPED;
+		    (yyval.spec)->start_chop = (yyval.spec)->end_chop = 0.0;
 		  }
-		}
-break;
-case 131:
-#line 1072 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  if (yyval.spec->text) {
-		    text_item *p;
-		    for (p = yyval.spec->text; p->next; p = p->next)
-		      ;
-		    p->adj.v = ABOVE_ADJUST;
+		  else if ((yyval.spec)->flags & IS_CHOPPED) {
+		    (yyval.spec)->end_chop = 0.0;
 		  }
-		}
-break;
-case 132:
-#line 1082 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  if (yyval.spec->text) {
-		    text_item *p;
-		    for (p = yyval.spec->text; p->next; p = p->next)
-		      ;
-		    p->adj.v = BELOW_ADJUST;
+		  else {
+		    (yyval.spec)->flags |= IS_DEFAULT_CHOPPED;
 		  }
 		}
-break;
-case 133:
-#line 1092 "pic.y"
-	{
-		  yyval.spec = yyvsp[-2].spec;
-		  yyval.spec->flags |= HAS_THICKNESS;
-		  yyval.spec->thickness = yyvsp[0].x;
-		}
-break;
-case 134:
-#line 1098 "pic.y"
-	{
-		  yyval.spec = yyvsp[-1].spec;
-		  yyval.spec->flags |= IS_ALIGNED;
+    break;
+
+  case 121:
+
+/* Line 1455 of yacc.c  */
+#line 994 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  if ((yyval.spec)->flags & IS_DEFAULT_CHOPPED) {
+		    (yyval.spec)->flags |= IS_CHOPPED;
+		    (yyval.spec)->flags &= ~IS_DEFAULT_CHOPPED;
+		    (yyval.spec)->start_chop = 0.0;
+		    (yyval.spec)->end_chop = (yyvsp[(3) - (3)].x);
+		  }
+		  else if ((yyval.spec)->flags & IS_CHOPPED) {
+		    (yyval.spec)->end_chop = (yyvsp[(3) - (3)].x);
+		  }
+		  else {
+		    (yyval.spec)->start_chop = (yyval.spec)->end_chop = (yyvsp[(3) - (3)].x);
+		    (yyval.spec)->flags |= IS_CHOPPED;
+		  }
+		}
+    break;
+
+  case 122:
+
+/* Line 1455 of yacc.c  */
+#line 1011 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_SAME;
+		}
+    break;
+
+  case 123:
+
+/* Line 1455 of yacc.c  */
+#line 1016 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_INVISIBLE;
+		}
+    break;
+
+  case 124:
+
+/* Line 1455 of yacc.c  */
+#line 1021 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= HAS_LEFT_ARROW_HEAD;
+		}
+    break;
+
+  case 125:
+
+/* Line 1455 of yacc.c  */
+#line 1026 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= HAS_RIGHT_ARROW_HEAD;
+		}
+    break;
+
+  case 126:
+
+/* Line 1455 of yacc.c  */
+#line 1031 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD);
+		}
+    break;
+
+  case 127:
+
+/* Line 1455 of yacc.c  */
+#line 1036 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_CLOCKWISE;
+		}
+    break;
+
+  case 128:
+
+/* Line 1455 of yacc.c  */
+#line 1041 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags &= ~IS_CLOCKWISE;
+		}
+    break;
+
+  case 129:
+
+/* Line 1455 of yacc.c  */
+#line 1046 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  text_item **p;
+		  for (p = & (yyval.spec)->text; *p; p = &(*p)->next)
+		    ;
+		  *p = new text_item((yyvsp[(2) - (2)].lstr).str, (yyvsp[(2) - (2)].lstr).filename, (yyvsp[(2) - (2)].lstr).lineno);
+		}
+    break;
+
+  case 130:
+
+/* Line 1455 of yacc.c  */
+#line 1054 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  if ((yyval.spec)->text) {
+		    text_item *p;
+		    for (p = (yyval.spec)->text; p->next; p = p->next)
+		      ;
+		    p->adj.h = LEFT_ADJUST;
+		  }
+		}
+    break;
+
+  case 131:
+
+/* Line 1455 of yacc.c  */
+#line 1064 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  if ((yyval.spec)->text) {
+		    text_item *p;
+		    for (p = (yyval.spec)->text; p->next; p = p->next)
+		      ;
+		    p->adj.h = RIGHT_ADJUST;
+		  }
+		}
+    break;
+
+  case 132:
+
+/* Line 1455 of yacc.c  */
+#line 1074 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  if ((yyval.spec)->text) {
+		    text_item *p;
+		    for (p = (yyval.spec)->text; p->next; p = p->next)
+		      ;
+		    p->adj.v = ABOVE_ADJUST;
+		  }
+		}
+    break;
+
+  case 133:
+
+/* Line 1455 of yacc.c  */
+#line 1084 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  if ((yyval.spec)->text) {
+		    text_item *p;
+		    for (p = (yyval.spec)->text; p->next; p = p->next)
+		      ;
+		    p->adj.v = BELOW_ADJUST;
+		  }
+		}
+    break;
+
+  case 134:
+
+/* Line 1455 of yacc.c  */
+#line 1094 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (3)].spec);
+		  (yyval.spec)->flags |= HAS_THICKNESS;
+		  (yyval.spec)->thickness = (yyvsp[(3) - (3)].x);
+		}
+    break;
+
+  case 135:
+
+/* Line 1455 of yacc.c  */
+#line 1100 "pic.y"
+    {
+		  (yyval.spec) = (yyvsp[(1) - (2)].spec);
+		  (yyval.spec)->flags |= IS_ALIGNED;
 		}
-break;
-case 135:
-#line 1106 "pic.y"
-	{ yyval.lstr = yyvsp[0].lstr; }
-break;
-case 136:
+    break;
+
+  case 136:
+
+/* Line 1455 of yacc.c  */
 #line 1108 "pic.y"
-	{
-		  yyval.lstr.filename = yyvsp[-2].lstr.filename;
-		  yyval.lstr.lineno = yyvsp[-2].lstr.lineno;
-		  yyval.lstr.str = do_sprintf(yyvsp[-2].lstr.str, yyvsp[-1].dv.v, yyvsp[-1].dv.nv);
-		  a_delete yyvsp[-1].dv.v;
-		  a_delete yyvsp[-2].lstr.str;
-		}
-break;
-case 137:
-#line 1119 "pic.y"
-	{
-		  yyval.dv.v = 0;
-		  yyval.dv.nv = 0;
-		  yyval.dv.maxv = 0;
-		}
-break;
-case 138:
-#line 1125 "pic.y"
-	{
-		  yyval.dv = yyvsp[-2].dv;
-		  if (yyval.dv.nv >= yyval.dv.maxv) {
-		    if (yyval.dv.nv == 0) {
-		      yyval.dv.v = new double[4];
-		      yyval.dv.maxv = 4;
+    { (yyval.lstr) = (yyvsp[(1) - (1)].lstr); }
+    break;
+
+  case 137:
+
+/* Line 1455 of yacc.c  */
+#line 1110 "pic.y"
+    {
+		  (yyval.lstr).filename = (yyvsp[(3) - (5)].lstr).filename;
+		  (yyval.lstr).lineno = (yyvsp[(3) - (5)].lstr).lineno;
+		  (yyval.lstr).str = do_sprintf((yyvsp[(3) - (5)].lstr).str, (yyvsp[(4) - (5)].dv).v, (yyvsp[(4) - (5)].dv).nv);
+		  a_delete (yyvsp[(4) - (5)].dv).v;
+		  a_delete (yyvsp[(3) - (5)].lstr).str;
+		}
+    break;
+
+  case 138:
+
+/* Line 1455 of yacc.c  */
+#line 1121 "pic.y"
+    {
+		  (yyval.dv).v = 0;
+		  (yyval.dv).nv = 0;
+		  (yyval.dv).maxv = 0;
+		}
+    break;
+
+  case 139:
+
+/* Line 1455 of yacc.c  */
+#line 1127 "pic.y"
+    {
+		  (yyval.dv) = (yyvsp[(1) - (3)].dv);
+		  if ((yyval.dv).nv >= (yyval.dv).maxv) {
+		    if ((yyval.dv).nv == 0) {
+		      (yyval.dv).v = new double[4];
+		      (yyval.dv).maxv = 4;
 		    }
 		    else {
-		      double *oldv = yyval.dv.v;
-		      yyval.dv.maxv *= 2;
+		      double *oldv = (yyval.dv).v;
+		      (yyval.dv).maxv *= 2;
 #if 0
-		      yyval.dv.v = new double[yyval.dv.maxv];
-		      memcpy(yyval.dv.v, oldv, yyval.dv.nv*sizeof(double));
+		      (yyval.dv).v = new double[(yyval.dv).maxv];
+		      memcpy((yyval.dv).v, oldv, (yyval.dv).nv*sizeof(double));
 #else
-		      /* workaround for bug in Compaq C++ V6.5-033*/
-		      /* for Compaq Tru64 UNIX V5.1A (Rev. 1885)*/
-		      double *foo = new double[yyval.dv.maxv];
-		      memcpy(foo, oldv, yyval.dv.nv*sizeof(double));
-		      yyval.dv.v = foo;
+		      // workaround for bug in Compaq C++ V6.5-033
+		      // for Compaq Tru64 UNIX V5.1A (Rev. 1885)
+		      double *foo = new double[(yyval.dv).maxv];
+		      memcpy(foo, oldv, (yyval.dv).nv*sizeof(double));
+		      (yyval.dv).v = foo;
 #endif
 		      a_delete oldv;
 		    }
 		  }
-		  yyval.dv.v[yyval.dv.nv] = yyvsp[0].x;
-		  yyval.dv.nv += 1;
+		  (yyval.dv).v[(yyval.dv).nv] = (yyvsp[(3) - (3)].x);
+		  (yyval.dv).nv += 1;
 		}
-break;
-case 139:
-#line 1155 "pic.y"
-	{ yyval.pair = yyvsp[0].pair; }
-break;
-case 140:
+    break;
+
+  case 140:
+
+/* Line 1455 of yacc.c  */
 #line 1157 "pic.y"
-	{
-		  position pos = yyvsp[0].pl;
-		  yyval.pair.x = pos.x;
-		  yyval.pair.y = pos.y;
-		}
-break;
-case 141:
-#line 1163 "pic.y"
-	{
-		  position pos = yyvsp[-1].pl;
-		  yyval.pair.x = pos.x;
-		  yyval.pair.y = pos.y;
-		}
-break;
-case 142:
-#line 1172 "pic.y"
-	{ yyval.pair = yyvsp[0].pair; }
-break;
-case 143:
+    { (yyval.pair) = (yyvsp[(1) - (1)].pair); }
+    break;
+
+  case 141:
+
+/* Line 1455 of yacc.c  */
+#line 1159 "pic.y"
+    {
+		  position pos = (yyvsp[(1) - (1)].pl);
+		  (yyval.pair).x = pos.x;
+		  (yyval.pair).y = pos.y;
+		}
+    break;
+
+  case 142:
+
+/* Line 1455 of yacc.c  */
+#line 1165 "pic.y"
+    {
+		  position pos = (yyvsp[(2) - (3)].pl);
+		  (yyval.pair).x = pos.x;
+		  (yyval.pair).y = pos.y;
+		}
+    break;
+
+  case 143:
+
+/* Line 1455 of yacc.c  */
 #line 1174 "pic.y"
-	{
-		  yyval.pair.x = yyvsp[-2].pair.x + yyvsp[0].pair.x;
-		  yyval.pair.y = yyvsp[-2].pair.y + yyvsp[0].pair.y;
+    { (yyval.pair) = (yyvsp[(1) - (1)].pair); }
+    break;
+
+  case 144:
+
+/* Line 1455 of yacc.c  */
+#line 1176 "pic.y"
+    {
+		  (yyval.pair).x = (yyvsp[(1) - (3)].pair).x + (yyvsp[(3) - (3)].pair).x;
+		  (yyval.pair).y = (yyvsp[(1) - (3)].pair).y + (yyvsp[(3) - (3)].pair).y;
 		}
-break;
-case 144:
-#line 1179 "pic.y"
-	{
-		  yyval.pair.x = yyvsp[-3].pair.x + yyvsp[-1].pair.x;
-		  yyval.pair.y = yyvsp[-3].pair.y + yyvsp[-1].pair.y;
+    break;
+
+  case 145:
+
+/* Line 1455 of yacc.c  */
+#line 1181 "pic.y"
+    {
+		  (yyval.pair).x = (yyvsp[(2) - (5)].pair).x + (yyvsp[(4) - (5)].pair).x;
+		  (yyval.pair).y = (yyvsp[(2) - (5)].pair).y + (yyvsp[(4) - (5)].pair).y;
 		}
-break;
-case 145:
-#line 1184 "pic.y"
-	{
-		  yyval.pair.x = yyvsp[-2].pair.x - yyvsp[0].pair.x;
-		  yyval.pair.y = yyvsp[-2].pair.y - yyvsp[0].pair.y;
+    break;
+
+  case 146:
+
+/* Line 1455 of yacc.c  */
+#line 1186 "pic.y"
+    {
+		  (yyval.pair).x = (yyvsp[(1) - (3)].pair).x - (yyvsp[(3) - (3)].pair).x;
+		  (yyval.pair).y = (yyvsp[(1) - (3)].pair).y - (yyvsp[(3) - (3)].pair).y;
 		}
-break;
-case 146:
-#line 1189 "pic.y"
-	{
-		  yyval.pair.x = yyvsp[-3].pair.x - yyvsp[-1].pair.x;
-		  yyval.pair.y = yyvsp[-3].pair.y - yyvsp[-1].pair.y;
+    break;
+
+  case 147:
+
+/* Line 1455 of yacc.c  */
+#line 1191 "pic.y"
+    {
+		  (yyval.pair).x = (yyvsp[(2) - (5)].pair).x - (yyvsp[(4) - (5)].pair).x;
+		  (yyval.pair).y = (yyvsp[(2) - (5)].pair).y - (yyvsp[(4) - (5)].pair).y;
 		}
-break;
-case 147:
-#line 1194 "pic.y"
-	{
-		  yyval.pair.x = yyvsp[-3].pair.x;
-		  yyval.pair.y = yyvsp[-1].pair.y;
+    break;
+
+  case 148:
+
+/* Line 1455 of yacc.c  */
+#line 1196 "pic.y"
+    {
+		  (yyval.pair).x = (yyvsp[(2) - (5)].pair).x;
+		  (yyval.pair).y = (yyvsp[(4) - (5)].pair).y;
 		}
-break;
-case 148:
-#line 1199 "pic.y"
-	{
-		  yyval.pair.x = (1.0 - yyvsp[-4].x)*yyvsp[-2].pair.x + yyvsp[-4].x*yyvsp[0].pair.x;
-		  yyval.pair.y = (1.0 - yyvsp[-4].x)*yyvsp[-2].pair.y + yyvsp[-4].x*yyvsp[0].pair.y;
+    break;
+
+  case 149:
+
+/* Line 1455 of yacc.c  */
+#line 1201 "pic.y"
+    {
+		  (yyval.pair).x = (1.0 - (yyvsp[(1) - (5)].x))*(yyvsp[(3) - (5)].pair).x + (yyvsp[(1) - (5)].x)*(yyvsp[(5) - (5)].pair).x;
+		  (yyval.pair).y = (1.0 - (yyvsp[(1) - (5)].x))*(yyvsp[(3) - (5)].pair).y + (yyvsp[(1) - (5)].x)*(yyvsp[(5) - (5)].pair).y;
 		}
-break;
-case 149:
-#line 1204 "pic.y"
-	{
-		  yyval.pair.x = (1.0 - yyvsp[-5].x)*yyvsp[-3].pair.x + yyvsp[-5].x*yyvsp[-1].pair.x;
-		  yyval.pair.y = (1.0 - yyvsp[-5].x)*yyvsp[-3].pair.y + yyvsp[-5].x*yyvsp[-1].pair.y;
+    break;
+
+  case 150:
+
+/* Line 1455 of yacc.c  */
+#line 1206 "pic.y"
+    {
+		  (yyval.pair).x = (1.0 - (yyvsp[(2) - (7)].x))*(yyvsp[(4) - (7)].pair).x + (yyvsp[(2) - (7)].x)*(yyvsp[(6) - (7)].pair).x;
+		  (yyval.pair).y = (1.0 - (yyvsp[(2) - (7)].x))*(yyvsp[(4) - (7)].pair).y + (yyvsp[(2) - (7)].x)*(yyvsp[(6) - (7)].pair).y;
 		}
-break;
-case 150:
-#line 1209 "pic.y"
-	{
-		  yyval.pair.x = (1.0 - yyvsp[-5].x)*yyvsp[-3].pair.x + yyvsp[-5].x*yyvsp[-1].pair.x;
-		  yyval.pair.y = (1.0 - yyvsp[-5].x)*yyvsp[-3].pair.y + yyvsp[-5].x*yyvsp[-1].pair.y;
+    break;
+
+  case 151:
+
+/* Line 1455 of yacc.c  */
+#line 1212 "pic.y"
+    {
+		  (yyval.pair).x = (1.0 - (yyvsp[(1) - (6)].x))*(yyvsp[(3) - (6)].pair).x + (yyvsp[(1) - (6)].x)*(yyvsp[(5) - (6)].pair).x;
+		  (yyval.pair).y = (1.0 - (yyvsp[(1) - (6)].x))*(yyvsp[(3) - (6)].pair).y + (yyvsp[(1) - (6)].x)*(yyvsp[(5) - (6)].pair).y;
 		}
-break;
-case 151:
-#line 1214 "pic.y"
-	{
-		  yyval.pair.x = (1.0 - yyvsp[-6].x)*yyvsp[-4].pair.x + yyvsp[-6].x*yyvsp[-2].pair.x;
-		  yyval.pair.y = (1.0 - yyvsp[-6].x)*yyvsp[-4].pair.y + yyvsp[-6].x*yyvsp[-2].pair.y;
+    break;
+
+  case 152:
+
+/* Line 1455 of yacc.c  */
+#line 1217 "pic.y"
+    {
+		  (yyval.pair).x = (1.0 - (yyvsp[(2) - (8)].x))*(yyvsp[(4) - (8)].pair).x + (yyvsp[(2) - (8)].x)*(yyvsp[(6) - (8)].pair).x;
+		  (yyval.pair).y = (1.0 - (yyvsp[(2) - (8)].x))*(yyvsp[(4) - (8)].pair).y + (yyvsp[(2) - (8)].x)*(yyvsp[(6) - (8)].pair).y;
 		}
-break;
-case 154:
-#line 1227 "pic.y"
-	{
-		  yyval.pair.x = yyvsp[-2].x;
-		  yyval.pair.y = yyvsp[0].x;
+    break;
+
+  case 155:
+
+/* Line 1455 of yacc.c  */
+#line 1230 "pic.y"
+    {
+		  (yyval.pair).x = (yyvsp[(1) - (3)].x);
+		  (yyval.pair).y = (yyvsp[(3) - (3)].x);
 		}
-break;
-case 155:
-#line 1232 "pic.y"
-	{ yyval.pair = yyvsp[-1].pair; }
-break;
-case 156:
-#line 1238 "pic.y"
-	{ yyval.pl = yyvsp[0].pl; }
-break;
-case 157:
-#line 1240 "pic.y"
-	{
-		  path pth(yyvsp[0].crn);
-		  if (!pth.follow(yyvsp[-1].pl, & yyval.pl))
+    break;
+
+  case 156:
+
+/* Line 1455 of yacc.c  */
+#line 1235 "pic.y"
+    { (yyval.pair) = (yyvsp[(2) - (3)].pair); }
+    break;
+
+  case 157:
+
+/* Line 1455 of yacc.c  */
+#line 1241 "pic.y"
+    { (yyval.pl) = (yyvsp[(1) - (1)].pl); }
+    break;
+
+  case 158:
+
+/* Line 1455 of yacc.c  */
+#line 1243 "pic.y"
+    {
+		  path pth((yyvsp[(2) - (2)].crn));
+		  if (!pth.follow((yyvsp[(1) - (2)].pl), & (yyval.pl)))
 		    YYABORT;
 		}
-break;
-case 158:
-#line 1246 "pic.y"
-	{
-		  path pth(yyvsp[-1].crn);
-		  if (!pth.follow(yyvsp[0].pl, & yyval.pl))
+    break;
+
+  case 159:
+
+/* Line 1455 of yacc.c  */
+#line 1249 "pic.y"
+    {
+		  path pth((yyvsp[(1) - (2)].crn));
+		  if (!pth.follow((yyvsp[(2) - (2)].pl), & (yyval.pl)))
 		    YYABORT;
 		}
-break;
-case 159:
-#line 1252 "pic.y"
-	{
-		  path pth(yyvsp[-2].crn);
-		  if (!pth.follow(yyvsp[0].pl, & yyval.pl))
+    break;
+
+  case 160:
+
+/* Line 1455 of yacc.c  */
+#line 1255 "pic.y"
+    {
+		  path pth((yyvsp[(1) - (3)].crn));
+		  if (!pth.follow((yyvsp[(3) - (3)].pl), & (yyval.pl)))
 		    YYABORT;
 		}
-break;
-case 160:
-#line 1258 "pic.y"
-	{
-		  yyval.pl.x = current_position.x;
-		  yyval.pl.y = current_position.y;
-		  yyval.pl.obj = 0;
-		}
-break;
-case 161:
-#line 1267 "pic.y"
-	{
-		  place *p = lookup_label(yyvsp[0].str);
+    break;
+
+  case 161:
+
+/* Line 1455 of yacc.c  */
+#line 1261 "pic.y"
+    {
+		  (yyval.pl).x = current_position.x;
+		  (yyval.pl).y = current_position.y;
+		  (yyval.pl).obj = 0;
+		}
+    break;
+
+  case 162:
+
+/* Line 1455 of yacc.c  */
+#line 1270 "pic.y"
+    {
+		  place *p = lookup_label((yyvsp[(1) - (1)].str));
 		  if (!p) {
-		    lex_error("there is no place `%1'", yyvsp[0].str);
+		    lex_error("there is no place `%1'", (yyvsp[(1) - (1)].str));
 		    YYABORT;
 		  }
-		  yyval.pl = *p;
-		  a_delete yyvsp[0].str;
+		  (yyval.pl) = *p;
+		  a_delete (yyvsp[(1) - (1)].str);
 		}
-break;
-case 162:
-#line 1277 "pic.y"
-	{ yyval.pl.obj = yyvsp[0].obj; }
-break;
-case 163:
-#line 1279 "pic.y"
-	{
-		  path pth(yyvsp[0].str);
-		  if (!pth.follow(yyvsp[-2].pl, & yyval.pl))
+    break;
+
+  case 163:
+
+/* Line 1455 of yacc.c  */
+#line 1280 "pic.y"
+    { (yyval.pl).obj = (yyvsp[(1) - (1)].obj); }
+    break;
+
+  case 164:
+
+/* Line 1455 of yacc.c  */
+#line 1282 "pic.y"
+    {
+		  path pth((yyvsp[(3) - (3)].str));
+		  if (!pth.follow((yyvsp[(1) - (3)].pl), & (yyval.pl)))
 		    YYABORT;
 		}
-break;
-case 164:
-#line 1288 "pic.y"
-	{ yyval.n = yyvsp[0].n; }
-break;
-case 165:
-#line 1290 "pic.y"
-	{
-		  /* XXX Check for overflow (and non-integers?).*/
-		  yyval.n = (int)yyvsp[-1].x;
+    break;
+
+  case 165:
+
+/* Line 1455 of yacc.c  */
+#line 1291 "pic.y"
+    { (yyval.n) = (yyvsp[(1) - (1)].n); }
+    break;
+
+  case 166:
+
+/* Line 1455 of yacc.c  */
+#line 1293 "pic.y"
+    {
+		  // XXX Check for overflow (and non-integers?).
+		  (yyval.n) = (int)(yyvsp[(2) - (3)].x);
 		}
-break;
-case 166:
-#line 1298 "pic.y"
-	{ yyval.n = 1; }
-break;
-case 167:
-#line 1300 "pic.y"
-	{ yyval.n = yyvsp[-1].n; }
-break;
-case 168:
-#line 1305 "pic.y"
-	{
+    break;
+
+  case 167:
+
+/* Line 1455 of yacc.c  */
+#line 1301 "pic.y"
+    { (yyval.n) = 1; }
+    break;
+
+  case 168:
+
+/* Line 1455 of yacc.c  */
+#line 1303 "pic.y"
+    { (yyval.n) = (yyvsp[(1) - (2)].n); }
+    break;
+
+  case 169:
+
+/* Line 1455 of yacc.c  */
+#line 1308 "pic.y"
+    {
 		  int count = 0;
 		  object *p;
 		  for (p = olist.head; p != 0; p = p->next)
-		    if (p->type() == yyvsp[0].obtype && ++count == yyvsp[-1].n) {
-		      yyval.obj = p;
+		    if (p->type() == (yyvsp[(2) - (2)].obtype) && ++count == (yyvsp[(1) - (2)].n)) {
+		      (yyval.obj) = p;
 		      break;
 		    }
 		  if (p == 0) {
-		    lex_error("there is no %1%2 %3", yyvsp[-1].n, ordinal_postfix(yyvsp[-1].n),
-			      object_type_name(yyvsp[0].obtype));
+		    lex_error("there is no %1%2 %3", (yyvsp[(1) - (2)].n), ordinal_postfix((yyvsp[(1) - (2)].n)),
+			      object_type_name((yyvsp[(2) - (2)].obtype)));
 		    YYABORT;
 		  }
 		}
-break;
-case 169:
-#line 1320 "pic.y"
-	{
+    break;
+
+  case 170:
+
+/* Line 1455 of yacc.c  */
+#line 1323 "pic.y"
+    {
 		  int count = 0;
 		  object *p;
 		  for (p = olist.tail; p != 0; p = p->prev)
-		    if (p->type() == yyvsp[0].obtype && ++count == yyvsp[-1].n) {
-		      yyval.obj = p;
+		    if (p->type() == (yyvsp[(2) - (2)].obtype) && ++count == (yyvsp[(1) - (2)].n)) {
+		      (yyval.obj) = p;
 		      break;
 		    }
 		  if (p == 0) {
-		    lex_error("there is no %1%2 last %3", yyvsp[-1].n,
-			      ordinal_postfix(yyvsp[-1].n), object_type_name(yyvsp[0].obtype));
+		    lex_error("there is no %1%2 last %3", (yyvsp[(1) - (2)].n),
+			      ordinal_postfix((yyvsp[(1) - (2)].n)), object_type_name((yyvsp[(2) - (2)].obtype)));
 		    YYABORT;
 		  }
 		}
-break;
-case 170:
-#line 1338 "pic.y"
-	{ yyval.obtype = BOX_OBJECT; }
-break;
-case 171:
-#line 1340 "pic.y"
-	{ yyval.obtype = CIRCLE_OBJECT; }
-break;
-case 172:
-#line 1342 "pic.y"
-	{ yyval.obtype = ELLIPSE_OBJECT; }
-break;
-case 173:
-#line 1344 "pic.y"
-	{ yyval.obtype = ARC_OBJECT; }
-break;
-case 174:
-#line 1346 "pic.y"
-	{ yyval.obtype = LINE_OBJECT; }
-break;
-case 175:
-#line 1348 "pic.y"
-	{ yyval.obtype = ARROW_OBJECT; }
-break;
-case 176:
-#line 1350 "pic.y"
-	{ yyval.obtype = SPLINE_OBJECT; }
-break;
-case 177:
-#line 1352 "pic.y"
-	{ yyval.obtype = BLOCK_OBJECT; }
-break;
-case 178:
-#line 1354 "pic.y"
-	{ yyval.obtype = TEXT_OBJECT; }
-break;
-case 179:
-#line 1359 "pic.y"
-	{ yyval.pth = new path(yyvsp[0].str); }
-break;
-case 180:
-#line 1361 "pic.y"
-	{
-		  yyval.pth = yyvsp[-2].pth;
-		  yyval.pth->append(yyvsp[0].str);
-		}
-break;
-case 181:
-#line 1369 "pic.y"
-	{ yyval.pth = new path(yyvsp[0].crn); }
-break;
-case 182:
-#line 1373 "pic.y"
-	{ yyval.pth = yyvsp[0].pth; }
-break;
-case 183:
-#line 1375 "pic.y"
-	{
-		  yyval.pth = yyvsp[-1].pth;
-		  yyval.pth->append(yyvsp[0].crn);
-		}
-break;
-case 184:
-#line 1383 "pic.y"
-	{ yyval.pth = yyvsp[0].pth; }
-break;
-case 185:
-#line 1385 "pic.y"
-	{
-		  yyval.pth = yyvsp[-3].pth;
-		  yyval.pth->set_ypath(yyvsp[-1].pth);
-		}
-break;
-case 186:
-#line 1391 "pic.y"
-	{
+    break;
+
+  case 171:
+
+/* Line 1455 of yacc.c  */
+#line 1341 "pic.y"
+    { (yyval.obtype) = BOX_OBJECT; }
+    break;
+
+  case 172:
+
+/* Line 1455 of yacc.c  */
+#line 1343 "pic.y"
+    { (yyval.obtype) = CIRCLE_OBJECT; }
+    break;
+
+  case 173:
+
+/* Line 1455 of yacc.c  */
+#line 1345 "pic.y"
+    { (yyval.obtype) = ELLIPSE_OBJECT; }
+    break;
+
+  case 174:
+
+/* Line 1455 of yacc.c  */
+#line 1347 "pic.y"
+    { (yyval.obtype) = ARC_OBJECT; }
+    break;
+
+  case 175:
+
+/* Line 1455 of yacc.c  */
+#line 1349 "pic.y"
+    { (yyval.obtype) = LINE_OBJECT; }
+    break;
+
+  case 176:
+
+/* Line 1455 of yacc.c  */
+#line 1351 "pic.y"
+    { (yyval.obtype) = ARROW_OBJECT; }
+    break;
+
+  case 177:
+
+/* Line 1455 of yacc.c  */
+#line 1353 "pic.y"
+    { (yyval.obtype) = SPLINE_OBJECT; }
+    break;
+
+  case 178:
+
+/* Line 1455 of yacc.c  */
+#line 1355 "pic.y"
+    { (yyval.obtype) = BLOCK_OBJECT; }
+    break;
+
+  case 179:
+
+/* Line 1455 of yacc.c  */
+#line 1357 "pic.y"
+    { (yyval.obtype) = TEXT_OBJECT; }
+    break;
+
+  case 180:
+
+/* Line 1455 of yacc.c  */
+#line 1362 "pic.y"
+    { (yyval.pth) = new path((yyvsp[(2) - (2)].str)); }
+    break;
+
+  case 181:
+
+/* Line 1455 of yacc.c  */
+#line 1364 "pic.y"
+    {
+		  (yyval.pth) = (yyvsp[(1) - (3)].pth);
+		  (yyval.pth)->append((yyvsp[(3) - (3)].str));
+		}
+    break;
+
+  case 182:
+
+/* Line 1455 of yacc.c  */
+#line 1372 "pic.y"
+    { (yyval.pth) = new path((yyvsp[(1) - (1)].crn)); }
+    break;
+
+  case 183:
+
+/* Line 1455 of yacc.c  */
+#line 1376 "pic.y"
+    { (yyval.pth) = (yyvsp[(1) - (1)].pth); }
+    break;
+
+  case 184:
+
+/* Line 1455 of yacc.c  */
+#line 1378 "pic.y"
+    {
+		  (yyval.pth) = (yyvsp[(1) - (2)].pth);
+		  (yyval.pth)->append((yyvsp[(2) - (2)].crn));
+		}
+    break;
+
+  case 185:
+
+/* Line 1455 of yacc.c  */
+#line 1386 "pic.y"
+    { (yyval.pth) = (yyvsp[(1) - (1)].pth); }
+    break;
+
+  case 186:
+
+/* Line 1455 of yacc.c  */
+#line 1388 "pic.y"
+    {
+		  (yyval.pth) = (yyvsp[(2) - (5)].pth);
+		  (yyval.pth)->set_ypath((yyvsp[(4) - (5)].pth));
+		}
+    break;
+
+  case 187:
+
+/* Line 1455 of yacc.c  */
+#line 1394 "pic.y"
+    {
 		  lex_warning("`%1%2 last %3' in `with' argument ignored",
-			      yyvsp[-3].n, ordinal_postfix(yyvsp[-3].n), object_type_name(yyvsp[-1].obtype));
-		  yyval.pth = yyvsp[0].pth;
+			      (yyvsp[(1) - (4)].n), ordinal_postfix((yyvsp[(1) - (4)].n)), object_type_name((yyvsp[(3) - (4)].obtype)));
+		  (yyval.pth) = (yyvsp[(4) - (4)].pth);
 		}
-break;
-case 187:
-#line 1397 "pic.y"
-	{
+    break;
+
+  case 188:
+
+/* Line 1455 of yacc.c  */
+#line 1400 "pic.y"
+    {
 		  lex_warning("`last %1' in `with' argument ignored",
-			      object_type_name(yyvsp[-1].obtype));
-		  yyval.pth = yyvsp[0].pth;
+			      object_type_name((yyvsp[(2) - (3)].obtype)));
+		  (yyval.pth) = (yyvsp[(3) - (3)].pth);
 		}
-break;
-case 188:
-#line 1403 "pic.y"
-	{
+    break;
+
+  case 189:
+
+/* Line 1455 of yacc.c  */
+#line 1406 "pic.y"
+    {
 		  lex_warning("`%1%2 %3' in `with' argument ignored",
-			      yyvsp[-2].n, ordinal_postfix(yyvsp[-2].n), object_type_name(yyvsp[-1].obtype));
-		  yyval.pth = yyvsp[0].pth;
+			      (yyvsp[(1) - (3)].n), ordinal_postfix((yyvsp[(1) - (3)].n)), object_type_name((yyvsp[(2) - (3)].obtype)));
+		  (yyval.pth) = (yyvsp[(3) - (3)].pth);
 		}
-break;
-case 189:
-#line 1409 "pic.y"
-	{
-		  lex_warning("initial `%1' in `with' argument ignored", yyvsp[-1].str);
-		  a_delete yyvsp[-1].str;
-		  yyval.pth = yyvsp[0].pth;
-		}
-break;
-case 190:
-#line 1418 "pic.y"
-	{ yyval.crn = &object::north; }
-break;
-case 191:
-#line 1420 "pic.y"
-	{ yyval.crn = &object::east; }
-break;
-case 192:
-#line 1422 "pic.y"
-	{ yyval.crn = &object::west; }
-break;
-case 193:
-#line 1424 "pic.y"
-	{ yyval.crn = &object::south; }
-break;
-case 194:
-#line 1426 "pic.y"
-	{ yyval.crn = &object::north_east; }
-break;
-case 195:
-#line 1428 "pic.y"
-	{ yyval.crn = &object:: south_east; }
-break;
-case 196:
-#line 1430 "pic.y"
-	{ yyval.crn = &object::north_west; }
-break;
-case 197:
-#line 1432 "pic.y"
-	{ yyval.crn = &object::south_west; }
-break;
-case 198:
-#line 1434 "pic.y"
-	{ yyval.crn = &object::center; }
-break;
-case 199:
-#line 1436 "pic.y"
-	{ yyval.crn = &object::start; }
-break;
-case 200:
-#line 1438 "pic.y"
-	{ yyval.crn = &object::end; }
-break;
-case 201:
-#line 1440 "pic.y"
-	{ yyval.crn = &object::north; }
-break;
-case 202:
-#line 1442 "pic.y"
-	{ yyval.crn = &object::south; }
-break;
-case 203:
-#line 1444 "pic.y"
-	{ yyval.crn = &object::west; }
-break;
-case 204:
-#line 1446 "pic.y"
-	{ yyval.crn = &object::east; }
-break;
-case 205:
-#line 1448 "pic.y"
-	{ yyval.crn = &object::north_west; }
-break;
-case 206:
-#line 1450 "pic.y"
-	{ yyval.crn = &object::south_west; }
-break;
-case 207:
-#line 1452 "pic.y"
-	{ yyval.crn = &object::north_east; }
-break;
-case 208:
-#line 1454 "pic.y"
-	{ yyval.crn = &object::south_east; }
-break;
-case 209:
-#line 1456 "pic.y"
-	{ yyval.crn = &object::west; }
-break;
-case 210:
-#line 1458 "pic.y"
-	{ yyval.crn = &object::east; }
-break;
-case 211:
-#line 1460 "pic.y"
-	{ yyval.crn = &object::north_west; }
-break;
-case 212:
-#line 1462 "pic.y"
-	{ yyval.crn = &object::south_west; }
-break;
-case 213:
-#line 1464 "pic.y"
-	{ yyval.crn = &object::north_east; }
-break;
-case 214:
-#line 1466 "pic.y"
-	{ yyval.crn = &object::south_east; }
-break;
-case 215:
-#line 1468 "pic.y"
-	{ yyval.crn = &object::north; }
-break;
-case 216:
-#line 1470 "pic.y"
-	{ yyval.crn = &object::south; }
-break;
-case 217:
-#line 1472 "pic.y"
-	{ yyval.crn = &object::east; }
-break;
-case 218:
-#line 1474 "pic.y"
-	{ yyval.crn = &object::west; }
-break;
-case 219:
-#line 1476 "pic.y"
-	{ yyval.crn = &object::center; }
-break;
-case 220:
-#line 1478 "pic.y"
-	{ yyval.crn = &object::start; }
-break;
-case 221:
-#line 1480 "pic.y"
-	{ yyval.crn = &object::end; }
-break;
-case 222:
-#line 1485 "pic.y"
-	{
-		  if (!lookup_variable(yyvsp[0].str, & yyval.x)) {
-		    lex_error("there is no variable `%1'", yyvsp[0].str);
+    break;
+
+  case 190:
+
+/* Line 1455 of yacc.c  */
+#line 1412 "pic.y"
+    {
+		  lex_warning("initial `%1' in `with' argument ignored", (yyvsp[(1) - (2)].str));
+		  a_delete (yyvsp[(1) - (2)].str);
+		  (yyval.pth) = (yyvsp[(2) - (2)].pth);
+		}
+    break;
+
+  case 191:
+
+/* Line 1455 of yacc.c  */
+#line 1421 "pic.y"
+    { (yyval.crn) = &object::north; }
+    break;
+
+  case 192:
+
+/* Line 1455 of yacc.c  */
+#line 1423 "pic.y"
+    { (yyval.crn) = &object::east; }
+    break;
+
+  case 193:
+
+/* Line 1455 of yacc.c  */
+#line 1425 "pic.y"
+    { (yyval.crn) = &object::west; }
+    break;
+
+  case 194:
+
+/* Line 1455 of yacc.c  */
+#line 1427 "pic.y"
+    { (yyval.crn) = &object::south; }
+    break;
+
+  case 195:
+
+/* Line 1455 of yacc.c  */
+#line 1429 "pic.y"
+    { (yyval.crn) = &object::north_east; }
+    break;
+
+  case 196:
+
+/* Line 1455 of yacc.c  */
+#line 1431 "pic.y"
+    { (yyval.crn) = &object:: south_east; }
+    break;
+
+  case 197:
+
+/* Line 1455 of yacc.c  */
+#line 1433 "pic.y"
+    { (yyval.crn) = &object::north_west; }
+    break;
+
+  case 198:
+
+/* Line 1455 of yacc.c  */
+#line 1435 "pic.y"
+    { (yyval.crn) = &object::south_west; }
+    break;
+
+  case 199:
+
+/* Line 1455 of yacc.c  */
+#line 1437 "pic.y"
+    { (yyval.crn) = &object::center; }
+    break;
+
+  case 200:
+
+/* Line 1455 of yacc.c  */
+#line 1439 "pic.y"
+    { (yyval.crn) = &object::start; }
+    break;
+
+  case 201:
+
+/* Line 1455 of yacc.c  */
+#line 1441 "pic.y"
+    { (yyval.crn) = &object::end; }
+    break;
+
+  case 202:
+
+/* Line 1455 of yacc.c  */
+#line 1443 "pic.y"
+    { (yyval.crn) = &object::north; }
+    break;
+
+  case 203:
+
+/* Line 1455 of yacc.c  */
+#line 1445 "pic.y"
+    { (yyval.crn) = &object::south; }
+    break;
+
+  case 204:
+
+/* Line 1455 of yacc.c  */
+#line 1447 "pic.y"
+    { (yyval.crn) = &object::west; }
+    break;
+
+  case 205:
+
+/* Line 1455 of yacc.c  */
+#line 1449 "pic.y"
+    { (yyval.crn) = &object::east; }
+    break;
+
+  case 206:
+
+/* Line 1455 of yacc.c  */
+#line 1451 "pic.y"
+    { (yyval.crn) = &object::north_west; }
+    break;
+
+  case 207:
+
+/* Line 1455 of yacc.c  */
+#line 1453 "pic.y"
+    { (yyval.crn) = &object::south_west; }
+    break;
+
+  case 208:
+
+/* Line 1455 of yacc.c  */
+#line 1455 "pic.y"
+    { (yyval.crn) = &object::north_east; }
+    break;
+
+  case 209:
+
+/* Line 1455 of yacc.c  */
+#line 1457 "pic.y"
+    { (yyval.crn) = &object::south_east; }
+    break;
+
+  case 210:
+
+/* Line 1455 of yacc.c  */
+#line 1459 "pic.y"
+    { (yyval.crn) = &object::west; }
+    break;
+
+  case 211:
+
+/* Line 1455 of yacc.c  */
+#line 1461 "pic.y"
+    { (yyval.crn) = &object::east; }
+    break;
+
+  case 212:
+
+/* Line 1455 of yacc.c  */
+#line 1463 "pic.y"
+    { (yyval.crn) = &object::north_west; }
+    break;
+
+  case 213:
+
+/* Line 1455 of yacc.c  */
+#line 1465 "pic.y"
+    { (yyval.crn) = &object::south_west; }
+    break;
+
+  case 214:
+
+/* Line 1455 of yacc.c  */
+#line 1467 "pic.y"
+    { (yyval.crn) = &object::north_east; }
+    break;
+
+  case 215:
+
+/* Line 1455 of yacc.c  */
+#line 1469 "pic.y"
+    { (yyval.crn) = &object::south_east; }
+    break;
+
+  case 216:
+
+/* Line 1455 of yacc.c  */
+#line 1471 "pic.y"
+    { (yyval.crn) = &object::north; }
+    break;
+
+  case 217:
+
+/* Line 1455 of yacc.c  */
+#line 1473 "pic.y"
+    { (yyval.crn) = &object::south; }
+    break;
+
+  case 218:
+
+/* Line 1455 of yacc.c  */
+#line 1475 "pic.y"
+    { (yyval.crn) = &object::east; }
+    break;
+
+  case 219:
+
+/* Line 1455 of yacc.c  */
+#line 1477 "pic.y"
+    { (yyval.crn) = &object::west; }
+    break;
+
+  case 220:
+
+/* Line 1455 of yacc.c  */
+#line 1479 "pic.y"
+    { (yyval.crn) = &object::center; }
+    break;
+
+  case 221:
+
+/* Line 1455 of yacc.c  */
+#line 1481 "pic.y"
+    { (yyval.crn) = &object::start; }
+    break;
+
+  case 222:
+
+/* Line 1455 of yacc.c  */
+#line 1483 "pic.y"
+    { (yyval.crn) = &object::end; }
+    break;
+
+  case 223:
+
+/* Line 1455 of yacc.c  */
+#line 1488 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (1)].x); }
+    break;
+
+  case 224:
+
+/* Line 1455 of yacc.c  */
+#line 1490 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (1)].x); }
+    break;
+
+  case 225:
+
+/* Line 1455 of yacc.c  */
+#line 1495 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) < (yyvsp[(3) - (3)].x)); }
+    break;
+
+  case 226:
+
+/* Line 1455 of yacc.c  */
+#line 1500 "pic.y"
+    {
+		  if (!lookup_variable((yyvsp[(1) - (1)].str), & (yyval.x))) {
+		    lex_error("there is no variable `%1'", (yyvsp[(1) - (1)].str));
 		    YYABORT;
 		  }
-		  a_delete yyvsp[0].str;
+		  a_delete (yyvsp[(1) - (1)].str);
 		}
-break;
-case 223:
-#line 1493 "pic.y"
-	{ yyval.x = yyvsp[0].x; }
-break;
-case 224:
-#line 1495 "pic.y"
-	{
-		  if (yyvsp[-1].pl.obj != 0)
-		    yyval.x = yyvsp[-1].pl.obj->origin().x;
+    break;
+
+  case 227:
+
+/* Line 1455 of yacc.c  */
+#line 1508 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (1)].x); }
+    break;
+
+  case 228:
+
+/* Line 1455 of yacc.c  */
+#line 1510 "pic.y"
+    {
+		  if ((yyvsp[(1) - (2)].pl).obj != 0)
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).obj->origin().x;
 		  else
-		    yyval.x = yyvsp[-1].pl.x;
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).x;
 		}
-break;
-case 225:
-#line 1502 "pic.y"
-	{
-		  if (yyvsp[-1].pl.obj != 0)
-		    yyval.x = yyvsp[-1].pl.obj->origin().y;
+    break;
+
+  case 229:
+
+/* Line 1455 of yacc.c  */
+#line 1517 "pic.y"
+    {
+		  if ((yyvsp[(1) - (2)].pl).obj != 0)
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).obj->origin().y;
 		  else
-		    yyval.x = yyvsp[-1].pl.y;
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).y;
 		}
-break;
-case 226:
-#line 1509 "pic.y"
-	{
-		  if (yyvsp[-1].pl.obj != 0)
-		    yyval.x = yyvsp[-1].pl.obj->height();
+    break;
+
+  case 230:
+
+/* Line 1455 of yacc.c  */
+#line 1524 "pic.y"
+    {
+		  if ((yyvsp[(1) - (2)].pl).obj != 0)
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).obj->height();
 		  else
-		    yyval.x = 0.0;
+		    (yyval.x) = 0.0;
 		}
-break;
-case 227:
-#line 1516 "pic.y"
-	{
-		  if (yyvsp[-1].pl.obj != 0)
-		    yyval.x = yyvsp[-1].pl.obj->width();
+    break;
+
+  case 231:
+
+/* Line 1455 of yacc.c  */
+#line 1531 "pic.y"
+    {
+		  if ((yyvsp[(1) - (2)].pl).obj != 0)
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).obj->width();
 		  else
-		    yyval.x = 0.0;
+		    (yyval.x) = 0.0;
 		}
-break;
-case 228:
-#line 1523 "pic.y"
-	{
-		  if (yyvsp[-1].pl.obj != 0)
-		    yyval.x = yyvsp[-1].pl.obj->radius();
+    break;
+
+  case 232:
+
+/* Line 1455 of yacc.c  */
+#line 1538 "pic.y"
+    {
+		  if ((yyvsp[(1) - (2)].pl).obj != 0)
+		    (yyval.x) = (yyvsp[(1) - (2)].pl).obj->radius();
 		  else
-		    yyval.x = 0.0;
+		    (yyval.x) = 0.0;
 		}
-break;
-case 229:
-#line 1530 "pic.y"
-	{ yyval.x = yyvsp[-2].x + yyvsp[0].x; }
-break;
-case 230:
-#line 1532 "pic.y"
-	{ yyval.x = yyvsp[-2].x - yyvsp[0].x; }
-break;
-case 231:
-#line 1534 "pic.y"
-	{ yyval.x = yyvsp[-2].x * yyvsp[0].x; }
-break;
-case 232:
-#line 1536 "pic.y"
-	{
-		  if (yyvsp[0].x == 0.0) {
+    break;
+
+  case 233:
+
+/* Line 1455 of yacc.c  */
+#line 1545 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (3)].x) + (yyvsp[(3) - (3)].x); }
+    break;
+
+  case 234:
+
+/* Line 1455 of yacc.c  */
+#line 1547 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (3)].x) - (yyvsp[(3) - (3)].x); }
+    break;
+
+  case 235:
+
+/* Line 1455 of yacc.c  */
+#line 1549 "pic.y"
+    { (yyval.x) = (yyvsp[(1) - (3)].x) * (yyvsp[(3) - (3)].x); }
+    break;
+
+  case 236:
+
+/* Line 1455 of yacc.c  */
+#line 1551 "pic.y"
+    {
+		  if ((yyvsp[(3) - (3)].x) == 0.0) {
 		    lex_error("division by zero");
 		    YYABORT;
 		  }
-		  yyval.x = yyvsp[-2].x/yyvsp[0].x;
+		  (yyval.x) = (yyvsp[(1) - (3)].x)/(yyvsp[(3) - (3)].x);
 		}
-break;
-case 233:
-#line 1544 "pic.y"
-	{
-		  if (yyvsp[0].x == 0.0) {
+    break;
+
+  case 237:
+
+/* Line 1455 of yacc.c  */
+#line 1559 "pic.y"
+    {
+		  if ((yyvsp[(3) - (3)].x) == 0.0) {
 		    lex_error("modulus by zero");
 		    YYABORT;
 		  }
-		  yyval.x = fmod(yyvsp[-2].x, yyvsp[0].x);
+		  (yyval.x) = fmod((yyvsp[(1) - (3)].x), (yyvsp[(3) - (3)].x));
 		}
-break;
-case 234:
-#line 1552 "pic.y"
-	{
+    break;
+
+  case 238:
+
+/* Line 1455 of yacc.c  */
+#line 1567 "pic.y"
+    {
 		  errno = 0;
-		  yyval.x = pow(yyvsp[-2].x, yyvsp[0].x);
+		  (yyval.x) = pow((yyvsp[(1) - (3)].x), (yyvsp[(3) - (3)].x));
 		  if (errno == EDOM) {
 		    lex_error("arguments to `^' operator out of domain");
 		    YYABORT;
@@ -5716,42 +4783,57 @@
 		    YYABORT;
 		  }
 		}
-break;
-case 235:
-#line 1565 "pic.y"
-	{ yyval.x = -yyvsp[0].x; }
-break;
-case 236:
-#line 1567 "pic.y"
-	{ yyval.x = yyvsp[-1].x; }
-break;
-case 237:
-#line 1569 "pic.y"
-	{
+    break;
+
+  case 239:
+
+/* Line 1455 of yacc.c  */
+#line 1580 "pic.y"
+    { (yyval.x) = -(yyvsp[(2) - (2)].x); }
+    break;
+
+  case 240:
+
+/* Line 1455 of yacc.c  */
+#line 1582 "pic.y"
+    { (yyval.x) = (yyvsp[(2) - (3)].x); }
+    break;
+
+  case 241:
+
+/* Line 1455 of yacc.c  */
+#line 1584 "pic.y"
+    {
 		  errno = 0;
-		  yyval.x = sin(yyvsp[-1].x);
+		  (yyval.x) = sin((yyvsp[(3) - (4)].x));
 		  if (errno == ERANGE) {
 		    lex_error("sin result out of range");
 		    YYABORT;
 		  }
 		}
-break;
-case 238:
-#line 1578 "pic.y"
-	{
-		  errno = 0;
-		  yyval.x = cos(yyvsp[-1].x);
-		  if (errno == ERANGE) {
-		    lex_error("cos result out of range");
+    break;
+
+  case 242:
+
+/* Line 1455 of yacc.c  */
+#line 1593 "pic.y"
+    {
+		  errno = 0;
+		  (yyval.x) = cos((yyvsp[(3) - (4)].x));
+		  if (errno == ERANGE) {
+		    lex_error("cos result out of range");
 		    YYABORT;
 		  }
 		}
-break;
-case 239:
-#line 1587 "pic.y"
-	{
+    break;
+
+  case 243:
+
+/* Line 1455 of yacc.c  */
+#line 1602 "pic.y"
+    {
 		  errno = 0;
-		  yyval.x = atan2(yyvsp[-3].x, yyvsp[-1].x);
+		  (yyval.x) = atan2((yyvsp[(3) - (6)].x), (yyvsp[(5) - (6)].x));
 		  if (errno == EDOM) {
 		    lex_error("atan2 argument out of domain");
 		    YYABORT;
@@ -5761,164 +4843,626 @@
 		    YYABORT;
 		  }
 		}
-break;
-case 240:
-#line 1600 "pic.y"
-	{
+    break;
+
+  case 244:
+
+/* Line 1455 of yacc.c  */
+#line 1615 "pic.y"
+    {
 		  errno = 0;
-		  yyval.x = log10(yyvsp[-1].x);
+		  (yyval.x) = log10((yyvsp[(3) - (4)].x));
 		  if (errno == ERANGE) {
 		    lex_error("log result out of range");
 		    YYABORT;
 		  }
 		}
-break;
-case 241:
-#line 1609 "pic.y"
-	{
+    break;
+
+  case 245:
+
+/* Line 1455 of yacc.c  */
+#line 1624 "pic.y"
+    {
 		  errno = 0;
-		  yyval.x = pow(10.0, yyvsp[-1].x);
+		  (yyval.x) = pow(10.0, (yyvsp[(3) - (4)].x));
 		  if (errno == ERANGE) {
 		    lex_error("exp result out of range");
 		    YYABORT;
 		  }
 		}
-break;
-case 242:
-#line 1618 "pic.y"
-	{
+    break;
+
+  case 246:
+
+/* Line 1455 of yacc.c  */
+#line 1633 "pic.y"
+    {
 		  errno = 0;
-		  yyval.x = sqrt(yyvsp[-1].x);
+		  (yyval.x) = sqrt((yyvsp[(3) - (4)].x));
 		  if (errno == EDOM) {
 		    lex_error("sqrt argument out of domain");
 		    YYABORT;
 		  }
 		}
-break;
-case 243:
-#line 1627 "pic.y"
-	{ yyval.x = yyvsp[-3].x > yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; }
-break;
-case 244:
-#line 1629 "pic.y"
-	{ yyval.x = yyvsp[-3].x < yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; }
-break;
-case 245:
-#line 1631 "pic.y"
-	{ yyval.x = yyvsp[-1].x < 0 ? -floor(-yyvsp[-1].x) : floor(yyvsp[-1].x); }
-break;
-case 246:
-#line 1633 "pic.y"
-	{ yyval.x = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*yyvsp[-1].x); }
-break;
-case 247:
-#line 1635 "pic.y"
-	{
-		  /* return a random number in the range [0,1) */
-		  /* portable, but not very random */
-		  yyval.x = (rand() & 0x7fff) / double(0x8000);
-		}
-break;
-case 248:
-#line 1641 "pic.y"
-	{
-		  yyval.x = 0;
-		  srand((unsigned int)yyvsp[-1].x);
-		}
-break;
-case 249:
+    break;
+
+  case 247:
+
+/* Line 1455 of yacc.c  */
+#line 1642 "pic.y"
+    { (yyval.x) = (yyvsp[(3) - (6)].x) > (yyvsp[(5) - (6)].x) ? (yyvsp[(3) - (6)].x) : (yyvsp[(5) - (6)].x); }
+    break;
+
+  case 248:
+
+/* Line 1455 of yacc.c  */
+#line 1644 "pic.y"
+    { (yyval.x) = (yyvsp[(3) - (6)].x) < (yyvsp[(5) - (6)].x) ? (yyvsp[(3) - (6)].x) : (yyvsp[(5) - (6)].x); }
+    break;
+
+  case 249:
+
+/* Line 1455 of yacc.c  */
 #line 1646 "pic.y"
-	{ yyval.x = (yyvsp[-2].x < yyvsp[0].x); }
-break;
-case 250:
+    { (yyval.x) = (yyvsp[(3) - (4)].x) < 0 ? -floor(-(yyvsp[(3) - (4)].x)) : floor((yyvsp[(3) - (4)].x)); }
+    break;
+
+  case 250:
+
+/* Line 1455 of yacc.c  */
 #line 1648 "pic.y"
-	{ yyval.x = (yyvsp[-2].x <= yyvsp[0].x); }
-break;
-case 251:
+    { (yyval.x) = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*(yyvsp[(3) - (4)].x)); }
+    break;
+
+  case 251:
+
+/* Line 1455 of yacc.c  */
 #line 1650 "pic.y"
-	{ yyval.x = (yyvsp[-2].x > yyvsp[0].x); }
-break;
-case 252:
-#line 1652 "pic.y"
-	{ yyval.x = (yyvsp[-2].x >= yyvsp[0].x); }
-break;
-case 253:
-#line 1654 "pic.y"
-	{ yyval.x = (yyvsp[-2].x == yyvsp[0].x); }
-break;
-case 254:
+    {
+		  /* return a random number in the range [0,1) */
+		  /* portable, but not very random */
+		  (yyval.x) = (rand() & 0x7fff) / double(0x8000);
+		}
+    break;
+
+  case 252:
+
+/* Line 1455 of yacc.c  */
 #line 1656 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != yyvsp[0].x); }
-break;
-case 255:
-#line 1658 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
-break;
-case 256:
-#line 1660 "pic.y"
-	{ yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
-break;
-case 257:
-#line 1662 "pic.y"
-	{ yyval.x = (yyvsp[0].x == 0.0); }
-break;
-#line 5865 "pic.cpp"
+    {
+		  (yyval.x) = 0;
+		  srand((unsigned int)(yyvsp[(3) - (4)].x));
+		}
+    break;
+
+  case 253:
+
+/* Line 1455 of yacc.c  */
+#line 1661 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) <= (yyvsp[(3) - (3)].x)); }
+    break;
+
+  case 254:
+
+/* Line 1455 of yacc.c  */
+#line 1663 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) > (yyvsp[(3) - (3)].x)); }
+    break;
+
+  case 255:
+
+/* Line 1455 of yacc.c  */
+#line 1665 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) >= (yyvsp[(3) - (3)].x)); }
+    break;
+
+  case 256:
+
+/* Line 1455 of yacc.c  */
+#line 1667 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) == (yyvsp[(3) - (3)].x)); }
+    break;
+
+  case 257:
+
+/* Line 1455 of yacc.c  */
+#line 1669 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != (yyvsp[(3) - (3)].x)); }
+    break;
+
+  case 258:
+
+/* Line 1455 of yacc.c  */
+#line 1671 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 && (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 259:
+
+/* Line 1455 of yacc.c  */
+#line 1673 "pic.y"
+    { (yyval.x) = ((yyvsp[(1) - (3)].x) != 0.0 || (yyvsp[(3) - (3)].x) != 0.0); }
+    break;
+
+  case 260:
+
+/* Line 1455 of yacc.c  */
+#line 1675 "pic.y"
+    { (yyval.x) = ((yyvsp[(2) - (2)].x) == 0.0); }
+    break;
+
+
+
+/* Line 1455 of yacc.c  */
+#line 4999 "pic.cpp"
+      default: break;
     }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
 #endif
-    if (yyssp >= yysslim && yygrowstack())
+
+yyreturn:
+  if (yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
     {
-        goto yyoverflow;
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+
+/* Line 1675 of yacc.c  */
+#line 1679 "pic.y"
+
+
+/* bison defines const to be empty unless __STDC__ is defined, which it
+isn't under cfront */
+
+#ifdef const
+#undef const
+#endif
+
+static struct {
+  const char *name;
+  double val;
+  int scaled;		     // non-zero if val should be multiplied by scale
+} defaults_table[] = {
+  { "arcrad", .25, 1 },
+  { "arrowht", .1, 1 },
+  { "arrowwid", .05, 1 },
+  { "circlerad", .25, 1 },
+  { "boxht", .5, 1 },
+  { "boxwid", .75, 1 },
+  { "boxrad", 0.0, 1 },
+  { "dashwid", .05, 1 },
+  { "ellipseht", .5, 1 },
+  { "ellipsewid", .75, 1 },
+  { "moveht", .5, 1 },
+  { "movewid", .5, 1 },
+  { "lineht", .5, 1 },
+  { "linewid", .5, 1 },
+  { "textht", 0.0, 1 },
+  { "textwid", 0.0, 1 },
+  { "scale", 1.0, 0 },
+  { "linethick", -1.0, 0 },		// in points
+  { "fillval", .5, 0 },
+  { "arrowhead", 1.0, 0 },
+  { "maxpswid", 8.5, 0 },
+  { "maxpsht", 11.0, 0 },
+};
+
+place *lookup_label(const char *label)
+{
+  saved_state *state = current_saved_state;
+  PTABLE(place) *tbl = current_table;
+  for (;;) {
+    place *pl = tbl->lookup(label);
+    if (pl)
+      return pl;
+    if (!state)
+      return 0;
+    tbl = state->tbl;
+    state = state->prev;
+  }
+}
+
+void define_label(const char *label, const place *pl)
+{
+  place *p = new place[1];
+  *p = *pl;
+  current_table->define(label, p);
+}
+
+int lookup_variable(const char *name, double *val)
+{
+  place *pl = lookup_label(name);
+  if (pl) {
+    *val = pl->x;
+    return 1;
+  }
+  return 0;
+}
+
+void define_variable(const char *name, double val)
+{
+  place *p = new place[1];
+  p->obj = 0;
+  p->x = val;
+  p->y = 0.0;
+  current_table->define(name, p);
+  if (strcmp(name, "scale") == 0) {
+    // When the scale changes, reset all scaled pre-defined variables to
+    // their default values.
+    for (unsigned int i = 0;
+	 i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) 
+      if (defaults_table[i].scaled)
+	define_variable(defaults_table[i].name, val*defaults_table[i].val);
+  }
+}
+
+// called once only (not once per parse)
+
+void parse_init()
+{
+  current_direction = RIGHT_DIRECTION;
+  current_position.x = 0.0;
+  current_position.y = 0.0;
+  // This resets everything to its default value.
+  reset_all();
+}
+
+void reset(const char *nm)
+{
+  for (unsigned int i = 0;
+       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
+    if (strcmp(nm, defaults_table[i].name) == 0) {
+      double val = defaults_table[i].val;
+      if (defaults_table[i].scaled) {
+	double scale;
+	lookup_variable("scale", &scale);
+	val *= scale;
+      }
+      define_variable(defaults_table[i].name, val);
+      return;
     }
-    *++yyssp = (short) yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
+  lex_error("`%1' is not a predefined variable", nm);
+}
 
-yyoverflow:
-    yyerror("yacc stack overflow");
+void reset_all()
+{
+  // We only have to explicitly reset the pre-defined variables that
+  // aren't scaled because `scale' is not scaled, and changing the
+  // value of `scale' will reset all the pre-defined variables that
+  // are scaled.
+  for (unsigned int i = 0;
+       i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++)
+    if (!defaults_table[i].scaled)
+      define_variable(defaults_table[i].name, defaults_table[i].val);
+}
 
-yyabort:
-    return (1);
+// called after each parse
 
-yyaccept:
-    return (0);
+void parse_cleanup()
+{
+  while (current_saved_state != 0) {
+    delete current_table;
+    current_table = current_saved_state->tbl;
+    saved_state *tem = current_saved_state;
+    current_saved_state = current_saved_state->prev;
+    delete tem;
+  }
+  assert(current_table == &top_table);
+  PTABLE_ITERATOR(place) iter(current_table);
+  const char *key;
+  place *pl;
+  while (iter.next(&key, &pl))
+    if (pl->obj != 0) {
+      position pos = pl->obj->origin();
+      pl->obj = 0;
+      pl->x = pos.x;
+      pl->y = pos.y;
+    }
+  while (olist.head != 0) {
+    object *tem = olist.head;
+    olist.head = olist.head->next;
+    delete tem;
+  }
+  olist.tail = 0;
+  current_direction = RIGHT_DIRECTION;
+  current_position.x = 0.0;
+  current_position.y = 0.0;
 }
+
+const char *ordinal_postfix(int n)
+{
+  if (n < 10 || n > 20)
+    switch (n % 10) {
+    case 1:
+      return "st";
+    case 2:
+      return "nd";
+    case 3:
+      return "rd";
+    }
+  return "th";
+}
+
+const char *object_type_name(object_type type)
+{
+  switch (type) {
+  case BOX_OBJECT:
+    return "box";
+  case CIRCLE_OBJECT:
+    return "circle";
+  case ELLIPSE_OBJECT:
+    return "ellipse";
+  case ARC_OBJECT:
+    return "arc";
+  case SPLINE_OBJECT:
+    return "spline";
+  case LINE_OBJECT:
+    return "line";
+  case ARROW_OBJECT:
+    return "arrow";
+  case MOVE_OBJECT:
+    return "move";
+  case TEXT_OBJECT:
+    return "\"\"";
+  case BLOCK_OBJECT:
+    return "[]";
+  case OTHER_OBJECT:
+  case MARK_OBJECT:
+  default:
+    break;
+  }
+  return "object";
+}
+
+static char sprintf_buf[1024];
+
+char *format_number(const char *form, double n)
+{
+  if (form == 0)
+    form = "%g";
+  return do_sprintf(form, &n, 1);
+}
+
+char *do_sprintf(const char *form, const double *v, int nv)
+{
+  string result;
+  int i = 0;
+  string one_format;
+  while (*form) {
+    if (*form == '%') {
+      one_format += *form++;
+      for (; *form != '\0' && strchr("#-+ 0123456789.", *form) != 0; form++)
+	one_format += *form;
+      if (*form == '\0' || strchr("eEfgG%", *form) == 0) {
+	lex_error("bad sprintf format");
+	result += one_format;
+	result += form;
+	break;
+      }
+      if (*form == '%') {
+	one_format += *form++;
+	one_format += '\0';
+	snprintf(sprintf_buf, sizeof(sprintf_buf),
+		 "%s", one_format.contents());
+      }
+      else {
+	if (i >= nv) {
+	  lex_error("too few arguments to snprintf");
+	  result += one_format;
+	  result += form;
+	  break;
+	}
+	one_format += *form++;
+	one_format += '\0';
+	snprintf(sprintf_buf, sizeof(sprintf_buf),
+		 one_format.contents(), v[i++]);
+      }
+      one_format.clear();
+      result += sprintf_buf;
+    }
+    else
+      result += *form++;
+  }
+  result += '\0';
+  return strsave(result.contents());
+}
+
diff -ruN groff-1.20.1/src/preproc/pic/pic_tab.h groff-1.21/src/preproc/pic/pic_tab.h
--- groff-1.20.1/src/preproc/pic/pic_tab.h	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/src/preproc/pic/pic_tab.h	2010-12-31 08:33:10.000000000 +0100
@@ -1,126 +1,302 @@
-#define LABEL 257
-#define VARIABLE 258
-#define NUMBER 259
-#define TEXT 260
-#define COMMAND_LINE 261
-#define DELIMITED 262
-#define ORDINAL 263
-#define TH 264
-#define LEFT_ARROW_HEAD 265
-#define RIGHT_ARROW_HEAD 266
-#define DOUBLE_ARROW_HEAD 267
-#define LAST 268
-#define BOX 269
-#define CIRCLE 270
-#define ELLIPSE 271
-#define ARC 272
-#define LINE 273
-#define ARROW 274
-#define MOVE 275
-#define SPLINE 276
-#define HEIGHT 277
-#define RADIUS 278
-#define FIGNAME 279
-#define WIDTH 280
-#define DIAMETER 281
-#define UP 282
-#define DOWN 283
-#define RIGHT 284
-#define LEFT 285
-#define FROM 286
-#define TO 287
-#define AT 288
-#define WITH 289
-#define BY 290
-#define THEN 291
-#define SOLID 292
-#define DOTTED 293
-#define DASHED 294
-#define CHOP 295
-#define SAME 296
-#define INVISIBLE 297
-#define LJUST 298
-#define RJUST 299
-#define ABOVE 300
-#define BELOW 301
-#define OF 302
-#define THE 303
-#define WAY 304
-#define BETWEEN 305
-#define AND 306
-#define HERE 307
-#define DOT_N 308
-#define DOT_E 309
-#define DOT_W 310
-#define DOT_S 311
-#define DOT_NE 312
-#define DOT_SE 313
-#define DOT_NW 314
-#define DOT_SW 315
-#define DOT_C 316
-#define DOT_START 317
-#define DOT_END 318
-#define DOT_X 319
-#define DOT_Y 320
-#define DOT_HT 321
-#define DOT_WID 322
-#define DOT_RAD 323
-#define SIN 324
-#define COS 325
-#define ATAN2 326
-#define LOG 327
-#define EXP 328
-#define SQRT 329
-#define K_MAX 330
-#define K_MIN 331
-#define INT 332
-#define RAND 333
-#define SRAND 334
-#define COPY 335
-#define THRU 336
-#define TOP 337
-#define BOTTOM 338
-#define UPPER 339
-#define LOWER 340
-#define SH 341
-#define PRINT 342
-#define CW 343
-#define CCW 344
-#define FOR 345
-#define DO 346
-#define IF 347
-#define ELSE 348
-#define ANDAND 349
-#define OROR 350
-#define NOTEQUAL 351
-#define EQUALEQUAL 352
-#define LESSEQUAL 353
-#define GREATEREQUAL 354
-#define LEFT_CORNER 355
-#define RIGHT_CORNER 356
-#define NORTH 357
-#define SOUTH 358
-#define EAST 359
-#define WEST 360
-#define CENTER 361
-#define END 362
-#define START 363
-#define RESET 364
-#define UNTIL 365
-#define PLOT 366
-#define THICKNESS 367
-#define FILL 368
-#define COLORED 369
-#define OUTLINED 370
-#define SHADED 371
-#define XSLANTED 372
-#define YSLANTED 373
-#define ALIGNED 374
-#define SPRINTF 375
-#define COMMAND 376
-#define DEFINE 377
-#define UNDEF 378
-typedef union {
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     LABEL = 258,
+     VARIABLE = 259,
+     NUMBER = 260,
+     TEXT = 261,
+     COMMAND_LINE = 262,
+     DELIMITED = 263,
+     ORDINAL = 264,
+     TH = 265,
+     LEFT_ARROW_HEAD = 266,
+     RIGHT_ARROW_HEAD = 267,
+     DOUBLE_ARROW_HEAD = 268,
+     LAST = 269,
+     BOX = 270,
+     CIRCLE = 271,
+     ELLIPSE = 272,
+     ARC = 273,
+     LINE = 274,
+     ARROW = 275,
+     MOVE = 276,
+     SPLINE = 277,
+     HEIGHT = 278,
+     RADIUS = 279,
+     FIGNAME = 280,
+     WIDTH = 281,
+     DIAMETER = 282,
+     UP = 283,
+     DOWN = 284,
+     RIGHT = 285,
+     LEFT = 286,
+     FROM = 287,
+     TO = 288,
+     AT = 289,
+     WITH = 290,
+     BY = 291,
+     THEN = 292,
+     SOLID = 293,
+     DOTTED = 294,
+     DASHED = 295,
+     CHOP = 296,
+     SAME = 297,
+     INVISIBLE = 298,
+     LJUST = 299,
+     RJUST = 300,
+     ABOVE = 301,
+     BELOW = 302,
+     OF = 303,
+     THE = 304,
+     WAY = 305,
+     BETWEEN = 306,
+     AND = 307,
+     HERE = 308,
+     DOT_N = 309,
+     DOT_E = 310,
+     DOT_W = 311,
+     DOT_S = 312,
+     DOT_NE = 313,
+     DOT_SE = 314,
+     DOT_NW = 315,
+     DOT_SW = 316,
+     DOT_C = 317,
+     DOT_START = 318,
+     DOT_END = 319,
+     DOT_X = 320,
+     DOT_Y = 321,
+     DOT_HT = 322,
+     DOT_WID = 323,
+     DOT_RAD = 324,
+     SIN = 325,
+     COS = 326,
+     ATAN2 = 327,
+     LOG = 328,
+     EXP = 329,
+     SQRT = 330,
+     K_MAX = 331,
+     K_MIN = 332,
+     INT = 333,
+     RAND = 334,
+     SRAND = 335,
+     COPY = 336,
+     THRU = 337,
+     TOP = 338,
+     BOTTOM = 339,
+     UPPER = 340,
+     LOWER = 341,
+     SH = 342,
+     PRINT = 343,
+     CW = 344,
+     CCW = 345,
+     FOR = 346,
+     DO = 347,
+     IF = 348,
+     ELSE = 349,
+     ANDAND = 350,
+     OROR = 351,
+     NOTEQUAL = 352,
+     EQUALEQUAL = 353,
+     LESSEQUAL = 354,
+     GREATEREQUAL = 355,
+     LEFT_CORNER = 356,
+     RIGHT_CORNER = 357,
+     NORTH = 358,
+     SOUTH = 359,
+     EAST = 360,
+     WEST = 361,
+     CENTER = 362,
+     END = 363,
+     START = 364,
+     RESET = 365,
+     UNTIL = 366,
+     PLOT = 367,
+     THICKNESS = 368,
+     FILL = 369,
+     COLORED = 370,
+     OUTLINED = 371,
+     SHADED = 372,
+     XSLANTED = 373,
+     YSLANTED = 374,
+     ALIGNED = 375,
+     SPRINTF = 376,
+     COMMAND = 377,
+     DEFINE = 378,
+     UNDEF = 379
+   };
+#endif
+/* Tokens.  */
+#define LABEL 258
+#define VARIABLE 259
+#define NUMBER 260
+#define TEXT 261
+#define COMMAND_LINE 262
+#define DELIMITED 263
+#define ORDINAL 264
+#define TH 265
+#define LEFT_ARROW_HEAD 266
+#define RIGHT_ARROW_HEAD 267
+#define DOUBLE_ARROW_HEAD 268
+#define LAST 269
+#define BOX 270
+#define CIRCLE 271
+#define ELLIPSE 272
+#define ARC 273
+#define LINE 274
+#define ARROW 275
+#define MOVE 276
+#define SPLINE 277
+#define HEIGHT 278
+#define RADIUS 279
+#define FIGNAME 280
+#define WIDTH 281
+#define DIAMETER 282
+#define UP 283
+#define DOWN 284
+#define RIGHT 285
+#define LEFT 286
+#define FROM 287
+#define TO 288
+#define AT 289
+#define WITH 290
+#define BY 291
+#define THEN 292
+#define SOLID 293
+#define DOTTED 294
+#define DASHED 295
+#define CHOP 296
+#define SAME 297
+#define INVISIBLE 298
+#define LJUST 299
+#define RJUST 300
+#define ABOVE 301
+#define BELOW 302
+#define OF 303
+#define THE 304
+#define WAY 305
+#define BETWEEN 306
+#define AND 307
+#define HERE 308
+#define DOT_N 309
+#define DOT_E 310
+#define DOT_W 311
+#define DOT_S 312
+#define DOT_NE 313
+#define DOT_SE 314
+#define DOT_NW 315
+#define DOT_SW 316
+#define DOT_C 317
+#define DOT_START 318
+#define DOT_END 319
+#define DOT_X 320
+#define DOT_Y 321
+#define DOT_HT 322
+#define DOT_WID 323
+#define DOT_RAD 324
+#define SIN 325
+#define COS 326
+#define ATAN2 327
+#define LOG 328
+#define EXP 329
+#define SQRT 330
+#define K_MAX 331
+#define K_MIN 332
+#define INT 333
+#define RAND 334
+#define SRAND 335
+#define COPY 336
+#define THRU 337
+#define TOP 338
+#define BOTTOM 339
+#define UPPER 340
+#define LOWER 341
+#define SH 342
+#define PRINT 343
+#define CW 344
+#define CCW 345
+#define FOR 346
+#define DO 347
+#define IF 348
+#define ELSE 349
+#define ANDAND 350
+#define OROR 351
+#define NOTEQUAL 352
+#define EQUALEQUAL 353
+#define LESSEQUAL 354
+#define GREATEREQUAL 355
+#define LEFT_CORNER 356
+#define RIGHT_CORNER 357
+#define NORTH 358
+#define SOUTH 359
+#define EAST 360
+#define WEST 361
+#define CENTER 362
+#define END 363
+#define START 364
+#define RESET 365
+#define UNTIL 366
+#define PLOT 367
+#define THICKNESS 368
+#define FILL 369
+#define COLORED 370
+#define OUTLINED 371
+#define SHADED 372
+#define XSLANTED 373
+#define YSLANTED 374
+#define ALIGNED 375
+#define SPRINTF 376
+#define COMMAND 377
+#define DEFINE 378
+#define UNDEF 379
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1676 of yacc.c  */
+#line 67 "pic.y"
+
 	char *str;
 	int n;
 	double x;
@@ -137,5 +313,17 @@
 	saved_state *pstate;
 	graphics_state state;
 	object_type obtype;
+
+
+
+/* Line 1676 of yacc.c  */
+#line 321 "y.tab.h"
 } YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
 extern YYSTYPE yylval;
+
+
diff -ruN groff-1.20.1/src/preproc/pic/pic.y groff-1.21/src/preproc/pic/pic.y
--- groff-1.20.1/src/preproc/pic/pic.y	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/pic/pic.y	2010-12-31 08:33:08.000000000 +0100
@@ -17,6 +17,7 @@
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
 %{
 #include "pic.h"
 #include "ptable.h"
@@ -61,6 +62,7 @@
 
 %}
 
+%expect 2
 
 %union {
 	char *str;
@@ -253,7 +255,7 @@
 %right '!'
 %right '^'
 
-%type <x> expr any_expr text_expr
+%type <x> expr expr_lower_than expr_not_lower_than any_expr text_expr
 %type <by> optional_by
 %type <pair> expr_pair position_not_place
 %type <if_data> simple_if
@@ -1205,12 +1207,13 @@
 		  $$.x = (1.0 - $2)*$4.x + $2*$6.x;
 		  $$.y = (1.0 - $2)*$4.y + $2*$6.y;
 		}
-	| expr '<' position ',' position '>'
+	/* the next two rules cause harmless shift/reduce warnings */
+	| expr_not_lower_than '<' position ',' position '>'
 		{
 		  $$.x = (1.0 - $1)*$3.x + $1*$5.x;
 		  $$.y = (1.0 - $1)*$3.y + $1*$5.y;
 		}
-	| '(' expr '<' position ',' position '>' ')'
+	| '(' expr_not_lower_than '<' position ',' position '>' ')'
 		{
 		  $$.x = (1.0 - $2)*$4.x + $2*$6.x;
 		  $$.y = (1.0 - $2)*$4.y + $2*$6.y;
@@ -1481,6 +1484,18 @@
 	;
 
 expr:
+	expr_lower_than
+		{ $$ = $1; }
+	| expr_not_lower_than
+		{ $$ = $1; }
+	;
+
+expr_lower_than:
+	expr '<' expr
+		{ $$ = ($1 < $3); }
+	;
+
+expr_not_lower_than:
 	VARIABLE
 		{
 		  if (!lookup_variable($1, & $$)) {
@@ -1642,8 +1657,6 @@
 		  $$ = 0;
 		  srand((unsigned int)$3);
 		}
-	| expr '<' expr
-		{ $$ = ($1 < $3); }
 	| expr LESSEQUAL expr
 		{ $$ = ($1 <= $3); }
 	| expr '>' expr
diff -ruN groff-1.20.1/src/preproc/pic/troff.cpp groff-1.21/src/preproc/pic/troff.cpp
--- groff-1.20.1/src/preproc/pic/troff.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/pic/troff.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -462,7 +462,7 @@
       fputs("\n.sp -1\n", stdout);
     }
   if (rotate_flag)
-    printf(".if '\\*(.T'ps' \\{\\\n"
+    printf(".if \\n(" GROPS_REG " \\{\\\n"
 	   "\\X'ps: exec grestore'\n.sp -1\n"
 	   ".\\}\n");
 }
diff -ruN groff-1.20.1/src/preproc/refer/label.cpp groff-1.21/src/preproc/refer/label.cpp
--- groff-1.20.1/src/preproc/refer/label.cpp	2009-01-09 15:25:53.000000000 +0100
+++ groff-1.21/src/preproc/refer/label.cpp	2010-12-31 08:33:11.000000000 +0100
@@ -1,37 +1,75 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
 
-#include <stdlib.h>
-#include <string.h>
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20081224
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.4.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
 
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-#ifdef YYPARSE_PARAM_TYPE
-#define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-#else
-#define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-#endif
-#else
-#define YYPARSE_DECL() yyparse(void)
-#endif /* YYPARSE_PARAM */
 
-extern int YYPARSE_DECL();
+/* Copy the first part of user declarations.  */
+
+/* Line 189 of yacc.c  */
+#line 21 "label.y"
 
-static int yygrowstack(void);
-#define YYPREFIX "yy"
-#line 22 "label.y"
 
 #include "refer.h"
 #include "refid.h"
@@ -56,7 +94,7 @@
 
 struct expression {
   enum {
-    /* Does the tentative label depend on the reference?*/
+    // Does the tentative label depend on the reference?
     CONTAINS_VARIABLE = 01, 
     CONTAINS_STAR = 02,
     CONTAINS_FORMAT = 04,
@@ -112,372 +150,1908 @@
   unsigned analyze() { return expr ? expr->analyze() : 0; }
 };
 
-/* This caches the analysis of an expression.*/
+// This caches the analysis of an expression.
+
+class analyzed_expr : public unary_expr {
+  unsigned flags;
+public:
+  analyzed_expr(expression *);
+  void evaluate(int, const reference &, string &, substring_position &);
+  unsigned analyze() { return flags; }
+};
+
+class star_expr : public unary_expr {
+public:
+  star_expr(expression *e) : unary_expr(e) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+  unsigned analyze() {
+    return ((expr ? (expr->analyze() & ~CONTAINS_VARIABLE) : 0)
+	    | CONTAINS_STAR);
+  }
+};
+
+typedef void map_func(const char *, const char *, string &);
+
+class map_expr : public unary_expr {
+  map_func *func;
+public:
+  map_expr(expression *e, map_func *f) : unary_expr(e), func(f) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+  
+typedef const char *extractor_func(const char *, const char *, const char **);
+
+class extractor_expr : public unary_expr {
+  int part;
+  extractor_func *func;
+public:
+  enum { BEFORE = +1, MATCH = 0, AFTER = -1 };
+  extractor_expr(expression *e, extractor_func *f, int pt)
+    : unary_expr(e), part(pt), func(f) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class truncate_expr : public unary_expr {
+  int n;
+public:
+  truncate_expr(expression *e, int i) : unary_expr(e), n(i) { } 
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class separator_expr : public unary_expr {
+public:
+  separator_expr(expression *e) : unary_expr(e) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class binary_expr : public expression {
+protected:
+  expression *expr1;
+  expression *expr2;
+public:
+  binary_expr(expression *e1, expression *e2) : expr1(e1), expr2(e2) { }
+  ~binary_expr() { delete expr1; delete expr2; }
+  void evaluate(int, const reference &, string &, substring_position &) = 0;
+  unsigned analyze() {
+    return (expr1 ? expr1->analyze() : 0) | (expr2 ? expr2->analyze() : 0);
+  }
+};
+
+class alternative_expr : public binary_expr {
+public:
+  alternative_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class list_expr : public binary_expr {
+public:
+  list_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class substitute_expr : public binary_expr {
+public:
+  substitute_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+class ternary_expr : public expression {
+protected:
+  expression *expr1;
+  expression *expr2;
+  expression *expr3;
+public:
+  ternary_expr(expression *e1, expression *e2, expression *e3)
+    : expr1(e1), expr2(e2), expr3(e3) { }
+  ~ternary_expr() { delete expr1; delete expr2; delete expr3; }
+  void evaluate(int, const reference &, string &, substring_position &) = 0;
+  unsigned analyze() {
+    return ((expr1 ? expr1->analyze() : 0)
+	    | (expr2 ? expr2->analyze() : 0)
+	    | (expr3 ? expr3->analyze() : 0));
+  }
+};
+
+class conditional_expr : public ternary_expr {
+public:
+  conditional_expr(expression *e1, expression *e2, expression *e3)
+    : ternary_expr(e1, e2, e3) { }
+  void evaluate(int, const reference &, string &, substring_position &);
+};
+
+static expression *parsed_label = 0;
+static expression *parsed_date_label = 0;
+static expression *parsed_short_label = 0;
+
+static expression *parse_result;
+
+string literals;
+
+
+
+/* Line 189 of yacc.c  */
+#line 274 "label.cpp"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TOKEN_LETTER = 258,
+     TOKEN_LITERAL = 259,
+     TOKEN_DIGIT = 260
+   };
+#endif
+/* Tokens.  */
+#define TOKEN_LETTER 258
+#define TOKEN_LITERAL 259
+#define TOKEN_DIGIT 260
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 214 of yacc.c  */
+#line 221 "label.y"
+
+  int num;
+  expression *expr;
+  struct { int ndigits; int val; } dig;
+  struct { int start; int len; } str;
+
+
+
+/* Line 214 of yacc.c  */
+#line 329 "label.cpp"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 264 of yacc.c  */
+#line 341 "label.cpp"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
+{
+  return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  21
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   39
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  21
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  12
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  34
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  49
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   260
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,    12,     9,     2,
+      17,    18,    16,    14,     2,    15,    13,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     7,     2,
+      19,     2,    20,     6,    11,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     8,     2,    10,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     5,     7,    13,    14,    16,    18,    22,
+      26,    28,    31,    33,    37,    39,    41,    43,    46,    49,
+      52,    58,    62,    66,    69,    73,    77,    78,    80,    82,
+      85,    87,    90,    91,    93
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      22,     0,    -1,    24,    -1,    25,    -1,    25,     6,    24,
+       7,    23,    -1,    -1,    23,    -1,    26,    -1,    25,     8,
+      26,    -1,    25,     9,    26,    -1,    27,    -1,    26,    27,
+      -1,    28,    -1,    27,    10,    28,    -1,    11,    -1,     4,
+      -1,     3,    -1,     3,    30,    -1,    12,     3,    -1,    12,
+      31,    -1,    28,    13,    32,     3,    29,    -1,    28,    14,
+      30,    -1,    28,    15,    30,    -1,    28,    16,    -1,    17,
+      24,    18,    -1,    19,    24,    20,    -1,    -1,    30,    -1,
+       5,    -1,    30,     5,    -1,     5,    -1,    31,     5,    -1,
+      -1,    14,    -1,    15,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   249,   249,   254,   256,   262,   263,   268,   270,   272,
+     277,   279,   284,   286,   291,   293,   298,   300,   302,   318,
+     322,   353,   355,   357,   359,   361,   367,   368,   373,   375,
+     380,   382,   389,   390,   392
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "TOKEN_LETTER", "TOKEN_LITERAL",
+  "TOKEN_DIGIT", "'?'", "':'", "'|'", "'&'", "'~'", "'@'", "'%'", "'.'",
+  "'+'", "'-'", "'*'", "'('", "')'", "'<'", "'>'", "$accept", "expr",
+  "conditional", "optional_conditional", "alternative", "list",
+  "substitute", "string", "optional_number", "number", "digits", "flag", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,    63,    58,   124,    38,
+     126,    64,    37,    46,    43,    45,    42,    40,    41,    60,
+      62
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    21,    22,    23,    23,    24,    24,    25,    25,    25,
+      26,    26,    27,    27,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    29,    29,    30,    30,
+      31,    31,    32,    32,    32
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     5,     0,     1,     1,     3,     3,
+       1,     2,     1,     3,     1,     1,     1,     2,     2,     2,
+       5,     3,     3,     2,     3,     3,     0,     1,     1,     2,
+       1,     2,     0,     1,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       5,    16,    15,    14,     0,     5,     5,     0,     6,     2,
+       3,     7,    10,    12,    28,    17,    18,    30,    19,     0,
+       0,     1,     5,     0,     0,    11,     0,    32,     0,     0,
+      23,    29,    31,    24,    25,     0,     8,     9,    13,    33,
+      34,     0,    21,    22,     0,    26,     4,    20,    27
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     7,     8,     9,    10,    11,    12,    13,    47,    15,
+      18,    41
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -26
+static const yytype_int8 yypact[] =
+{
+       2,    11,   -26,   -26,    12,     2,     2,    24,   -26,   -26,
+      21,     2,    18,    -6,   -26,    26,   -26,   -26,    27,    15,
+      14,   -26,     2,     2,     2,    18,     2,    -3,    11,    11,
+     -26,   -26,   -26,   -26,   -26,    28,     2,     2,    -6,   -26,
+     -26,    33,    26,    26,     2,    11,   -26,   -26,    26
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -26,   -26,    -7,    -4,   -26,    -1,   -11,    13,   -26,   -25,
+     -26,   -26
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] =
+{
+      25,    19,    20,    42,    43,     1,     2,    27,    28,    29,
+      30,    39,    40,     3,     4,    16,    14,    17,    35,     5,
+      48,     6,    36,    37,    21,    25,    25,    22,    26,    23,
+      24,    31,    32,    33,    34,    44,    45,    46,     0,    38
+};
+
+static const yytype_int8 yycheck[] =
+{
+      11,     5,     6,    28,    29,     3,     4,    13,    14,    15,
+      16,    14,    15,    11,    12,     3,     5,     5,    22,    17,
+      45,    19,    23,    24,     0,    36,    37,     6,    10,     8,
+       9,     5,     5,    18,    20,     7,     3,    44,    -1,    26
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     3,     4,    11,    12,    17,    19,    22,    23,    24,
+      25,    26,    27,    28,     5,    30,     3,     5,    31,    24,
+      24,     0,     6,     8,     9,    27,    10,    13,    14,    15,
+      16,     5,     5,    18,    20,    24,    26,    26,    28,    14,
+      15,    32,    30,    30,     7,     3,    23,    29,    30
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+
+/* Line 1455 of yacc.c  */
+#line 250 "label.y"
+    { parse_result = ((yyvsp[(1) - (1)].expr) ? new analyzed_expr((yyvsp[(1) - (1)].expr)) : 0); }
+    break;
+
+  case 3:
+
+/* Line 1455 of yacc.c  */
+#line 255 "label.y"
+    { (yyval.expr) = (yyvsp[(1) - (1)].expr); }
+    break;
+
+  case 4:
+
+/* Line 1455 of yacc.c  */
+#line 257 "label.y"
+    { (yyval.expr) = new conditional_expr((yyvsp[(1) - (5)].expr), (yyvsp[(3) - (5)].expr), (yyvsp[(5) - (5)].expr)); }
+    break;
+
+  case 5:
+
+/* Line 1455 of yacc.c  */
+#line 262 "label.y"
+    { (yyval.expr) = 0; }
+    break;
+
+  case 6:
+
+/* Line 1455 of yacc.c  */
+#line 264 "label.y"
+    { (yyval.expr) = (yyvsp[(1) - (1)].expr); }
+    break;
+
+  case 7:
+
+/* Line 1455 of yacc.c  */
+#line 269 "label.y"
+    { (yyval.expr) = (yyvsp[(1) - (1)].expr); }
+    break;
+
+  case 8:
+
+/* Line 1455 of yacc.c  */
+#line 271 "label.y"
+    { (yyval.expr) = new alternative_expr((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
+    break;
+
+  case 9:
+
+/* Line 1455 of yacc.c  */
+#line 273 "label.y"
+    { (yyval.expr) = new conditional_expr((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), 0); }
+    break;
+
+  case 10:
+
+/* Line 1455 of yacc.c  */
+#line 278 "label.y"
+    { (yyval.expr) = (yyvsp[(1) - (1)].expr); }
+    break;
+
+  case 11:
+
+/* Line 1455 of yacc.c  */
+#line 280 "label.y"
+    { (yyval.expr) = new list_expr((yyvsp[(1) - (2)].expr), (yyvsp[(2) - (2)].expr)); }
+    break;
+
+  case 12:
+
+/* Line 1455 of yacc.c  */
+#line 285 "label.y"
+    { (yyval.expr) = (yyvsp[(1) - (1)].expr); }
+    break;
+
+  case 13:
+
+/* Line 1455 of yacc.c  */
+#line 287 "label.y"
+    { (yyval.expr) = new substitute_expr((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
+    break;
+
+  case 14:
+
+/* Line 1455 of yacc.c  */
+#line 292 "label.y"
+    { (yyval.expr) = new at_expr; }
+    break;
+
+  case 15:
+
+/* Line 1455 of yacc.c  */
+#line 294 "label.y"
+    {
+		  (yyval.expr) = new literal_expr(literals.contents() + (yyvsp[(1) - (1)].str).start,
+					(yyvsp[(1) - (1)].str).len);
+		}
+    break;
+
+  case 16:
+
+/* Line 1455 of yacc.c  */
+#line 299 "label.y"
+    { (yyval.expr) = new field_expr((yyvsp[(1) - (1)].num), 0); }
+    break;
+
+  case 17:
+
+/* Line 1455 of yacc.c  */
+#line 301 "label.y"
+    { (yyval.expr) = new field_expr((yyvsp[(1) - (2)].num), (yyvsp[(2) - (2)].num) - 1); }
+    break;
+
+  case 18:
+
+/* Line 1455 of yacc.c  */
+#line 303 "label.y"
+    {
+		  switch ((yyvsp[(2) - (2)].num)) {
+		  case 'I':
+		  case 'i':
+		  case 'A':
+		  case 'a':
+		    (yyval.expr) = new format_expr((yyvsp[(2) - (2)].num));
+		    break;
+		  default:
+		    command_error("unrecognized format `%1'", char((yyvsp[(2) - (2)].num)));
+		    (yyval.expr) = new format_expr('a');
+		    break;
+		  }
+		}
+    break;
+
+  case 19:
+
+/* Line 1455 of yacc.c  */
+#line 319 "label.y"
+    {
+		  (yyval.expr) = new format_expr('0', (yyvsp[(2) - (2)].dig).ndigits, (yyvsp[(2) - (2)].dig).val);
+		}
+    break;
+
+  case 20:
+
+/* Line 1455 of yacc.c  */
+#line 323 "label.y"
+    {
+		  switch ((yyvsp[(4) - (5)].num)) {
+		  case 'l':
+		    (yyval.expr) = new map_expr((yyvsp[(1) - (5)].expr), lowercase);
+		    break;
+		  case 'u':
+		    (yyval.expr) = new map_expr((yyvsp[(1) - (5)].expr), uppercase);
+		    break;
+		  case 'c':
+		    (yyval.expr) = new map_expr((yyvsp[(1) - (5)].expr), capitalize);
+		    break;
+		  case 'r':
+		    (yyval.expr) = new map_expr((yyvsp[(1) - (5)].expr), reverse_name);
+		    break;
+		  case 'a':
+		    (yyval.expr) = new map_expr((yyvsp[(1) - (5)].expr), abbreviate_name);
+		    break;
+		  case 'y':
+		    (yyval.expr) = new extractor_expr((yyvsp[(1) - (5)].expr), find_year, (yyvsp[(3) - (5)].num));
+		    break;
+		  case 'n':
+		    (yyval.expr) = new extractor_expr((yyvsp[(1) - (5)].expr), find_last_name, (yyvsp[(3) - (5)].num));
+		    break;
+		  default:
+		    (yyval.expr) = (yyvsp[(1) - (5)].expr);
+		    command_error("unknown function `%1'", char((yyvsp[(4) - (5)].num)));
+		    break;
+		  }
+		}
+    break;
+
+  case 21:
+
+/* Line 1455 of yacc.c  */
+#line 354 "label.y"
+    { (yyval.expr) = new truncate_expr((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].num)); }
+    break;
+
+  case 22:
+
+/* Line 1455 of yacc.c  */
+#line 356 "label.y"
+    { (yyval.expr) = new truncate_expr((yyvsp[(1) - (3)].expr), -(yyvsp[(3) - (3)].num)); }
+    break;
+
+  case 23:
+
+/* Line 1455 of yacc.c  */
+#line 358 "label.y"
+    { (yyval.expr) = new star_expr((yyvsp[(1) - (2)].expr)); }
+    break;
+
+  case 24:
+
+/* Line 1455 of yacc.c  */
+#line 360 "label.y"
+    { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
+    break;
+
+  case 25:
+
+/* Line 1455 of yacc.c  */
+#line 362 "label.y"
+    { (yyval.expr) = new separator_expr((yyvsp[(2) - (3)].expr)); }
+    break;
+
+  case 26:
+
+/* Line 1455 of yacc.c  */
+#line 367 "label.y"
+    { (yyval.num) = -1; }
+    break;
+
+  case 27:
+
+/* Line 1455 of yacc.c  */
+#line 369 "label.y"
+    { (yyval.num) = (yyvsp[(1) - (1)].num); }
+    break;
+
+  case 28:
+
+/* Line 1455 of yacc.c  */
+#line 374 "label.y"
+    { (yyval.num) = (yyvsp[(1) - (1)].num); }
+    break;
+
+  case 29:
+
+/* Line 1455 of yacc.c  */
+#line 376 "label.y"
+    { (yyval.num) = (yyvsp[(1) - (2)].num)*10 + (yyvsp[(2) - (2)].num); }
+    break;
+
+  case 30:
+
+/* Line 1455 of yacc.c  */
+#line 381 "label.y"
+    { (yyval.dig).ndigits = 1; (yyval.dig).val = (yyvsp[(1) - (1)].num); }
+    break;
+
+  case 31:
+
+/* Line 1455 of yacc.c  */
+#line 383 "label.y"
+    { (yyval.dig).ndigits = (yyvsp[(1) - (2)].dig).ndigits + 1; (yyval.dig).val = (yyvsp[(1) - (2)].dig).val*10 + (yyvsp[(2) - (2)].num); }
+    break;
+
+  case 32:
+
+/* Line 1455 of yacc.c  */
+#line 389 "label.y"
+    { (yyval.num) = 0; }
+    break;
+
+  case 33:
+
+/* Line 1455 of yacc.c  */
+#line 391 "label.y"
+    { (yyval.num) = 1; }
+    break;
+
+  case 34:
 
-class analyzed_expr : public unary_expr {
-  unsigned flags;
-public:
-  analyzed_expr(expression *);
-  void evaluate(int, const reference &, string &, substring_position &);
-  unsigned analyze() { return flags; }
-};
+/* Line 1455 of yacc.c  */
+#line 393 "label.y"
+    { (yyval.num) = -1; }
+    break;
 
-class star_expr : public unary_expr {
-public:
-  star_expr(expression *e) : unary_expr(e) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-  unsigned analyze() {
-    return ((expr ? (expr->analyze() & ~CONTAINS_VARIABLE) : 0)
-	    | CONTAINS_STAR);
-  }
-};
 
-typedef void map_func(const char *, const char *, string &);
 
-class map_expr : public unary_expr {
-  map_func *func;
-public:
-  map_expr(expression *e, map_func *f) : unary_expr(e), func(f) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
-  
-typedef const char *extractor_func(const char *, const char *, const char **);
+/* Line 1455 of yacc.c  */
+#line 1842 "label.cpp"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-class extractor_expr : public unary_expr {
-  int part;
-  extractor_func *func;
-public:
-  enum { BEFORE = +1, MATCH = 0, AFTER = -1 };
-  extractor_expr(expression *e, extractor_func *f, int pt)
-    : unary_expr(e), part(pt), func(f) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
 
-class truncate_expr : public unary_expr {
-  int n;
-public:
-  truncate_expr(expression *e, int i) : unary_expr(e), n(i) { } 
-  void evaluate(int, const reference &, string &, substring_position &);
-};
+  *++yyvsp = yyval;
 
-class separator_expr : public unary_expr {
-public:
-  separator_expr(expression *e) : unary_expr(e) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
-class binary_expr : public expression {
-protected:
-  expression *expr1;
-  expression *expr2;
-public:
-  binary_expr(expression *e1, expression *e2) : expr1(e1), expr2(e2) { }
-  ~binary_expr() { delete expr1; delete expr2; }
-  void evaluate(int, const reference &, string &, substring_position &) = 0;
-  unsigned analyze() {
-    return (expr1 ? expr1->analyze() : 0) | (expr2 ? expr2->analyze() : 0);
-  }
-};
+  yyn = yyr1[yyn];
 
-class alternative_expr : public binary_expr {
-public:
-  alternative_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
-class list_expr : public binary_expr {
-public:
-  list_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
+  goto yynewstate;
 
-class substitute_expr : public binary_expr {
-public:
-  substitute_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
 
-class ternary_expr : public expression {
-protected:
-  expression *expr1;
-  expression *expr2;
-  expression *expr3;
-public:
-  ternary_expr(expression *e1, expression *e2, expression *e3)
-    : expr1(e1), expr2(e2), expr3(e3) { }
-  ~ternary_expr() { delete expr1; delete expr2; delete expr3; }
-  void evaluate(int, const reference &, string &, substring_position &) = 0;
-  unsigned analyze() {
-    return ((expr1 ? expr1->analyze() : 0)
-	    | (expr2 ? expr2->analyze() : 0)
-	    | (expr3 ? expr3->analyze() : 0));
-  }
-};
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
 
-class conditional_expr : public ternary_expr {
-public:
-  conditional_expr(expression *e1, expression *e2, expression *e3)
-    : ternary_expr(e1, e2, e3) { }
-  void evaluate(int, const reference &, string &, substring_position &);
-};
 
-static expression *parsed_label = 0;
-static expression *parsed_date_label = 0;
-static expression *parsed_short_label = 0;
 
-static expression *parse_result;
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
 
-string literals;
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
 
-#line 221 "label.y"
-typedef union {
-  int num;
-  expression *expr;
-  struct { int ndigits; int val; } dig;
-  struct { int start; int len; } str;
-} YYSTYPE;
-#line 239 "label.cpp"
-#define TOKEN_LETTER 257
-#define TOKEN_LITERAL 258
-#define TOKEN_DIGIT 259
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    1,    1,    6,    6,    2,    2,    2,    3,    3,
-    5,    5,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    9,    9,    7,    7,    8,    8,
-   10,   10,   10,
-};
-static const short yylen[] = {                            2,
-    1,    1,    5,    0,    1,    1,    3,    3,    1,    2,
-    1,    3,    1,    1,    1,    2,    2,    2,    5,    3,
-    3,    2,    3,    3,    0,    1,    1,    2,    1,    2,
-    0,    1,    1,
-};
-static const short yydefred[] = {                         0,
-    0,   14,   13,    0,    0,    0,    0,    5,    0,    0,
-    0,    0,    1,   27,    0,   17,   29,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   22,    0,   28,
-   30,   23,   24,    0,    0,    0,   32,   33,    0,    0,
-    0,    0,    0,    0,    3,    0,   19,
-};
-static const short yydgoto[] = {                          7,
-    8,    9,   10,   11,   12,   13,   15,   18,   47,   39,
-};
-static const short yysindex[] = {                       -32,
- -257,    0,    0, -240,  -32,  -32,    0,    0,  -18,  -32,
-  -36, -114,    0,    0, -246,    0,    0, -241,  -14,  -39,
-  -32,  -32,  -32, -114,  -21, -257, -257,    0,  -32,    0,
-    0,    0,    0,  -25,  -32,  -32,    0,    0, -223, -246,
- -246,  -36,  -32, -257,    0, -246,    0,
-};
-static const short yyrindex[] = {                        35,
-    1,    0,    0,    0,   -5,   -4,    0,    0,   14,  208,
-  159,  224,    0,    0,   11,    0,    0,   40,    0,    0,
-    2,    0,    0,  253, -220,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  263,  281,    0,    0,    0,   50,
-  105,  214,    0,  115,    0,  149,    0,
-};
-static const short yygindex[] = {                         0,
-   19,    0,    7,   37,  -10,   10,  -23,    0,    0,    0,
-};
-#define YYTABLESIZE 511
-static const short yytable[] = {                         24,
-   15,   14,   40,   41,    4,   28,   26,    5,   27,   25,
-   16,   29,   30,    2,   19,   20,   16,   31,   17,   23,
-   46,   37,   33,   38,   24,   24,   32,    6,   35,   36,
-   34,    3,   43,   44,    4,    4,   31,   15,   15,   18,
-   15,   15,   15,   15,   21,   15,   15,   16,   16,   20,
-   16,   16,   16,   16,    2,   16,   16,    4,   15,    4,
-   15,   45,   15,   15,   15,   42,    0,    0,   16,    0,
-   16,    2,   16,   16,   16,    2,   18,   18,    0,   18,
-   18,   18,   18,    0,   18,   18,   20,   20,    0,   20,
-   20,   20,   20,    0,   20,   20,    0,   18,    0,   18,
-    0,   18,   18,   18,   21,   22,    0,   20,    0,   20,
-    0,   20,   20,   20,   25,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   15,    0,   15,    0,    0,    0,
-    0,    0,    0,    0,   16,    0,   16,    0,    0,    0,
-    0,   21,   21,    0,   21,   21,   21,   21,   26,   21,
-   21,   25,   25,    0,   25,   25,   25,   25,   11,   25,
-   25,    0,   21,   18,   21,   18,   21,   21,   21,    0,
-    0,    0,   25,   20,   25,   20,   25,   25,   25,    0,
-    0,    0,    0,    0,    0,   26,   26,    0,   26,   26,
-   26,   26,    0,   26,   26,   11,   11,    0,   11,   11,
-    0,    0,    0,    0,    0,    0,   26,    6,   26,    0,
-   26,   26,   26,   12,    0,    0,   11,    0,   11,    0,
-   11,   11,   11,    9,    1,    2,    0,    0,   21,    0,
-   21,    0,    0,    0,    0,    0,    0,    0,   25,    0,
-   25,    0,    0,    0,    0,    6,    0,    0,    6,    0,
-   12,   12,   10,   12,   12,    0,    0,   15,   15,    0,
-    9,    9,    7,    9,    9,    6,    0,   16,   16,    6,
-    6,   12,   26,   12,   26,   12,   12,   12,    0,    0,
-    8,    9,   11,    9,   11,    9,    9,    9,    0,   10,
-   10,    0,   10,   10,    0,    0,   18,   18,    0,    0,
-    7,    0,    0,    7,    0,    0,   20,   20,    0,    0,
-   10,    0,   10,    0,   10,   10,   10,    0,    8,    0,
-    7,    8,    0,    0,    7,    7,    0,    0,    0,    0,
-    0,    6,    0,    0,    0,    0,    0,   12,    8,   12,
-    0,    0,    8,    8,    0,    0,    0,    9,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   21,   21,    0,    0,    0,    0,    0,    0,    0,
-    0,   25,   25,    0,    0,    0,   10,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    7,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    8,   26,   26,    0,    0,    0,
-    0,    0,    0,    0,    0,   11,   11,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   12,   12,    0,    0,    0,    0,    0,    0,    0,    0,
-    9,    9,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   10,
-   10,
-};
-static const short yycheck[] = {                         10,
-    0,  259,   26,   27,   37,   42,   43,   40,   45,   46,
-    0,  126,  259,    0,    5,    6,  257,  259,  259,   38,
-   44,   43,   62,   45,   35,   36,   41,   60,   22,   23,
-   21,   64,   58,  257,    0,   41,  257,   37,   38,    0,
-   40,   41,   42,   43,   63,   45,   46,   37,   38,    0,
-   40,   41,   42,   43,   41,   45,   46,   62,   58,   58,
-   60,   43,   62,   63,   64,   29,   -1,   -1,   58,   -1,
-   60,   58,   62,   63,   64,   62,   37,   38,   -1,   40,
-   41,   42,   43,   -1,   45,   46,   37,   38,   -1,   40,
-   41,   42,   43,   -1,   45,   46,   -1,   58,   -1,   60,
-   -1,   62,   63,   64,    0,  124,   -1,   58,   -1,   60,
-   -1,   62,   63,   64,    0,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,   -1,  126,   -1,   -1,   -1,
-   -1,   37,   38,   -1,   40,   41,   42,   43,    0,   45,
-   46,   37,   38,   -1,   40,   41,   42,   43,    0,   45,
-   46,   -1,   58,  124,   60,  126,   62,   63,   64,   -1,
-   -1,   -1,   58,  124,   60,  126,   62,   63,   64,   -1,
-   -1,   -1,   -1,   -1,   -1,   37,   38,   -1,   40,   41,
-   42,   43,   -1,   45,   46,   37,   38,   -1,   40,   41,
-   -1,   -1,   -1,   -1,   -1,   -1,   58,    0,   60,   -1,
-   62,   63,   64,    0,   -1,   -1,   58,   -1,   60,   -1,
-   62,   63,   64,    0,  257,  258,   -1,   -1,  124,   -1,
-  126,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,
-  126,   -1,   -1,   -1,   -1,   38,   -1,   -1,   41,   -1,
-   37,   38,    0,   40,   41,   -1,   -1,  257,  258,   -1,
-   37,   38,    0,   40,   41,   58,   -1,  257,  258,   62,
-   63,   58,  124,   60,  126,   62,   63,   64,   -1,   -1,
-    0,   58,  124,   60,  126,   62,   63,   64,   -1,   37,
-   38,   -1,   40,   41,   -1,   -1,  257,  258,   -1,   -1,
-   38,   -1,   -1,   41,   -1,   -1,  257,  258,   -1,   -1,
-   58,   -1,   60,   -1,   62,   63,   64,   -1,   38,   -1,
-   58,   41,   -1,   -1,   62,   63,   -1,   -1,   -1,   -1,
-   -1,  124,   -1,   -1,   -1,   -1,   -1,  124,   58,  126,
-   -1,   -1,   62,   63,   -1,   -1,   -1,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,   -1,   -1,   -1,  124,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,  257,  258,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  257,  258,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  257,  258,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,
-};
-#define YYFINAL 7
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 259
-#if YYDEBUG
-static const char *yyname[] = {
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,"'%'","'&'",0,"'('","')'","'*'","'+'",0,"'-'","'.'",0,0,0,0,0,0,0,0,0,0,0,
-"':'",0,"'<'",0,"'>'","'?'","'@'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'|'",0,
-"'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,"TOKEN_LETTER","TOKEN_LITERAL","TOKEN_DIGIT",
-};
-static const char *yyrule[] = {
-"$accept : expr",
-"expr : optional_conditional",
-"conditional : alternative",
-"conditional : alternative '?' optional_conditional ':' conditional",
-"optional_conditional :",
-"optional_conditional : conditional",
-"alternative : list",
-"alternative : alternative '|' list",
-"alternative : alternative '&' list",
-"list : substitute",
-"list : list substitute",
-"substitute : string",
-"substitute : substitute '~' string",
-"string : '@'",
-"string : TOKEN_LITERAL",
-"string : TOKEN_LETTER",
-"string : TOKEN_LETTER number",
-"string : '%' TOKEN_LETTER",
-"string : '%' digits",
-"string : string '.' flag TOKEN_LETTER optional_number",
-"string : string '+' number",
-"string : string '-' number",
-"string : string '*'",
-"string : '(' optional_conditional ')'",
-"string : '<' optional_conditional '>'",
-"optional_number :",
-"optional_number : number",
-"number : TOKEN_DIGIT",
-"number : number TOKEN_DIGIT",
-"digits : TOKEN_DIGIT",
-"digits : digits TOKEN_DIGIT",
-"flag :",
-"flag : '+'",
-"flag : '-'",
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-};
-#endif
-#if YYDEBUG
-#include <stdio.h>
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
 #endif
 
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+yyreturn:
+  if (yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
 #endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
 
-#define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-int      yyerrflag;
-int      yychar;
-short   *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
+/* Line 1675 of yacc.c  */
+#line 396 "label.y"
 
-/* variables for the parser stack */
-static short   *yyss;
-static short   *yysslim;
-static YYSTYPE *yyvs;
-static unsigned yystacksize;
-#line 397 "label.y"
 
 /* bison defines const to be empty unless __STDC__ is defined, which it
 isn't under cfront */
@@ -1274,426 +2848,4 @@
   }
   return nauthors;
 }
-#line 1277 "label.cpp"
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(void)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = yystacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = yyssp - yyss;
-    newss = (yyss != 0)
-          ? (short *)realloc(yyss, newsize * sizeof(*newss))
-          : (short *)malloc(newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    yyss  = newss;
-    yyssp = newss + i;
-    newvs = (yyvs != 0)
-          ? (YYSTYPE *)realloc(yyvs, newsize * sizeof(*newvs))
-          : (YYSTYPE *)malloc(newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    yyvs = newvs;
-    yyvsp = newvs + i;
-    yystacksize = newsize;
-    yysslim = yyss + newsize - 1;
-    return 0;
-}
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-    if (yyss == NULL && yygrowstack()) goto yyoverflow;
-    yyssp = yyss;
-    yyvsp = yyvs;
-    yystate = 0;
-    *yyssp = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yysslim && yygrowstack())
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yyssp = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yysslim && yygrowstack())
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yyssp = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yyvsp[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 1:
-#line 250 "label.y"
-	{ parse_result = (yyvsp[0].expr ? new analyzed_expr(yyvsp[0].expr) : 0); }
-break;
-case 2:
-#line 255 "label.y"
-	{ yyval.expr = yyvsp[0].expr; }
-break;
-case 3:
-#line 257 "label.y"
-	{ yyval.expr = new conditional_expr(yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); }
-break;
-case 4:
-#line 262 "label.y"
-	{ yyval.expr = 0; }
-break;
-case 5:
-#line 264 "label.y"
-	{ yyval.expr = yyvsp[0].expr; }
-break;
-case 6:
-#line 269 "label.y"
-	{ yyval.expr = yyvsp[0].expr; }
-break;
-case 7:
-#line 271 "label.y"
-	{ yyval.expr = new alternative_expr(yyvsp[-2].expr, yyvsp[0].expr); }
-break;
-case 8:
-#line 273 "label.y"
-	{ yyval.expr = new conditional_expr(yyvsp[-2].expr, yyvsp[0].expr, 0); }
-break;
-case 9:
-#line 278 "label.y"
-	{ yyval.expr = yyvsp[0].expr; }
-break;
-case 10:
-#line 280 "label.y"
-	{ yyval.expr = new list_expr(yyvsp[-1].expr, yyvsp[0].expr); }
-break;
-case 11:
-#line 285 "label.y"
-	{ yyval.expr = yyvsp[0].expr; }
-break;
-case 12:
-#line 287 "label.y"
-	{ yyval.expr = new substitute_expr(yyvsp[-2].expr, yyvsp[0].expr); }
-break;
-case 13:
-#line 292 "label.y"
-	{ yyval.expr = new at_expr; }
-break;
-case 14:
-#line 294 "label.y"
-	{
-		  yyval.expr = new literal_expr(literals.contents() + yyvsp[0].str.start,
-					yyvsp[0].str.len);
-		}
-break;
-case 15:
-#line 299 "label.y"
-	{ yyval.expr = new field_expr(yyvsp[0].num, 0); }
-break;
-case 16:
-#line 301 "label.y"
-	{ yyval.expr = new field_expr(yyvsp[-1].num, yyvsp[0].num - 1); }
-break;
-case 17:
-#line 303 "label.y"
-	{
-		  switch (yyvsp[0].num) {
-		  case 'I':
-		  case 'i':
-		  case 'A':
-		  case 'a':
-		    yyval.expr = new format_expr(yyvsp[0].num);
-		    break;
-		  default:
-		    command_error("unrecognized format `%1'", char(yyvsp[0].num));
-		    yyval.expr = new format_expr('a');
-		    break;
-		  }
-		}
-break;
-case 18:
-#line 319 "label.y"
-	{
-		  yyval.expr = new format_expr('0', yyvsp[0].dig.ndigits, yyvsp[0].dig.val);
-		}
-break;
-case 19:
-#line 323 "label.y"
-	{
-		  switch (yyvsp[-1].num) {
-		  case 'l':
-		    yyval.expr = new map_expr(yyvsp[-4].expr, lowercase);
-		    break;
-		  case 'u':
-		    yyval.expr = new map_expr(yyvsp[-4].expr, uppercase);
-		    break;
-		  case 'c':
-		    yyval.expr = new map_expr(yyvsp[-4].expr, capitalize);
-		    break;
-		  case 'r':
-		    yyval.expr = new map_expr(yyvsp[-4].expr, reverse_name);
-		    break;
-		  case 'a':
-		    yyval.expr = new map_expr(yyvsp[-4].expr, abbreviate_name);
-		    break;
-		  case 'y':
-		    yyval.expr = new extractor_expr(yyvsp[-4].expr, find_year, yyvsp[-2].num);
-		    break;
-		  case 'n':
-		    yyval.expr = new extractor_expr(yyvsp[-4].expr, find_last_name, yyvsp[-2].num);
-		    break;
-		  default:
-		    yyval.expr = yyvsp[-4].expr;
-		    command_error("unknown function `%1'", char(yyvsp[-1].num));
-		    break;
-		  }
-		}
-break;
-case 20:
-#line 354 "label.y"
-	{ yyval.expr = new truncate_expr(yyvsp[-2].expr, yyvsp[0].num); }
-break;
-case 21:
-#line 356 "label.y"
-	{ yyval.expr = new truncate_expr(yyvsp[-2].expr, -yyvsp[0].num); }
-break;
-case 22:
-#line 358 "label.y"
-	{ yyval.expr = new star_expr(yyvsp[-1].expr); }
-break;
-case 23:
-#line 360 "label.y"
-	{ yyval.expr = yyvsp[-1].expr; }
-break;
-case 24:
-#line 362 "label.y"
-	{ yyval.expr = new separator_expr(yyvsp[-1].expr); }
-break;
-case 25:
-#line 367 "label.y"
-	{ yyval.num = -1; }
-break;
-case 26:
-#line 369 "label.y"
-	{ yyval.num = yyvsp[0].num; }
-break;
-case 27:
-#line 374 "label.y"
-	{ yyval.num = yyvsp[0].num; }
-break;
-case 28:
-#line 376 "label.y"
-	{ yyval.num = yyvsp[-1].num*10 + yyvsp[0].num; }
-break;
-case 29:
-#line 381 "label.y"
-	{ yyval.dig.ndigits = 1; yyval.dig.val = yyvsp[0].num; }
-break;
-case 30:
-#line 383 "label.y"
-	{ yyval.dig.ndigits = yyvsp[-1].dig.ndigits + 1; yyval.dig.val = yyvsp[-1].dig.val*10 + yyvsp[0].num; }
-break;
-case 31:
-#line 389 "label.y"
-	{ yyval.num = 0; }
-break;
-case 32:
-#line 391 "label.y"
-	{ yyval.num = 1; }
-break;
-case 33:
-#line 393 "label.y"
-	{ yyval.num = -1; }
-break;
-#line 1640 "label.cpp"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
-#endif
-    if (yyssp >= yysslim && yygrowstack())
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = (short) yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
 
-yyabort:
-    return (1);
-
-yyaccept:
-    return (0);
-}
diff -ruN groff-1.20.1/src/preproc/refer/refer.man groff-1.21/src/preproc/refer/refer.man
--- groff-1.20.1/src/preproc/refer/refer.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/refer/refer.man	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -1462,6 +1462,12 @@
 .IB file @INDEX_SUFFIX@
 Index files.
 .
+.LP
+.B refer
+uses temporary files.
+See the
+.BR groff (@MAN1EXT@)
+man page for details where such files are created.
 .
 .
 .SH ENVIRONMENT
diff -ruN groff-1.20.1/src/preproc/tbl/main.cpp groff-1.21/src/preproc/tbl/main.cpp
--- groff-1.20.1/src/preproc/tbl/main.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/tbl/main.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2007, 2008, 2009
+                 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -498,6 +498,11 @@
 	error("`nospaces' option does not take an argument");
       opt->flags |= table::NOSPACES;
     }
+    else if (strieq(p, "nowarn")) {
+      if (arg)
+	error("`nowarn' option does not take an argument");
+      opt->flags |= table::NOWARN;
+    }
     else if (strieq(p, "decimalpoint")) {
       if (!arg)
 	error("`decimalpoint' option requires argument in parentheses");
diff -ruN groff-1.20.1/src/preproc/tbl/table.cpp groff-1.21/src/preproc/tbl/table.cpp
--- groff-1.20.1/src/preproc/tbl/table.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/tbl/table.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2003, 2004, 2007, 2008,
-                 2009
+                 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -2079,9 +2079,11 @@
   prints("\n");
   prints(".if \\n[" EXPAND_REG "]<0 \\{");
   entry_list->set_location();
-  prints(".tm warning: around line \\n[.c]: table wider than line width\n"
-	 ".nr " EXPAND_REG " 0\n"
-	 ".\\}\n");
+  if (!(flags & NOWARN))
+    prints(".tm1 \"warning: file `\\n[.F]', around line \\n[.c]:\n"
+	   ".tm1 \"  table wider than line width\n"
+	   ".nr " EXPAND_REG " 0\n");
+  prints(".\\}\n");
   if (colcount > 1)
     printfs(".nr " EXPAND_REG " \\n[" EXPAND_REG "]/%1\n",
 	    as_string(colcount));
@@ -2117,13 +2119,17 @@
   printfs("/%1\n", as_string(total_separation));
   prints(".ie \\n[" SEPARATION_FACTOR_REG "]<=0 \\{");
   entry_list->set_location();
-  prints(".tm warning: around line \\n[.c]: column separation set to zero\n"
-	 ".nr " SEPARATION_FACTOR_REG " 0\n"
-	 ".\\}\n"
+  if (!(flags & NOWARN))
+    prints(".tm1 \"warning: file `\\n[.F]', around line \\n[.c]:\n"
+	   ".tm1 \"  column separation set to zero\n"
+	   ".nr " SEPARATION_FACTOR_REG " 0\n");
+  prints(".\\}\n"
 	 ".el .if \\n[" SEPARATION_FACTOR_REG "]<1n \\{");
   entry_list->set_location();
-  prints(".tm warning: around line \\n[.c]: table squeezed horizontally to fit line length\n"
-	 ".\\}\n");
+  if (!(flags & NOWARN))
+    prints(".tm1 \"warning: file `\\n[.F]', around line \\n[.c]:\n"
+	   ".tm1 \"  table squeezed horizontally to fit line length\n");
+  prints(".\\}\n");
 }
 
 void table::compute_column_positions()
diff -ruN groff-1.20.1/src/preproc/tbl/table.h groff-1.21/src/preproc/tbl/table.h
--- groff-1.20.1/src/preproc/tbl/table.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/tbl/table.h	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2007,
-                 2008, 2009
+                 2008, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -142,6 +142,7 @@
     DOUBLEBOX    = 0x00000010,
     NOKEEP       = 0x00000020,
     NOSPACES     = 0x00000040,
+    NOWARN       = 0x00000080,
     EXPERIMENTAL = 0x80000000	// undocumented; use as a hook for experiments
     };
   char *expand;
diff -ruN groff-1.20.1/src/preproc/tbl/tbl.man groff-1.21/src/preproc/tbl/tbl.man
--- groff-1.20.1/src/preproc/tbl/tbl.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/preproc/tbl/tbl.man	2010-12-31 08:33:08.000000000 +0100
@@ -1,7 +1,7 @@
 '\" t
 .ig
 Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2006, 2007, 2008,
-              2009
+              2009, 2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -167,6 +167,11 @@
 Ignore leading and trailing spaces in data items (GNU tbl only).
 .
 .TP
+.B nowarn
+Turn off warnings related to tables
+exceeding the current line width (GNU tbl only).
+.
+.TP
 .BI tab( x )
 Use the character
 .I x
@@ -679,6 +684,16 @@
 .RB ( groff (@MAN1EXT@)
 automatically takes care of the correct order of preprocessors).
 .
+.LP
+It is not advisable to use the hash character (#) as a delimiter for in-line
+equations in
+.BR @g@eqn (@MAN1EXT@)
+since
+.B @g@tbl
+uses a macro called
+.BR .T# ,
+causing a clash.
+.
 .
 .SH "GNU TBL ENHANCEMENTS"
 There is no limit on the number of columns in a table, nor any limit on the
diff -ruN groff-1.20.1/src/roff/groff/groff.cpp groff-1.21/src/roff/groff/groff.cpp
--- groff-1.20.1/src/roff/groff/groff.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/groff/groff.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009
+                 2008, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -157,7 +157,7 @@
       Pargs += '\0';
       break;
     case 'D':
-      commands[PRECONV_INDEX].set_name(command_prefix, "preconv");
+      commands[PRECONV_INDEX].set_name("preconv");
       commands[PRECONV_INDEX].append_arg("-D", optarg);
       break;
     case 'K':
@@ -165,7 +165,7 @@
       Kflag = 1;
       // fall through
     case 'k':
-      commands[PRECONV_INDEX].set_name(command_prefix, "preconv");
+      commands[PRECONV_INDEX].set_name("preconv");
       break;
     case 't':
       commands[TBL_INDEX].set_name(command_prefix, "tbl");
@@ -314,7 +314,7 @@
     }
   }
   if (encoding) {
-    commands[PRECONV_INDEX].set_name(command_prefix, "preconv");
+    commands[PRECONV_INDEX].set_name("preconv");
     if (!Kflag && *encoding)
       commands[PRECONV_INDEX].append_arg("-e", encoding);
   }
diff -ruN groff-1.20.1/src/roff/groff/groff.man groff-1.21/src/roff/groff/groff.man
--- groff-1.20.1/src/roff/groff/groff.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/groff/groff.man	2010-12-31 08:33:08.000000000 +0100
@@ -688,11 +688,17 @@
 .BI \-w\  name
 Enable warning
 .IR name .
+See
+.BR @g@troff (@MAN1EXT@)
+for names.
 .
 .TP
 .BI \-W\  name
 disable warning
 .IR name .
+See
+.BR @g@troff (@MAN1EXT@)
+for names.
 .
 .
 .\" --------------------------------------------------------------------
diff -ruN groff-1.20.1/src/roff/grog/grog.man groff-1.21/src/roff/grog/grog.man
--- groff-1.20.1/src/roff/grog/grog.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/grog/grog.man	2010-12-31 08:33:09.000000000 +0100
@@ -1,7 +1,7 @@
 .TH GROG @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .
 .\" --------------------------------------------------------------------
-.\" Legalize
+.\" Legalese
 .\" --------------------------------------------------------------------
 .
 .ig
@@ -10,10 +10,10 @@
 Source file position:  <groff_source_top>/src/roff/grog/grog.man
 Installed position:    $prefix/share/man/man1/grog.1
 
-Last Update: 5 Jan 2009
+Last Update: 2 Jun 2010
 ..
 .de co
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2006, 2007, 2009
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2006, 2007, 2009, 2010
 Free Software Foundation, Inc.
 .
 Written by James Clark.
diff -ruN groff-1.20.1/src/roff/troff/charinfo.h groff-1.21/src/roff/troff/charinfo.h
--- groff-1.20.1/src/roff/troff/charinfo.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/charinfo.h	2010-12-31 08:33:08.000000000 +0100
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2006, 2009
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2006, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -18,6 +18,12 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
+#include <vector>
+#include <utility>
+
+extern int class_flag;	// set if there was a call to `.class'
+extern void get_flags();
+
 class macro;
 
 class charinfo : glyph {
@@ -26,7 +32,7 @@
   macro *mac;
   unsigned char special_translation;
   unsigned char hyphenation_code;
-  unsigned char flags;
+  unsigned int flags;
   unsigned char ascii_code;
   unsigned char asciify_code;
   char not_found;
@@ -35,16 +41,22 @@
   char translate_input;		// non-zero means that asciify_code is
 				// active for .asciify (set by .trin)
   char_mode mode;
+  // Unicode character classes
+  std::vector<std::pair<int, int> > ranges;
+  std::vector<charinfo *> nested_classes;
 public:
   enum {		// Values for the flags bitmask.  See groff
 			// manual, description of the `.cflags' request.
-    ENDS_SENTENCE = 1,
-    BREAK_BEFORE = 2,
-    BREAK_AFTER = 4,
-    OVERLAPS_HORIZONTALLY = 8,
-    OVERLAPS_VERTICALLY = 16,
-    TRANSPARENT = 32,
-    IGNORE_HCODES = 64
+    ENDS_SENTENCE = 0x01,
+    BREAK_BEFORE = 0x02,
+    BREAK_AFTER = 0x04,
+    OVERLAPS_HORIZONTALLY = 0x08,
+    OVERLAPS_VERTICALLY = 0x10,
+    TRANSPARENT = 0x20,
+    IGNORE_HCODES = 0x40,
+    DONT_BREAK_BEFORE = 0x80,
+    DONT_BREAK_AFTER = 0x100,
+    INTER_CHAR_SPACE = 0x200
   };
   enum {
     TRANSLATE_NONE,
@@ -63,9 +75,13 @@
   int can_break_after();
   int transparent();
   int ignore_hcodes();
+  int prohibit_break_before();
+  int prohibit_break_after();
+  int inter_char_space();
   unsigned char get_hyphenation_code();
   unsigned char get_ascii_code();
   unsigned char get_asciify_code();
+  int get_unicode_code();
   void set_hyphenation_code(unsigned char);
   void set_ascii_code(unsigned char);
   void set_asciify_code(unsigned char);
@@ -73,7 +89,8 @@
   int get_translation_input();
   charinfo *get_translation(int = 0);
   void set_translation(charinfo *, int, int);
-  void set_flags(unsigned char);
+  void get_flags();
+  void set_flags(unsigned int);
   void set_special_translation(int, int);
   int get_special_translation(int = 0);
   macro *set_macro(macro *);
@@ -87,6 +104,13 @@
   int is_fallback();
   int is_special();
   symbol *get_symbol();
+  void add_to_class(int);
+  void add_to_class(int, int);
+  void add_to_class(charinfo *);
+  bool is_class();
+  bool contains(int, bool = false);
+  bool contains(symbol, bool = false);
+  bool contains(charinfo *, bool = false);
 };
 
 charinfo *get_charinfo(symbol);
@@ -95,39 +119,74 @@
 
 inline int charinfo::overlaps_horizontally()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & OVERLAPS_HORIZONTALLY;
 }
 
 inline int charinfo::overlaps_vertically()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & OVERLAPS_VERTICALLY;
 }
 
 inline int charinfo::can_break_before()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & BREAK_BEFORE;
 }
 
 inline int charinfo::can_break_after()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & BREAK_AFTER;
 }
 
 inline int charinfo::ends_sentence()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & ENDS_SENTENCE;
 }
 
 inline int charinfo::transparent()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & TRANSPARENT;
 }
 
 inline int charinfo::ignore_hcodes()
 {
+  if (class_flag)
+    ::get_flags();
   return flags & IGNORE_HCODES;
 }
 
+inline int charinfo::prohibit_break_before()
+{
+  if (class_flag)
+    ::get_flags();
+  return flags & DONT_BREAK_BEFORE;
+}
+
+inline int charinfo::prohibit_break_after()
+{
+  if (class_flag)
+    ::get_flags();
+  return flags & DONT_BREAK_AFTER;
+}
+
+inline int charinfo::inter_char_space()
+{
+  if (class_flag)
+    ::get_flags();
+  return flags & INTER_CHAR_SPACE;
+}
+
 inline int charinfo::numbered()
 {
   return number >= 0;
@@ -170,7 +229,7 @@
   return (translate_input ? asciify_code : 0);
 }
 
-inline void charinfo::set_flags(unsigned char c)
+inline void charinfo::set_flags(unsigned int c)
 {
   flags = c;
 }
@@ -214,5 +273,30 @@
 
 inline symbol *charinfo::get_symbol()
 {
-  return( &nm );
+  return &nm;
+}
+
+inline void charinfo::add_to_class(int c)
+{
+  class_flag = 1;
+  // TODO ranges cumbersome for single characters?
+  ranges.push_back(std::pair<int, int>(c, c));
+}
+
+inline void charinfo::add_to_class(int lo,
+				   int hi)
+{
+  class_flag = 1;
+  ranges.push_back(std::pair<int, int>(lo, hi));
+}
+
+inline void charinfo::add_to_class(charinfo *ci)
+{
+  class_flag = 1;
+  nested_classes.push_back(ci);
+}
+
+inline bool charinfo::is_class()
+{
+  return (!ranges.empty() || !nested_classes.empty());
 }
diff -ruN groff-1.20.1/src/roff/troff/env.cpp groff-1.21/src/roff/troff/env.cpp
--- groff-1.20.1/src/roff/troff/env.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/env.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -2213,14 +2213,15 @@
      */
     if (curdiv == topdiv && topdiv->before_first_page)
       topdiv->begin_page();
-    macro *m = new macro;
-    m->append_str("devtag:");
+
+    macro m;
+    m.append_str("devtag:");
     for (const char *p = nm; *p; p++)
       if (!invalid_input_char((unsigned char)*p))
-	m->append(*p);
-    m->append(' ');
-    m->append_int(i);
-    return new special_node(*m);
+	m.append(*p);
+    m.append(' ');
+    m.append_int(i);
+    return new special_node(m);
   }
   return 0;
 }
diff -ruN groff-1.20.1/src/roff/troff/input.cpp groff-1.21/src/roff/troff/input.cpp
--- groff-1.20.1/src/roff/troff/input.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/input.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009
+                 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -59,7 +59,7 @@
 #ifndef DEFAULT_WARNING_MASK
 // warnings that are enabled by default
 #define DEFAULT_WARNING_MASK \
-     (WARN_CHAR|WARN_NUMBER|WARN_BREAK|WARN_SPACE|WARN_FONT)
+     (WARN_CHAR|WARN_NUMBER|WARN_BREAK|WARN_SPACE|WARN_FONT|WARN_FILE)
 #endif
 
 // initial size of buffer for reading names; expanded as necessary
@@ -83,6 +83,7 @@
 
 token tok;
 int break_flag = 0;
+int class_flag = 0;
 int color_flag = 1;		// colors are on by default
 static int backtrace_flag = 0;
 #ifndef POPEN_MISSING
@@ -101,6 +102,7 @@
 static int escape_char = '\\';
 static symbol end_macro_name;
 static symbol blank_line_macro_name;
+static symbol leading_spaces_macro_name;
 static int compatible_flag = 0;
 int ascii_output_flag = 0;
 int suppress_output_flag = 0;
@@ -120,7 +122,7 @@
 
 double warn_scale;
 char warn_scaling_indicator;
-int debug_state = 0;            // turns on debugging of the html troff state
+int debug_state = 0;		// turns on debugging of the html troff state
 
 search_path *mac_path = &safer_macro_path;
 
@@ -530,6 +532,8 @@
 {
   if (t->is_diversion) {
     div_level--;
+    if (diversion_state)
+      delete diversion_state;
     diversion_state = t->diversion_state;
   }
 }
@@ -1433,7 +1437,7 @@
   skip_line();
 }
 
-static node *do_overstrike()
+node *do_overstrike()
 {
   token start;
   overstrike_node *on = new overstrike_node;
@@ -1449,11 +1453,21 @@
     if (tok == start
 	&& (compatible_flag || input_stack::get_level() == start_level))
       break;
-    charinfo *ci = tok.get_char(1);
-    if (ci) {
-      node *n = curenv->make_char_node(ci);
-      if (n)
-	on->overstrike(n);
+    if (tok.horizontal_space())
+      on->overstrike(tok.nd->copy());
+    else if (tok.unstretchable_space())
+    {
+      node *n = new hmotion_node(curenv->get_space_width(),
+				 curenv->get_fill_color());
+      on->overstrike(n);
+    }
+    else {
+      charinfo *ci = tok.get_char(1);
+      if (ci) {
+	node *n = curenv->make_char_node(ci);
+	if (n)
+	  on->overstrike(n);
+      }
     }
   }
   return on;
@@ -1798,13 +1812,13 @@
 	goto handle_escape_char;
       case ESCAPE_BAR:
       ESCAPE_BAR:
-	type = TOKEN_NODE;
+	type = TOKEN_HORIZONTAL_SPACE;
 	nd = new hmotion_node(curenv->get_narrow_space_width(),
 			      curenv->get_fill_color());
 	return;
       case ESCAPE_CIRCUMFLEX:
       ESCAPE_CIRCUMFLEX:
-	type = TOKEN_NODE;
+	type = TOKEN_HORIZONTAL_SPACE;
 	nd = new hmotion_node(curenv->get_half_narrow_space_width(),
 			      curenv->get_fill_color());
 	return;
@@ -1925,7 +1939,7 @@
       case '0':
 	nd = new hmotion_node(curenv->get_digit_width(),
 			      curenv->get_fill_color());
-	type = TOKEN_NODE;
+	type = TOKEN_HORIZONTAL_SPACE;
 	return;
       case '|':
 	goto ESCAPE_BAR;
@@ -2060,7 +2074,7 @@
       case 'h':
 	if (!get_delim_number(&x, 'm'))
 	  break;
-	type = TOKEN_NODE;
+	type = TOKEN_HORIZONTAL_SPACE;
 	nd = new hmotion_node(x, curenv->get_fill_color());
 	return;
       case 'H':
@@ -2215,7 +2229,7 @@
       case 'z':
 	{
 	  next();
-	  if (type == TOKEN_NODE)
+	  if (type == TOKEN_NODE || type == TOKEN_HORIZONTAL_SPACE)
 	    nd = new zero_width_node(nd);
 	  else {
   	    charinfo *ci = get_char(1);
@@ -2345,6 +2359,7 @@
   case TOKEN_SPACE:
   case TOKEN_STRETCHABLE_SPACE:
   case TOKEN_UNSTRETCHABLE_SPACE:
+  case TOKEN_HORIZONTAL_SPACE:
   case TOKEN_TAB:
   case TOKEN_NEWLINE:
     if (err)
@@ -2401,6 +2416,8 @@
     return "`\\~'";
   case TOKEN_UNSTRETCHABLE_SPACE:
     return "`\\ '";
+  case TOKEN_HORIZONTAL_SPACE:
+    return "a horizontal space";
   case TOKEN_TAB:
     return "a tab character";
   case TOKEN_TRANSPARENT:
@@ -2608,6 +2625,12 @@
   skip_line();
 }
 
+void leading_spaces_macro()
+{
+  leading_spaces_macro_name = get_name();
+  skip_line();
+}
+
 static void trapping_blank_line()
 {
   if (!blank_line_macro_name.is_null())
@@ -2773,6 +2796,9 @@
   return 0;
 }
 
+static int leading_spaces_number = 0;
+static int leading_spaces_space = 0;
+
 void process_input_stack()
 {
   int_stack trap_bol_stack;
@@ -2853,11 +2879,12 @@
 	    do {
 	      node *n;
 	      cc = get_copy(&n);
-	      if (cc != EOF)
+	      if (cc != EOF) {
 		if (cc != '\0')
 		  curdiv->transparent_output(transparent_translate(cc));
 		else
 		  curdiv->transparent_output(n);
+	      }
 	    } while (cc != '\n' && cc != EOF);
 	    if (cc == EOF)
 	      curdiv->transparent_output('\n');
@@ -2919,9 +2946,15 @@
 	    trapping_blank_line();
 	  else {
 	    push_token(tok);
-	    curenv->do_break();
-	    curenv->add_node(new hmotion_node(space_width * nspaces,
-					      curenv->get_fill_color()));
+	    leading_spaces_number = nspaces;
+	    leading_spaces_space = space_width.to_units() * nspaces;
+	    if (!leading_spaces_macro_name.is_null())
+	      spring_trap(leading_spaces_macro_name);
+	    else {
+	      curenv->do_break();
+	      curenv->add_node(new hmotion_node(space_width * nspaces,
+						curenv->get_fill_color()));
+	    }
 	    bol = 0;
 	  }
 	}
@@ -2934,6 +2967,7 @@
     case token::TOKEN_EOF:
       return;
     case token::TOKEN_NODE:
+    case token::TOKEN_HORIZONTAL_SPACE:
       {
 	if (possibly_handle_first_page_transition())
 	  ;
@@ -4080,7 +4114,7 @@
     postponed_trap = nm;
     return;
   }
-  static char buf[2] = { BEGIN_TRAP, 0 };
+  static char buf[2] = { BEGIN_TRAP, '\0' };
   static char buf2[2] = { END_TRAP, '\0' };
   input_stack::push(make_temp_iterator(buf2));
   request_or_macro *p = lookup_request(nm);
@@ -4367,6 +4401,7 @@
 	  args += c;
       if (i != limit)
 	args += ' ';
+      delete p;
     }
     if (limit > 0) {
       args += '\0';
@@ -4388,6 +4423,7 @@
       args += '"';
       if (i != limit)
 	args += ' ';
+      delete p;
     }
     if (limit > 0) {
       args += '\0';
@@ -4407,6 +4443,7 @@
       }
       if (input_stack::space_follows_arg(i))
 	args += ' ';
+      delete p;
     }
     if (limit > 0) {
       args += '\0';
@@ -6566,7 +6603,7 @@
 static void init_hpf_code_table()
 {
   for (int i = 0; i < 256; i++)
-    hpf_code_table[i] = i;
+    hpf_code_table[i] = cmlower(i);
 }
 
 static void do_translate(int translate_transparent, int translate_input)
@@ -6704,6 +6741,116 @@
   skip_line();
 }
 
+dictionary char_class_dictionary(501);
+
+void define_class()
+{
+  tok.skip();
+  symbol nm = get_name(1);
+  if (nm.is_null()) {
+    skip_line();
+    return;
+  }
+  charinfo *ci = get_charinfo(nm);
+  charinfo *child1 = 0, *child2 = 0;
+  while (!tok.newline() && !tok.eof()) {
+    tok.skip();
+    if (child1 != 0 && tok.ch() == '-') {
+      tok.next();
+      child2 = tok.get_char(1);
+      if (!child2) {
+	warning(WARN_MISSING,
+		"missing end of character range in class `%1'",
+		nm.contents());
+	skip_line();
+	return;
+      }
+      if (child1->is_class() || child2->is_class()) {
+	warning(WARN_SYNTAX,
+		"nested character class is not allowed in range definition");
+	skip_line();
+	return;
+      }
+      int u1 = child1->get_unicode_code();
+      int u2 = child2->get_unicode_code();
+      if (u1 < 0) {
+	warning(WARN_SYNTAX,
+		"invalid start value in character range");
+	skip_line();
+	return;
+      }
+      if (u2 < 0) {
+	warning(WARN_SYNTAX,
+		"invalid end value in character range");
+	skip_line();
+	return;
+      }
+      ci->add_to_class(u1, u2);
+      child1 = child2 = 0;
+    }
+    else if (child1 != 0) {
+      if (child1->is_class()) {
+	if (ci == child1) {
+	  warning(WARN_SYNTAX, "invalid cyclic class nesting");
+	  skip_line();
+	  return;
+	}
+	ci->add_to_class(child1);
+      }
+      else {
+	int u1 = child1->get_unicode_code();
+	if (u1 < 0) {
+	  warning(WARN_SYNTAX,
+		  "invalid character value in class `%1'",
+		  nm.contents());
+	  skip_line();
+	  return;
+	}
+	ci->add_to_class(u1);
+      }
+      child1 = 0;
+    }
+    child1 = tok.get_char(1);
+    tok.next();
+    if (!child1) {
+      if (!tok.newline())
+	skip_line();
+      break;
+    }
+  }
+  if (child1 != 0) {
+    if (child1->is_class()) {
+      if (ci == child1) {
+	warning(WARN_SYNTAX, "invalid cyclic class nesting");
+	skip_line();
+	return;
+      }
+      ci->add_to_class(child1);
+    }
+    else {
+      int u1 = child1->get_unicode_code();
+      if (u1 < 0) {
+	warning(WARN_SYNTAX,
+		"invalid character value in class `%1'",
+		nm.contents());
+	skip_line();
+	return;
+      }
+      ci->add_to_class(u1);
+    }
+    child1 = 0;
+  }
+  if (!ci->is_class()) {
+    warning(WARN_SYNTAX,
+	    "empty class definition for `%1'",
+	    nm.contents());
+    skip_line();
+    return;
+  }
+  (void)char_class_dictionary.lookup(nm, ci);
+  skip_line();
+}
+
 charinfo *token::get_char(int required)
 {
   if (type == TOKEN_CHAR)
@@ -6779,6 +6926,7 @@
     set_number_reg(nm, curenv->get_input_line_position().to_units());
     break;
   case TOKEN_NODE:
+  case TOKEN_HORIZONTAL_SPACE:
     n = nd;
     nd = 0;
     break;
@@ -6871,6 +7019,7 @@
     curenv->newline();
     break;
   case TOKEN_NODE:
+  case TOKEN_HORIZONTAL_SPACE:
     curenv->add_node(nd);
     nd = 0;
     break;
@@ -7350,7 +7499,7 @@
       a_delete path;
     }
     else
-      error("can't find macro file `%1'", nm.contents());
+      warning(WARN_FILE, "can't find macro file `%1'", nm.contents());
     tok.next();
   }
 }
@@ -7492,6 +7641,7 @@
     if (putenv(strsave(e.contents())))
       fatal("putenv failed");
   }
+  setlocale(LC_CTYPE, "");
   static const struct option long_options[] = {
     { "help", no_argument, 0, CHAR_MAX + 1 },
     { "version", no_argument, 0, 'v' },
@@ -7779,6 +7929,7 @@
   init_request("cflags", char_flags);
   init_request("char", define_character);
   init_request("chop", chop_macro);
+  init_request("class", define_class);
   init_request("close", close_request);
   init_request("color", activate_color);
   init_request("composite", composite_request);
@@ -7812,6 +7963,7 @@
   init_request("ig", ignore);
   init_request("length", length_request);
   init_request("lf", line_file);
+  init_request("lsm", leading_spaces_macro);
   init_request("mso", macro_source);
   init_request("nop", nop_request);
   init_request("nroff", nroff_request);
@@ -7879,6 +8031,8 @@
   number_reg_dictionary.define("c.", new writable_lineno_reg);
   number_reg_dictionary.define("llx", new variable_reg(&llx_reg_contents));
   number_reg_dictionary.define("lly", new variable_reg(&lly_reg_contents));
+  number_reg_dictionary.define("lsn", new variable_reg(&leading_spaces_number));
+  number_reg_dictionary.define("lss", new variable_reg(&leading_spaces_space));
   number_reg_dictionary.define("opmaxx",
 			       new variable_reg(&output_reg_maxx_contents));
   number_reg_dictionary.define("opmaxy",
@@ -8133,6 +8287,7 @@
   { "reg", WARN_REG },
   { "ig", WARN_IG },
   { "color", WARN_COLOR },
+  { "file", WARN_FILE },
   { "all", WARN_TOTAL & ~(WARN_DI | WARN_MAC | WARN_REG) },
   { "w", WARN_TOTAL },
   { "default", DEFAULT_WARNING_MASK },
@@ -8323,6 +8478,14 @@
 {
   index = next_index++;
   number = -1;
+  get_flags();
+}
+
+int charinfo::get_unicode_code()
+{
+  if (ascii_code != '\0')
+    return ascii_code;
+  return glyph_to_unicode(this);
 }
 
 void charinfo::set_hyphenation_code(unsigned char c)
@@ -8346,6 +8509,38 @@
   transparent_translate = tt;
 }
 
+// Recompute flags for all entries in the charinfo dictionary.
+void get_flags()
+{
+  dictionary_iterator iter(charinfo_dictionary);
+  charinfo *ci;
+  symbol s;
+  while (iter.get(&s, (void **)&ci)) {
+    assert(!s.is_null());
+    ci->get_flags();
+  }
+  class_flag = 0;
+}
+
+// Get the union of all flags affecting this charinfo.
+void charinfo::get_flags()
+{
+  dictionary_iterator iter(char_class_dictionary);
+  charinfo *ci;
+  symbol s;
+  while (iter.get(&s, (void **)&ci)) {
+    assert(!s.is_null());
+    if (ci->contains(get_unicode_code())) {
+#if defined(DEBUGGING)
+      if (debug_state)
+	fprintf(stderr, "charinfo::get_flags %p %s %d\n",
+			(void *)ci, ci->nm.contents(), ci->flags);
+#endif
+      flags |= ci->flags;
+    }
+  }
+}
+
 void charinfo::set_special_translation(int c, int tt)
 {
   special_translation = c;
@@ -8390,6 +8585,62 @@
   return number;
 }
 
+bool charinfo::contains(int c, bool already_called)
+{
+  if (already_called) {
+    warning(WARN_SYNTAX,
+	    "cyclic nested class detected while processing character code %1",
+	    c);
+    return false;
+  }
+  std::vector<std::pair<int, int> >::const_iterator ranges_iter;
+  ranges_iter = ranges.begin();
+  while (ranges_iter != ranges.end()) {
+    if (c >= ranges_iter->first && c <= ranges_iter->second) {
+#if defined(DEBUGGING)
+      if (debug_state)
+	fprintf(stderr, "charinfo::contains(%d)\n", c);
+#endif
+      return true;
+    }
+    ++ranges_iter;
+  }
+
+  std::vector<charinfo *>::const_iterator nested_iter;
+  nested_iter = nested_classes.begin();
+  while (nested_iter != nested_classes.end()) {
+    if ((*nested_iter)->contains(c, true))
+      return true;
+    ++nested_iter;
+  }
+
+  return false;
+}
+
+bool charinfo::contains(symbol s, bool already_called)
+{
+  if (already_called) {
+    warning(WARN_SYNTAX,
+	    "cyclic nested class detected while processing symbol %1",
+	    s.contents());
+    return false;
+  }
+  const char *unicode = glyph_name_to_unicode(s.contents());
+  if (unicode != NULL && strchr(unicode, '_') == NULL) {
+    char *ignore;
+    int c = (int)strtol(unicode, &ignore, 16);
+    return contains(c, true);
+  }
+  else
+    return false;
+}
+
+bool charinfo::contains(charinfo *, bool)
+{
+  // TODO
+  return false;
+}
+
 symbol UNNAMED_SYMBOL("---");
 
 // For numbered characters not between 0 and 255, we make a symbol out
diff -ruN groff-1.20.1/src/roff/troff/Makefile.sub groff-1.21/src/roff/troff/Makefile.sub
--- groff-1.20.1/src/roff/troff/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/Makefile.sub	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 PROG=troff$(EXEEXT)
 MAN1=troff.n
-XLIBS=$(LIBGROFF)
+XLIBS=$(LIBGROFF) $(LIBGNU)
 MLIB=$(LIBM)
 OBJS=\
   dictionary.$(OBJEXT) \
diff -ruN groff-1.20.1/src/roff/troff/mtsm.cpp groff-1.21/src/roff/troff/mtsm.cpp
--- groff-1.20.1/src/roff/troff/mtsm.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/mtsm.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -390,8 +390,6 @@
 #endif
     if (sp == 0)
       fatal("empty state machine stack");
-    if (sp->state)
-      delete sp->state;
     sp->state = 0;
     stack *t = sp;
     sp = sp->next;
diff -ruN groff-1.20.1/src/roff/troff/node.cpp groff-1.21/src/roff/troff/node.cpp
--- groff-1.20.1/src/roff/troff/node.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/node.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2008, 2009
+                 2006, 2008, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -1507,7 +1507,7 @@
 void troff_output_file::really_put_filename(const char *filename, int po)
 {
   flush_tbuf();
-  put("F ");
+  put("x F ");
   if (po)
     put("<");
   put(filename);
@@ -2196,7 +2196,7 @@
   if (c)
     fprintf(stderr, "%c", c);
   else
-    fprintf(stderr, ci->nm.contents());
+    fprintf(stderr, "%s", ci->nm.contents());
   if (push_state)
     fprintf(stderr, " <push_state>");
   if (state)
@@ -2335,7 +2335,7 @@
 
 node *kern_pair_node::add_discretionary_hyphen()
 {
-  tfont *tf = n2->get_tfont();
+  tfont *tf = n1->get_tfont();
   if (tf) {
     if (tf->contains(soft_hyphen_char)) {
       color *gcol = n2->get_glyph_color();
@@ -2542,6 +2542,11 @@
   return 0;
 }
 
+int node::get_break_code()
+{
+  return 0;
+}
+
 hunits hmotion_node::width()
 {
   return n;
@@ -2760,10 +2765,11 @@
 class break_char_node : public node {
   node *ch;
   char break_code;
+  char prev_break_code;
   color *col;
 public:
-  break_char_node(node *, int, color *, node * = 0);
-  break_char_node(node *, int, color *, statem *, int, node * = 0);
+  break_char_node(node *, int, int, color *, node * = 0);
+  break_char_node(node *, int, int, color *, statem *, int, node * = 0);
   ~break_char_node();
   node *copy();
   hunits width();
@@ -2786,16 +2792,17 @@
   const char *type();
   int force_tprint();
   int is_tag();
+  int get_break_code();
 };
 
-break_char_node::break_char_node(node *n, int bc, color *c, node *x)
-: node(x), ch(n), break_code(bc), col(c)
+break_char_node::break_char_node(node *n, int bc, int pbc, color *c, node *x)
+: node(x), ch(n), break_code(bc), prev_break_code(pbc), col(c)
 {
 }
 
-break_char_node::break_char_node(node *n, int bc, color *c, statem *s,
-				 int pop, node *x)
-: node(x, s, pop), ch(n), break_code(bc), col(c)
+break_char_node::break_char_node(node *n, int bc, int pbc, color *c,
+				 statem *s, int pop, node *x)
+: node(x, s, pop), ch(n), break_code(bc), prev_break_code(pbc), col(c)
 {
 }
 
@@ -2806,8 +2813,8 @@
 
 node *break_char_node::copy()
 {
-  return new break_char_node(ch->copy(), break_code, col, state,
-			     div_nest_level);
+  return new break_char_node(ch->copy(), break_code, prev_break_code,
+			     col, state, div_nest_level);
 }
 
 hunits break_char_node::width()
@@ -2835,19 +2842,43 @@
   return ch->ends_sentence();
 }
 
+enum break_char_type {
+  CAN_BREAK_BEFORE = 0x01,
+  CAN_BREAK_AFTER = 0x02,
+  IGNORE_HCODES = 0x04,
+  PROHIBIT_BREAK_BEFORE = 0x08,
+  PROHIBIT_BREAK_AFTER = 0x10,
+  INTER_CHAR_SPACE = 0x20
+};
+
 node *break_char_node::add_self(node *n, hyphen_list **p)
 {
+  int have_space_node = 0;
   assert((*p)->hyphenation_code == 0);
-  if (break_code & 1) {
-    if ((*p)->breakable || break_code & 4) {
+  if (break_code & CAN_BREAK_BEFORE) {
+    if ((*p)->breakable || break_code & IGNORE_HCODES) {
       n = new space_node(H0, col, n);
       n->freeze_space();
+      have_space_node = 1;
+    }
+  }
+  if (!have_space_node) {
+    if (prev_break_code & INTER_CHAR_SPACE
+	|| prev_break_code & PROHIBIT_BREAK_AFTER) {
+      if (break_code & PROHIBIT_BREAK_BEFORE)
+	// stretchable zero-width space not implemented yet
+	;
+      else {
+	// breakable, stretchable zero-width space not implemented yet
+	n = new space_node(H0, col, n);
+	n->freeze_space();
+      }
     }
   }
   next = n;
   n = this;
-  if (break_code & 2) {
-    if ((*p)->breakable || break_code & 4) {
+  if (break_code & CAN_BREAK_AFTER) {
+    if ((*p)->breakable || break_code & IGNORE_HCODES) {
       n = new space_node(H0, col, n);
       n->freeze_space();
     }
@@ -3198,11 +3229,6 @@
 {
 }
 
-space_node::space_node(hunits nn, color *c, statem *s, int pop, node *p)
-: node(p, s, pop), n(nn), set(0), was_escape_colon(0), col(c)
-{
-}
-
 space_node::space_node(hunits nn, int s, int flag, color *c, statem *st,
 		       int pop, node *p)
 : node(p, st, pop), n(nn), set(s), was_escape_colon(flag), col(c)
@@ -4643,7 +4669,7 @@
   }
   else {
     hunits rem = x - w*i;
-    if (rem > H0)
+    if (rem > H0) {
       if (n->overlaps_horizontally()) {
 	if (out->is_on())
 	  n->tprint(out);
@@ -4651,6 +4677,7 @@
       }
       else
 	out->right(rem);
+    }
     while (--i >= 0)
       if (out->is_on())
 	n->tprint(out);
@@ -4981,7 +5008,7 @@
   case charinfo::TRANSLATE_DUMMY:
     return new dummy_node;
   case charinfo::TRANSLATE_HYPHEN_INDICATOR:
-    error("translation to \\% ignored in this context");
+    error("translation to \\%% ignored in this context");
     break;
   }
   charinfo *tem = ci->get_translation();
@@ -5073,15 +5100,22 @@
   }
   int break_code = 0;
   if (ci->can_break_before())
-    break_code = 1;
+    break_code = CAN_BREAK_BEFORE;
   if (ci->can_break_after())
-    break_code |= 2;
+    break_code |= CAN_BREAK_AFTER;
   if (ci->ignore_hcodes())
-    break_code |= 4;
+    break_code |= IGNORE_HCODES;
+  if (ci->prohibit_break_before())
+    break_code = PROHIBIT_BREAK_BEFORE;
+  if (ci->prohibit_break_after())
+    break_code |= PROHIBIT_BREAK_AFTER;
+  if (ci->inter_char_space())
+    break_code |= INTER_CHAR_SPACE;
   if (break_code) {
     node *next1 = res->next;
     res->next = 0;
-    res = new break_char_node(res, break_code, env->get_fill_color(), next1);
+    res = new break_char_node(res, break_code, get_break_code(),
+			      env->get_fill_color(), next1);
   }
   return res;
 }
@@ -5738,6 +5772,11 @@
   return 0;
 }
 
+int break_char_node::get_break_code()
+{
+  return break_code;
+}
+
 int line_start_node::same(node * /*nd*/)
 {
   return 1;
diff -ruN groff-1.20.1/src/roff/troff/node.h groff-1.21/src/roff/troff/node.h
--- groff-1.20.1/src/roff/troff/node.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/node.h	2010-12-31 08:33:08.000000000 +0100
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004,\
-                 2006, 2009
+                 2006, 2009, 2010
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -64,6 +64,7 @@
   virtual int set_unformat_flag();
   virtual int force_tprint() = 0;
   virtual int is_tag() = 0;
+  virtual int get_break_code();
   virtual hunits width();
   virtual hunits subscript_correction();
   virtual hunits italic_correction();
@@ -134,6 +135,10 @@
 
 inline node::~node()
 {
+  if (state != 0)
+    delete state;
+  if (push_state != 0)
+    delete push_state;
 }
 
 // 0 means it doesn't, 1 means it does, 2 means it's transparent
@@ -174,7 +179,6 @@
   color *col;			/* for grotty */
   space_node(hunits, int, int, color *, statem *, int, node * = 0);
 public:
-  space_node(hunits, color *, statem *, int, node * = 0);
   space_node(hunits, color *, node * = 0);
 #if 0
   ~space_node();
diff -ruN groff-1.20.1/src/roff/troff/token.h groff-1.21/src/roff/troff/token.h
--- groff-1.20.1/src/roff/troff/token.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/token.h	2010-12-31 08:33:08.000000000 +0100
@@ -54,6 +54,7 @@
     TOKEN_SPREAD,		// \p -- break and spread output line 
     TOKEN_STRETCHABLE_SPACE,	// \~
     TOKEN_UNSTRETCHABLE_SPACE,	// `\ '
+    TOKEN_HORIZONTAL_SPACE,	// \|, \^, \0, \h
     TOKEN_TAB,			// tab
     TOKEN_TRANSPARENT,		// \!
     TOKEN_TRANSPARENT_DUMMY,	// \)
@@ -73,6 +74,7 @@
   int space();			// is the current token a space?
   int stretchable_space();	// is the current token a stretchable space?
   int unstretchable_space();	// is the current token an unstretchable space?
+  int horizontal_space();	// is the current token a horizontal space?
   int white_space();		// is the current token space or tab?
   int special();		// is the current token a special character?
   int newline();		// is the current token a newline?
@@ -99,6 +101,7 @@
   const char *description();
 
   friend void process_input_stack();
+  friend node *do_overstrike();
 };
 
 extern token tok;		// the current token
@@ -155,6 +158,11 @@
   return type == TOKEN_UNSTRETCHABLE_SPACE;
 }
 
+inline int token::horizontal_space()
+{
+  return type == TOKEN_HORIZONTAL_SPACE;
+}
+
 inline int token::special()
 { 
   return type == TOKEN_SPECIAL;
diff -ruN groff-1.20.1/src/roff/troff/troff.h groff-1.21/src/roff/troff/troff.h
--- groff-1.20.1/src/roff/troff/troff.h	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/troff.h	2010-12-31 08:33:08.000000000 +0100
@@ -75,11 +75,12 @@
   WARN_SPACE = 0200000,
   WARN_FONT = 0400000,
   WARN_IG =  01000000,
-  WARN_COLOR = 02000000
+  WARN_COLOR = 02000000,
+  WARN_FILE = 04000000
   // change WARN_TOTAL if you add more warning types
 };
 
-const int WARN_TOTAL = 03777777;
+const int WARN_TOTAL = 07777777;
 
 int warning(warning_type, const char *,
 	    const errarg & = empty_errarg,
diff -ruN groff-1.20.1/src/roff/troff/troff.man groff-1.21/src/roff/troff/troff.man
--- groff-1.20.1/src/roff/troff/troff.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/roff/troff/troff.man	2010-12-31 08:33:08.000000000 +0100
@@ -334,6 +334,7 @@
 7@128@syntax@17@131072@font
 8@256@di@18@262144@ig
 9@512@mac@19@524288@color
+@@@20@1048576@file
 .TE
 .
 .P
@@ -385,6 +386,14 @@
 character is ignored.
 .
 .TP
+.BR file "\t1048576"
+Indicates a missing file for the
+.B mso
+request.
+.
+Enabled by default.
+.
+.TP
 .BR font "\t131072"
 Non-existent fonts.
 .
diff -ruN groff-1.20.1/src/utils/afmtodit/afmtodit.man groff-1.21/src/utils/afmtodit/afmtodit.man
--- groff-1.20.1/src/utils/afmtodit/afmtodit.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/utils/afmtodit/afmtodit.man	2010-12-31 08:33:09.000000000 +0100
@@ -1,5 +1,6 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2005, 2006, 2008, 2009
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2005, 2006, 2008, 2009,
+              2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -52,6 +53,7 @@
 .OP \-e enc_file
 .OP \-f internal_name
 .OP \-i n
+.OP \-o out_file
 .I afm_file
 .I map_file
 .I font
@@ -141,7 +143,10 @@
 .
 .LP
 The groff font file will be output to a file called
-.IR font .
+.IR font ,
+unless the
+.B \-o
+option is used.
 .
 .LP
 If there is a downloadable font file for the font, it may be listed in
@@ -277,6 +282,13 @@
 for italic fonts.
 .
 .TP
+.BI \-o out_file
+The output file is
+.I out_file
+instead of
+.IR font .
+.
+.TP
 .B \-k
 Omit any kerning data from the groff font.
 This should be used only for mono-spaced fonts.
diff -ruN groff-1.20.1/src/utils/afmtodit/afmtodit.pl groff-1.21/src/utils/afmtodit/afmtodit.pl
--- groff-1.20.1/src/utils/afmtodit/afmtodit.pl	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/utils/afmtodit/afmtodit.pl	2010-12-31 08:33:09.000000000 +0100
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 # -*- Perl -*-
 # Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-#               2009
+#               2009, 2010
 # Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 #
@@ -30,10 +30,10 @@
 my $groff_sys_fontdir = "@FONTDIR@";
 
 use Getopt::Std;
-getopts('a:cd:e:f:i:kmnsvx');
+getopts('a:cd:e:f:i:kmno:svx');
 
-our ($opt_a, $opt_c, $opt_d, $opt_e, $opt_f, $opt_i,
-     $opt_k, $opt_m, $opt_n, $opt_s, $opt_v, $opt_x);
+our ($opt_a, $opt_c, $opt_d, $opt_e, $opt_f, $opt_i, $opt_k,
+     $opt_m, $opt_n, $opt_o, $opt_s, $opt_v, $opt_x);
 
 if ($opt_v) {
     print "GNU afmtodit (groff) version @VERSION@\n";
@@ -42,12 +42,13 @@
 
 if ($#ARGV != 2) {
     die "usage: $prog [-ckmnsvx] [-a angle] [-d DESC] [-e encoding]\n" .
-	"       [-f name] [-i n] afmfile mapfile font\n";
+	"       [-f name] [-i n] [-o outfile] afmfile mapfile font\n";
 }
 
 my $afm = $ARGV[0];
 my $map = $ARGV[1];
 my $font = $ARGV[2];
+my $outfile = $opt_o || $font;
 my $desc = $opt_d || "DESC";
 my $sys_map = $groff_sys_fontdir . "/devps/generate/" . $map;
 my $sys_desc = $groff_sys_fontdir . "/devps/" . $desc;
@@ -416,7 +417,7 @@
 
 # print it all out
 
-open(FONT, ">$font") || die "$prog: can't open \`$font' for output: $!\n";
+open(FONT, ">$outfile") || die "$prog: can't open \`$outfile' for output: $!\n";
 select(FONT);
 
 print("# This file has been generated with " .
diff -ruN groff-1.20.1/src/utils/hpftodit/hpftodit.cpp groff-1.21/src/utils/hpftodit/hpftodit.cpp
--- groff-1.20.1/src/utils/hpftodit/hpftodit.cpp	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/src/utils/hpftodit/hpftodit.cpp	2010-12-31 08:33:08.000000000 +0100
@@ -870,9 +870,9 @@
       else if (!all_flag)
 	continue;
       else if (tfm_type == MSL)
-	printf(hp_msl_to_ucode_name(charcode));
+	printf("%s", hp_msl_to_ucode_name(charcode));
       else
-	printf(unicode_to_ucode_name(charcode));
+	printf("%s", unicode_to_ucode_name(charcode));
 
       printf("\t%d,%d",
 	     scale(char_table[i].width), scale(char_table[i].ascent));
diff -ruN groff-1.20.1/tmac/devtag.tmac groff-1.21/tmac/devtag.tmac
--- groff-1.20.1/tmac/devtag.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/devtag.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -5,12 +5,12 @@
 Installed position: groff's main macro directory.
 
 ------------------------------------------------------------------------
-    Legalize
+    Legalese
 ------------------------------------------------------------------------
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+Copyright (C) 2004, 2009, 2010 Free Software Foundation, Inc.
 written by Gaius Mulley <gaius@glam.ac.uk>.
 
 groff is free software; you can redistribute it and/or modify it under
diff -ruN groff-1.20.1/tmac/doc-common groff-1.21/tmac/doc-common
--- groff-1.20.1/tmac/doc-common	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/doc-common	2010-12-31 08:33:09.000000000 +0100
@@ -46,6 +46,7 @@
 .nr %Q 1
 .nr %R 1
 .nr %T 1
+.nr %U 1
 .nr %V 1
 .nr Ac 3
 .nr Ad 12n
@@ -77,6 +78,7 @@
 .nr Dq 12n
 .nr Ds 6n\" many manpages still use this as a -width value
 .nr Dv 12n
+.nr Dx 1
 .nr Ec 3
 .nr Ef 8n\" ?
 .nr Ek 8n\" ?
@@ -452,6 +454,39 @@
 .ds doc-operating-system-NetBSD-3.1   3.1
 .ds doc-operating-system-NetBSD-4.0   4.0
 .ds doc-operating-system-NetBSD-4.0.1 4.0.1
+.ds doc-operating-system-NetBSD-5.0   5.0
+.ds doc-operating-system-NetBSD-5.0.1 5.0.1
+.ds doc-operating-system-NetBSD-5.0.2 5.0.2
+.
+.ds doc-operating-system-OpenBSD-2.0  2.0
+.ds doc-operating-system-OpenBSD-2.1  2.1
+.ds doc-operating-system-OpenBSD-2.2  2.2
+.ds doc-operating-system-OpenBSD-2.3  2.3
+.ds doc-operating-system-OpenBSD-2.4  2.4
+.ds doc-operating-system-OpenBSD-2.5  2.5
+.ds doc-operating-system-OpenBSD-2.6  2.6
+.ds doc-operating-system-OpenBSD-2.7  2.7
+.ds doc-operating-system-OpenBSD-2.8  2.8
+.ds doc-operating-system-OpenBSD-2.9  2.9
+.ds doc-operating-system-OpenBSD-3.0  3.0
+.ds doc-operating-system-OpenBSD-3.1  3.1
+.ds doc-operating-system-OpenBSD-3.2  3.2
+.ds doc-operating-system-OpenBSD-3.3  3.3
+.ds doc-operating-system-OpenBSD-3.4  3.4
+.ds doc-operating-system-OpenBSD-3.5  3.5
+.ds doc-operating-system-OpenBSD-3.6  3.6
+.ds doc-operating-system-OpenBSD-3.7  3.7
+.ds doc-operating-system-OpenBSD-3.8  3.8
+.ds doc-operating-system-OpenBSD-3.9  3.9
+.ds doc-operating-system-OpenBSD-4.0  4.0
+.ds doc-operating-system-OpenBSD-4.1  4.1
+.ds doc-operating-system-OpenBSD-4.2  4.2
+.ds doc-operating-system-OpenBSD-4.3  4.3
+.ds doc-operating-system-OpenBSD-4.4  4.4
+.ds doc-operating-system-OpenBSD-4.5  4.5
+.ds doc-operating-system-OpenBSD-4.6  4.6
+.ds doc-operating-system-OpenBSD-4.7  4.7
+.ds doc-operating-system-OpenBSD-4.8  4.8
 .
 .ds doc-operating-system-FreeBSD-1.0     1.0
 .ds doc-operating-system-FreeBSD-1.1     1.1
@@ -504,6 +539,10 @@
 .ds doc-operating-system-FreeBSD-6.4     6.4
 .ds doc-operating-system-FreeBSD-7.0     7.0
 .ds doc-operating-system-FreeBSD-7.1     7.1
+.ds doc-operating-system-FreeBSD-7.2     7.2
+.ds doc-operating-system-FreeBSD-7.3     7.3
+.ds doc-operating-system-FreeBSD-8.0     8.0
+.ds doc-operating-system-FreeBSD-8.1     8.1
 .
 .ds doc-operating-system-Darwin-8.0.0  8.0.0
 .ds doc-operating-system-Darwin-8.1.0  8.1.0
@@ -538,6 +577,10 @@
 .ds doc-operating-system-DragonFly-1.12   1.12
 .ds doc-operating-system-DragonFly-1.12.2 1.12.2
 .ds doc-operating-system-DragonFly-2.0    2.0
+.ds doc-operating-system-DragonFly-2.2    2.2
+.ds doc-operating-system-DragonFly-2.4    2.4
+.ds doc-operating-system-DragonFly-2.6    2.6
+.ds doc-operating-system-DragonFly-2.8    2.8
 .
 .de Os
 .  ds doc-command-name
@@ -567,6 +610,14 @@
 .      el \
 .        tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c])
 .  \}\}
+.  el \{ .ie "\$1"DragonFly" \{\
+.    ds doc-operating-system DragonFly
+.    if \A\$2 \{\
+.      ie d doc-operating-system-DragonFly-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c])
+.  \}\}
 .  el \{ .ie "\$1"NetBSD" \{\
 .    ds doc-operating-system NetBSD
 .    if \A\$2 \{\
@@ -575,6 +626,14 @@
 .      el \
 .        tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c])
 .  \}\}
+.  el \{ .ie "\$1"OpenBSD" \{\
+.    ds doc-operating-system OpenBSD
+.    if \A\$2 \{\
+.      ie d doc-operating-system-OpenBSD-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c])
+.  \}\}
 .  el \{ .ie "\$1"Darwin" \{\
 .    ds doc-operating-system Darwin
 .    if \A\$2 \{\
@@ -587,7 +646,7 @@
 .    ds doc-operating-system \$1
 .    if !"\$2"" \
 .      as doc-operating-system " \$2
-.  \}\}\}\}\}\}
+.  \}\}\}\}\}\}\}\}
 ..
 .
 .
@@ -1170,6 +1229,8 @@
 .  tm doc-reference-title-count == \n[doc-reference-title-count]
 .  tm doc-reference-title-name == `\*[doc-reference-title-name]'
 .  tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]'
+.  tm doc-url-count == \n[doc-url-count]
+.  tm doc-url-name == `\*[doc-url-name]'
 .  tm doc-volume-count == \n[doc-volume-count]
 .  tm doc-volume-name == `\*[doc-volume-name]'
 .  tm doc-have-author == \n[doc-have-author]
diff -ruN groff-1.20.1/tmac/doc-syms groff-1.21/tmac/doc-syms
--- groff-1.20.1/tmac/doc-syms	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/doc-syms	2010-12-31 08:33:09.000000000 +0100
@@ -637,6 +637,8 @@
 .as doc-str-St--p1003.1-2001   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-2004   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004
 .as doc-str-St--p1003.1-2004   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
+.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .
 .\" POSIX Part 2: Shell and Utilities
 .ds doc-str-St--p1003.2        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2
diff -ruN groff-1.20.1/tmac/doc.tmac groff-1.21/tmac/doc.tmac
--- groff-1.20.1/tmac/doc.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/doc.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -3430,6 +3430,8 @@
 .  nr doc-reference-title-count-saved \n[doc-reference-title-count]
 .  ds doc-reference-title-name-saved "\*[doc-reference-title-name]
 .  ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book]
+.  nr doc-url-count-saved \n[doc-url-count]
+.  ds doc-url-name-saved "\*[doc-url-name]
 .  nr doc-volume-count-saved \n[doc-volume-count]
 .  ds doc-volume-name-saved "\*[doc-volume-name]
 .  nr doc-have-author-saved \n[doc-have-author]
@@ -3570,6 +3572,8 @@
 .  nr doc-reference-title-count \n[doc-reference-title-count-saved]
 .  ds doc-reference-title-name "\*[doc-reference-title-name-saved]
 .  ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved]
+.  nr doc-url-count \n[doc-url-count-saved]
+.  ds doc-url-name "\*[doc-url-name-saved]
 .  nr doc-volume-count \n[doc-volume-count-saved]
 .  ds doc-volume-name "\*[doc-volume-name-saved]
 .  nr doc-have-author \n[doc-have-author-saved]
@@ -5194,6 +5198,8 @@
 .\" NS   doc-reference-title-name-for-book
 .\" NS   doc-report-count
 .\" NS   doc-report-name
+.\" NS   doc-url-count
+.\" NS   doc-url-name
 .\" NS   doc-volume-count
 .\" NS   doc-volume-name
 .
@@ -5208,6 +5214,7 @@
 .  nr doc-corporate-count 0
 .  nr doc-report-count 0
 .  nr doc-reference-title-count 0
+.  nr doc-url-count 0
 .  nr doc-volume-count 0
 .  nr doc-date-count 0
 .  nr doc-page-number-count 0
@@ -5222,6 +5229,7 @@
 .  ds doc-report-name
 .  ds doc-reference-title-name
 .  ds doc-reference-title-name-for-book
+.  ds doc-url-name
 .  ds doc-volume-name
 .  ds doc-date
 .  ds doc-page-number-string
@@ -5316,6 +5324,13 @@
 .    doc-finish-reference \n[doc-volume-count]
 .  \}
 .
+.  if \n[doc-url-count] \{\
+.    unformat doc-url-name
+.    chop doc-url-name
+.    nop \*[doc-url-name]\c
+.    doc-finish-reference \n[doc-url-count]
+.  \}
+.
 .  if \n[doc-page-number-count] \{\
 .    unformat doc-page-number-string
 .    chop doc-page-number-string
@@ -6019,6 +6034,18 @@
 ..
 .
 .
+.\" NS doc-url-count global register
+.\" NS   counter of hypertext references
+.
+.nr doc-url-count 0
+.
+.
+.\" NS doc-url-name global box
+.\" NS   string of collected hypertext references
+.
+.ds doc-url-name
+.
+.
 .\" NS doc-volume-count global register
 .\" NS   counter of reference title references
 .
@@ -6031,6 +6058,48 @@
 .ds doc-volume-name
 .
 .
+.\" NS %U user macro
+.\" NS   hypertext reference
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS   doc-url-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%U
+.\" NS
+.\" NS width register `%U' set in doc-common
+.
+.de %U
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%U URL ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-url-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %U
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-url-name
+.  ev doc-env-%U
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
 .\" NS %V user macro
 .\" NS   reference volume
 .\" NS
@@ -6039,7 +6108,7 @@
 .\" NS   doc-curr-font
 .\" NS   doc-curr-size
 .\" NS   doc-macro-name
-.\" NS   doc-reference-title-count
+.\" NS   doc-reference-count
 .\" NS   doc-volume-count
 .\" NS
 .\" NS local variables:
@@ -6425,6 +6494,9 @@
 .blm doc-empty-line
 .
 .
+.ec
+.
+.
 .\" For UTF-8, map some characters conservatively for the sake
 .\" of easy cut and paste.
 .
@@ -6438,9 +6510,6 @@
 .\}
 .
 .
-.ec
-.
-.
 .\" load local modifications
 .mso mdoc.local
 .
diff -ruN groff-1.20.1/tmac/groff_man.man groff-1.21/tmac/groff_man.man
--- groff-1.20.1/tmac/groff_man.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/groff_man.man	2010-12-31 08:33:09.000000000 +0100
@@ -371,7 +371,8 @@
 The font size and shape are reset to the default value (normally 10pt
 Roman).
 .
-Finally, the current left margin and the indentation are restored.
+Finally, the current left margin and the indentation is reset to the
+default values.
 .
 .TP
 .BI .IP " \fR[\fPdesignator\fR]\fP \fR[\fPnnn\fR]\fP"
@@ -979,7 +980,7 @@
 .B @g@tbl
 or
 .B @g@eqn
-is needed, it has become usage to make the first line of the
+is needed, it has become common to make the first line of the
 .I \%man\~page
 look like this:
 .
diff -ruN groff-1.20.1/tmac/groff_mdoc.man groff-1.21/tmac/groff_mdoc.man
--- groff-1.20.1/tmac/groff_mdoc.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/groff_mdoc.man	2010-12-31 08:33:09.000000000 +0100
@@ -44,9 +44,9 @@
 .\" for an already extremely slow package.
 .\"
 .
-.Dd January 5, 2006
-.Os
+.Dd November 2, 2010
 .Dt GROFF_MDOC 7
+.Os
 .
 .
 .Sh NAME
@@ -563,8 +563,8 @@
 .Bd -literal -offset indent
 \&.\e" The following commands are required for all man pages.
 \&.Dd Month day, year
-\&.Os [OPERATING_SYSTEM] [version/release]
 \&.Dt DOCUMENT_TITLE [section number] [architecture/volume]
+\&.Os [OPERATING_SYSTEM] [version/release]
 \&.Sh NAME
 \&.Nm name
 \&.Nd one line description of name
@@ -600,9 +600,9 @@
 .
 The first items in the template are the commands
 .Ql .Dd ,
-.Ql .Os ,
+.Ql .Dt ,
 and
-.Ql .Dt ;
+.Ql .Os ;
 the document date, the operating system the man page or subject source is
 developed or modified for, and the man page title (in
 .Em upper case )
@@ -856,7 +856,7 @@
 the release ID.
 .
 .Bd -ragged -compact
-.Bl -tag -width ".No FreeBSD" -offset indent
+.Bl -tag -width ".No DragonFly" -offset indent
 .It ATT
 7th, 7, III, 3, V, V.2, V.3, V.4
 .It BSD
@@ -865,14 +865,19 @@
 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e,
 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1,
 1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0,
-4.0.1
+4.0.1, 5.0, 5.0.1, 5.0.2
 .It FreeBSD
 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
-5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0,
+8.1
+.It OpenBSD
+2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4,
+3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8
 .It DragonFly
-1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0
+1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2,
+2.4, 2.6, 2.8
 .It Darwin
 8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0,
 8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0
@@ -1588,7 +1593,7 @@
 .Ql ".Rv \-std atexit"
 produces:
 .
-.Bd -ragged -offset -indent
+.Bd -ragged -offset indent
 \# a small hack to suppress a warning message
 .ds section-old "\*[section]
 .ds section 3
@@ -1618,7 +1623,7 @@
 .Ql ".Ex \-std cat"
 produces:
 .
-.Bd -ragged -offset -indent
+.Bd -ragged -offset indent
 \# a small hack to suppress a warning message
 .ds section-old "\*[section]
 .ds section 1
@@ -1786,6 +1791,11 @@
 .Ql .Nm
 regurgitates this initial name for the sole purpose of making less work for
 the author.
+.Ql .Nm
+causes a line break within the
+.Sx SYNOPSIS
+section.
+.Pp
 Note: A section two or three document function name is addressed with the
 .Ql .Nm
 in the
@@ -1974,6 +1984,8 @@
 .St -p1003.1-2001
 .It Li \-p1003.1\-2004
 .St -p1003.1-2004
+.It Li \-p1003.1\-2008
+.St -p1003.1-2008
 .El
 .Pp
 .
@@ -1993,8 +2005,8 @@
 .Pp
 .
 X/Open
-.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .Pp
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .It Li \-susv2
 .St -susv2
 .It Li \-susv3
@@ -2556,6 +2568,8 @@
 Report name.
 .It Li .%T
 Title of article.
+.It Li .%U
+Optional hypertext reference.
 .It Li .%V
 Volume.
 .El
diff -ruN groff-1.20.1/tmac/groff_ms.man groff-1.21/tmac/groff_ms.man
--- groff-1.20.1/tmac/groff_ms.man	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/groff_ms.man	2010-12-31 08:33:09.000000000 +0100
@@ -1,6 +1,7 @@
 '\" t
 .ig
-Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
+              2010
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -252,6 +253,7 @@
 lfCW l  l  l.
 Reg.	Definition	Effective	Default
 _
+DD	Display, table, eqn, pic spacing	next para.	0.5v
 MINGW	Minimum width between columns	next page	2n
 _
 .TE
diff -ruN groff-1.20.1/tmac/hyphen.fr groff-1.21/tmac/hyphen.fr
--- groff-1.20.1/tmac/hyphen.fr	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/hyphen.fr	2010-12-31 08:33:09.000000000 +0100
@@ -15,10 +15,10 @@
 % To make the patterns workable with groff, all accent macros in the
 % patterns have been converted to use latin-9 characters directly
 % (this is, the oe ligature `½' is used), and everything except the
-% \pattern command has been discarded since it isn't needed (and groff
+% \patterns command has been discarded since it isn't needed (and groff
 % doesn't understand this stuff anyway).
 %
-%\patterns{
+\patterns{
 %-------------------%-----------------------%
 % phonetic patterns % etymological patterns %
 %-------------------%-----------------------%
diff -ruN groff-1.20.1/tmac/ja.tmac groff-1.21/tmac/ja.tmac
--- groff-1.20.1/tmac/ja.tmac	1970-01-01 01:00:00.000000000 +0100
+++ groff-1.21/tmac/ja.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -0,0 +1,49 @@
+.\" -*- mode: nroff; coding: utf-8; -*-
+.\"
+.\" Japanese localization for groff
+.\"
+.\" Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+.\"   Written by Fumitoshi UKAI <ukai@debian.or.jp> and
+.\"   Colin Watson <cjwatson@debian.org>
+.\"
+.\" This file is part of groff.
+.\"
+.\" groff is free software; you can redistribute it and/or modify it under
+.\" the terms of the GNU General Public License as published by the Free
+.\" Software Foundation, either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
+.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+.\" for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
+.\"
+.\" Please send comments to groff@gnu.org.
+.
+.
+.\" Locale string
+.
+.ds locale japanese\"
+.
+.
+.class [CJKprepunct] \
+  , : ; > } \
+  \[u3001] \[u3002] \[uFF0C] \[uFF0E] \[u30FB] \[uFF1A] \[uFF1B] \[uFF1F] \
+  \[uFF01] \[uFF09] \[u3015] \[uFF3D] \[uFF5D] \[u300D] \[u300F] \[u3011] \
+  \[u3041] \[u3043] \[u3045] \[u3047] \[u3049] \[u3063] \[u3083] \[u3085] \
+  \[u3087] \[u30FC] \
+  \[u30A1] \[u30A3] \[u30A5] \[u30A7] \[u30A9] \[u30C3] \[u30E3] \[u30E5] \
+  \[u30E7]
+.class [CJKpostpunct] \
+  \[uFF08] \[u3014] \[uFF3B] \[uFF5B] \[u300C] \[u300E] \[u3010]
+.
+.\" Hiragana, Katakana, and Kanji glyphs.
+.class [CJKnormal] \
+  \[u3041]-\[u3096] \[u30A0]-\[u30FF] \[u4E00]-\[u9FFF]
+.
+.cflags 128 \C'[CJKprepunct]'
+.cflags 266 \C'[CJKpostpunct]'
+.cflags 512 \C'[CJKnormal]'
diff -ruN groff-1.20.1/tmac/Makefile.sub groff-1.21/tmac/Makefile.sub
--- groff-1.20.1/tmac/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/Makefile.sub	2010-12-31 08:33:09.000000000 +0100
@@ -1,4 +1,5 @@
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
+#               2010
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
@@ -55,7 +56,8 @@
   fr.tmac hyphen.fr \
   sv.tmac hyphen.sv \
   de.tmac den.tmac hyphen.det hyphen.den hyphenex.det \
-  cs.tmac hyphen.cs hyphenex.cs
+  cs.tmac hyphen.cs hyphenex.cs \
+  ja.tmac
 
 # These files are handled specially during installation and deinstallation.
 SPECIALFILES=an.tmac s.tmac www.tmac
diff -ruN groff-1.20.1/tmac/s.tmac groff-1.21/tmac/s.tmac
--- groff-1.20.1/tmac/s.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/s.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -4,7 +4,7 @@
 s.tmac
 
 Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2006, 2007,
-              2009
+              2009, 2010
   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -518,11 +518,11 @@
 .	el .nr pg*gutw 0
 .\}
 .DEVTAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]"
-.mk pg*col-top
 .ns
 .nr pg*col-num 0
 .nr pg@fn-colw \\n[pg@colw]*5/6
 .par@reset
+.mk pg*col-top
 ..
 .de 2C
 .MC
diff -ruN groff-1.20.1/tmac/www.tmac groff-1.21/tmac/www.tmac
--- groff-1.20.1/tmac/www.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/tmac/www.tmac	2010-12-31 08:33:09.000000000 +0100
@@ -5,12 +5,12 @@
 Installed position: groff's main macro directory.
 
 ------------------------------------------------------------------------
-    Legalize
+    Legalese
 ------------------------------------------------------------------------
 
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
   Free Software Foundation, Inc.
 written by Gaius Mulley <gaius@glam.ac.uk>, with additions by
 Werner Lemberg <wl@gnu.org> and Bernd Warken <bwarken@mayn.de>.
@@ -1186,6 +1186,8 @@
 .    www-emit-ltag li
 .  el \{\
 .    www:paraspace
+.    if rPORPHANS \
+.      ne \\n[PORPHANS]v
 .    in \\n[www-li-indent]u
 .    ti -\w'\\*[www-ul-level\\n[www-ul-level]]'u
 .    nop \\*[www-ul-level\\n[www-ul-level]]\c
@@ -1200,9 +1202,11 @@
 .    www-emit-ltag li
 .  el \{\
 .    www:paraspace
+.    if rPORPHANS \
+.      ne \\n[PORPHANS]v
 .    in \\n[www-li-indent]u
-.    ti -\w'\\n[www-ol-ctr\\n[www-ol-level]]\ \ 'u
-.    nop \\n+[www-ol-ctr\\n[www-ol-level]]\ \ \c
+.    ti -\w'\\n+[www-ol-ctr\\n[www-ol-level]]\ \ 'u
+.    nop \\n[www-ol-ctr\\n[www-ol-level]]\ \ \c
 .  \}
 ..
 .
@@ -1216,6 +1220,8 @@
 .  \}
 .  el \{\
 .    www:paraspace
+.    if rPORPHANS \
+.      ne \\n[PORPHANS]v
 .    in \\n[www-li-indent]u
 .    ti -\\n[www-dl-shift]u
 .    nop \&\\$1
diff -ruN groff-1.20.1/VERSION groff-1.21/VERSION
--- groff-1.20.1/VERSION	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.21/VERSION	2010-12-31 08:33:08.000000000 +0100
@@ -1 +1 @@
-1.20
+1.21